diff -Nru fpm2-0.76.1/aclocal.m4 fpm2-0.78/aclocal.m4 --- fpm2-0.76.1/aclocal.m4 2009-11-09 09:18:43.000000000 +0200 +++ fpm2-0.78/aclocal.m4 2010-03-03 13:52:20.000000000 +0200 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.11 -*- Autoconf -*- +# generated automatically by aclocal 1.11.1 -*- Autoconf -*- # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. @@ -623,7 +623,7 @@ [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], [], +m4_if([$1], [1.11.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -639,7 +639,7 @@ # 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])dnl +[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]))]) diff -Nru fpm2-0.76.1/ChangeLog fpm2-0.78/ChangeLog --- fpm2-0.76.1/ChangeLog 2009-11-09 09:17:48.000000000 +0200 +++ fpm2-0.78/ChangeLog 2010-03-02 14:42:02.000000000 +0200 @@ -1,5 +1,18 @@ +0.78 + - fixed crash in master password dialog after open keyfile + - disable (gray out) toolbar button and menu entries which require a row to be selected + - use MD5 and SHA-256 from GLib + +0.77 + - added Russian translation by Boorkov Sergey aka Leo + - added user selectable columns view + - added option for select action when activate entry + - added option for open search dialog on startup + - added hidden option for disable remembering main window position + - fixed search in and category + 0.76.1 - - fixed crash when ~/.fpm/ not exists + - fixed crash when ~/.fpm/ do not exists 0.76 - added French translation by Christoph J. Thompson diff -Nru fpm2-0.76.1/configure fpm2-0.78/configure --- fpm2-0.76.1/configure 2009-11-09 09:18:46.000000000 +0200 +++ fpm2-0.78/configure 2010-03-03 13:52:23.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.63 for fpm2 0.76.1. +# Generated by GNU Autoconf 2.63 for fpm2 0.78. # # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, # 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. @@ -594,8 +594,8 @@ # Identity of this package. PACKAGE_NAME='fpm2' PACKAGE_TARNAME='fpm2' -PACKAGE_VERSION='0.76.1' -PACKAGE_STRING='fpm2 0.76.1' +PACKAGE_VERSION='0.78' +PACKAGE_STRING='fpm2 0.78' PACKAGE_BUGREPORT='' # Factoring default headers for most tests. @@ -1312,7 +1312,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 fpm2 0.76.1 to adapt to many kinds of systems. +\`configure' configures fpm2 0.78 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1378,7 +1378,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of fpm2 0.76.1:";; + short | recursive ) echo "Configuration of fpm2 0.78:";; esac cat <<\_ACEOF @@ -1472,7 +1472,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -fpm2 configure 0.76.1 +fpm2 configure 0.78 generated by GNU Autoconf 2.63 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1486,7 +1486,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by fpm2 $as_me 0.76.1, which was +It was created by fpm2 $as_me 0.78, which was generated by GNU Autoconf 2.63. Invocation command line was $ $0 $@ @@ -2335,7 +2335,7 @@ # Define the identity of the package. PACKAGE=fpm2 - VERSION=0.76.1 + VERSION=0.78 cat >>confdefs.h <<_ACEOF @@ -6582,7 +6582,7 @@ _ACEOF -ALL_LINGUAS="bg cs de es eu fr hu it" +ALL_LINGUAS="bg cs de es eu fr hu it ru" for ac_header in locale.h @@ -8665,7 +8665,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by fpm2 $as_me 0.76.1, which was +This file was extended by fpm2 $as_me 0.78, which was generated by GNU Autoconf 2.63. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -8728,7 +8728,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_version="\\ -fpm2 config.status 0.76.1 +fpm2 config.status 0.78 configured by $0, generated by GNU Autoconf 2.63, with options \\"`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -Nru fpm2-0.76.1/configure.in fpm2-0.78/configure.in --- fpm2-0.76.1/configure.in 2009-11-09 09:18:35.000000000 +0200 +++ fpm2-0.78/configure.in 2010-03-02 12:22:05.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT(fpm2, 0.76.1) +AC_INIT(fpm2, 0.78) AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE @@ -26,7 +26,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.]) dnl Add the languages which your application supports here. -ALL_LINGUAS="bg cs de es eu fr hu it" +ALL_LINGUAS="bg cs de es eu fr hu it ru" AM_GLIB_GNU_GETTEXT XGETTEXT="$XGETTEXT --from-code=utf-8 --keyword=C_:1c,2" diff -Nru fpm2-0.76.1/debian/changelog fpm2-0.78/debian/changelog --- fpm2-0.76.1/debian/changelog 2010-03-16 01:32:53.000000000 +0200 +++ fpm2-0.78/debian/changelog 2010-05-20 02:40:01.000000000 +0200 @@ -1,3 +1,22 @@ +fpm2 (0.78-1ubuntu1) lucid; urgency=low + + * Merge from debian testing. + Remaining changes (split into individual quilt patches): + - src/fpm_file.c: xmlCleanupParser() removal. + - src/fpm.c: Fix missing format argument. + - src/fpm_gpw.c: Fix potential buffer overflows. + + -- Stefano Rivera Thu, 20 May 2010 02:39:07 +0200 + +fpm2 (0.78-1) unstable; urgency=low + + * New upstream release + - gray out toolbar buttons and menu entries automatically (Closes: #570596) + * Update debian/copyright + * Bump Standards-Version to 3.8.4 + + -- Wen-Yen Chuang Wed, 3 Mar 2010 23:55:04 +0800 + fpm2 (0.76.1-1ubuntu1) lucid; urgency=low * src/{fpm_file,main}.c: Don't splatter xmlCleanupParser() everywhere; @@ -57,3 +76,4 @@ * Initial release (Closes: #478243, #457155) -- Wen-Yen Chuang Wed, 07 May 2008 23:40:15 +0800 + diff -Nru fpm2-0.76.1/debian/control fpm2-0.78/debian/control --- fpm2-0.76.1/debian/control 2010-03-16 00:51:55.000000000 +0200 +++ fpm2-0.78/debian/control 2010-03-16 04:10:57.000000000 +0200 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Wen-Yen Chuang Homepage: http://als.regnet.cz/fpm2/ Build-Depends: debhelper (>= 7), libgtk2.0-dev, libxml2-dev -Standards-Version: 3.8.3 +Standards-Version: 3.8.4 Package: fpm2 Architecture: any diff -Nru fpm2-0.76.1/debian/copyright fpm2-0.78/debian/copyright --- fpm2-0.76.1/debian/copyright 2009-11-09 14:14:14.000000000 +0200 +++ fpm2-0.78/debian/copyright 2010-03-16 04:10:57.000000000 +0200 @@ -4,8 +4,7 @@ Upstream-Author: Aleš Koval Files: po/Makefile.in.in -Copyright: 1994-2009 Free Software Foundation, Inc. - 1995-1997 by Ulrich Drepper +Copyright: 1995-1997 by Ulrich Drepper Licence: other This file file be copied and used freely without restrictions. It can be used in projects which are not available under the GNU Public License @@ -21,7 +20,7 @@ Files: src/fpm.[ch], src/main.c, src/callbacks.[ch], src/fpm_clist.c, src/fpm_crypt.c, src/fpm_file.[ch], src/fpm_launcher.c, src/gpg_trans.h Copyright: 2000 John Conneely - 2008-2009 Aleš Koval + 2008-2010 Aleš Koval Licence: GPL-2+ FPM is open source / free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -88,44 +87,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA -Files: src/md5.c -Copyright: 2000 John Conneely except where taken from GnuPG. - 1995-1996, 1998-1999 Free Software Foundation, Inc. -Licence: GPL-2+ - FPM is open source / free 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. - - FPM is distributed in the hope that 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - - This file should be the same as the file that ships with GnuPG, - except for minor changes needed to get it to compile with FPM. - - according to the definition of MD5 in RFC 1321 from April 1992. - NOTE: This is *not* the same file as the one from glibc. - - 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, or (at your option) any - later version. - - This program is distributed in the hope that 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - Files: src/blowfish.c Copyright: 2000 John Conneely except for portions taken from GnuPG. 1998 Free Software Foundation, Inc. @@ -204,6 +165,7 @@ Files: src/sha256.c Copyright: 2008 Damien Bergamini 2003-2006 Free Software Foundation, Inc. + 2009-2010 Aleš Koval Licence: GPL-2+ GnuPG is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -308,6 +270,21 @@ Licence: GPL-2+ This file is distributed under the same license as the fpm2 package. +Files: po/cs.po +Copyright: 2008-2010 Aleš Koval +Licence: GPL-2+ + This file is distributed under the same license as the fpm2 package. + +Files: po/de.po +Copyright: 2008 Mike Constabel +Licence: GPL-2+ + This file is distributed under the same license as the fpm2 package. + +Files: po/es.po +Copyright: 2009-2010 Antonio Rguez. Capita +Licence: GPL-2+ + This file is distributed under the same license as the fpm2 package. + Files: po/eu.po Copyright: 2009 Maider Likona Santamarina 2009 Ales Zabala Alava (Shagi) @@ -320,14 +297,24 @@ Licence: GPL-2+ This file is distributed under the same license as the fpm2 package. +Files: po/hu.po +Copyright: 2008 Peter Polonkai +Licence: GPL-2+ + This file is distributed under the same license as the fpm2 package. + Files: po/it.po Copyright: 2009 Nicola Jelmorini 2008 Aleš Koval Licence: GPL-2+ This file is distributed under the same license as the fpm2 package. +Files: po/ru.po +Copyright: 2008-2010 Aleš Koval +Licence: GPL-2+ + This file is distributed under the same license as the fpm2 package. + Files: debian/* -Copyright: 2008-2009 Wen-Yen Chuang +Copyright: 2008-2010 Wen-Yen Chuang Licence: GPL-2+ 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 diff -Nru fpm2-0.76.1/debian/patches/debian-changes-0.76.1-1ubuntu1 fpm2-0.78/debian/patches/debian-changes-0.76.1-1ubuntu1 --- fpm2-0.76.1/debian/patches/debian-changes-0.76.1-1ubuntu1 2010-03-16 01:33:19.000000000 +0200 +++ fpm2-0.78/debian/patches/debian-changes-0.76.1-1ubuntu1 1970-01-01 02:00:00.000000000 +0200 @@ -1,120 +0,0 @@ -Description: Upstream changes introduced in version 0.76.1-1ubuntu1 - This patch has been created by dpkg-source during the package build. - Here's the last changelog entry, hopefully it gives details on why - those changes were made: - . - fpm2 (0.76.1-1ubuntu1) lucid; urgency=low - . - * src/{fpm_file,main}.c: Don't splatter xmlCleanupParser() everywhere; - call it once when the app exits. Not only is the former wrong - according to the huge warning in libxml2's parser.c, but doing so - makes it look like PulseAudio is (incorrectly) the culprit - (LP: #428702). - * src/fpm.c: Fix missing format argument. - * src/fpm_gpw.c: Fix potential buffer overflows. - . - The person named in the Author field signed this changelog entry. -Author: Daniel T Chen -Bug-Ubuntu: https://bugs.launchpad.net/bugs/428702 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: , -Bug: -Bug-Debian: http://bugs.debian.org/ -Forwarded: -Reviewed-By: -Last-Update: - ---- fpm2-0.76.1.orig/src/fpm_file.c -+++ fpm2-0.76.1/src/fpm_file.c -@@ -235,7 +235,6 @@ fpm_file_save(gchar* file_name, gboolean - // printf("Saved %d password(s).\n", i); - state->dirty = FALSE; - xmlFreeDoc(doc); -- xmlCleanupParser(); - } - - void -@@ -529,7 +528,6 @@ passfile_load(gchar* file_name) - i++; - } - xmlFreeDoc(doc); -- xmlCleanupParser(); - free(file_version); - - // dia_str = g_strdup_printf(_("Loaded %d password(s)."), i); -@@ -730,7 +728,6 @@ fpm_file_import(gchar *file_name, gint i - i++; - } - xmlFreeDoc(doc); -- xmlCleanupParser(); - /* free(file_version); */ - - state->dirty = TRUE; ---- fpm2-0.76.1.orig/src/fpm.c -+++ fpm2-0.76.1/src/fpm.c -@@ -921,6 +921,7 @@ void fpm_message(GtkWindow* win, gchar* - GTK_DIALOG_DESTROY_WITH_PARENT, - message_type, - GTK_BUTTONS_CLOSE, -+ "%s", - message); - gtk_window_set_title (GTK_WINDOW(dw), _("Information")); - gtk_dialog_run (GTK_DIALOG (dw)); -@@ -1444,6 +1445,7 @@ gint fpm_question(GtkWindow *win, gchar - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_MESSAGE_QUESTION, - GTK_BUTTONS_YES_NO, -+ "%s", - message); - gtk_window_set_title (GTK_WINDOW(dw), _("Question")); - -@@ -1505,4 +1507,4 @@ void fpm_switch_view_category(gchar *cat - dia_str = g_strdup_printf(_("Passwords in category: %d"), glb_num_row); - fpm_statusbar_push(dia_str); - g_free(dia_str); --} -\ No newline at end of file -+} ---- fpm2-0.76.1.orig/src/main.c -+++ fpm2-0.76.1/src/main.c -@@ -73,5 +73,7 @@ main (int argc, char *argv[]) - fpm_tr_cleanup(); - unlock_fpm_file(); - -+ xmlCleanupParser(); -+ - return 0; - } ---- fpm2-0.76.1.orig/src/fpm_gpw.c -+++ fpm2-0.76.1/src/fpm_gpw.c -@@ -70,16 +70,17 @@ fpm_gpw_set_options( gint pw_len, - gpw_no_amb=no_amb; - - strncpy(gpw_chars, "", GPW_CHAR_BUFFER); -- if (gpw_use_lcase) strncat(gpw_chars, chars_lcase1, GPW_CHAR_BUFFER); -- if (gpw_use_ucase) strncat(gpw_chars, chars_ucase1, GPW_CHAR_BUFFER); -- if (gpw_use_num) strncat(gpw_chars, chars_num1, GPW_CHAR_BUFFER); -- if (gpw_use_sym) strncat(gpw_chars, chars_sym1, GPW_CHAR_BUFFER); -+ gpw_chars[GPW_CHAR_BUFFER-1] = '\0'; -+ if (gpw_use_lcase) strncat(gpw_chars, chars_lcase1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); -+ if (gpw_use_ucase) strncat(gpw_chars, chars_ucase1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); -+ if (gpw_use_num) strncat(gpw_chars, chars_num1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); -+ if (gpw_use_sym) strncat(gpw_chars, chars_sym1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); - if (!no_amb) - { -- if (gpw_use_lcase) strncat(gpw_chars, chars_lcase2, GPW_CHAR_BUFFER); -- if (gpw_use_ucase) strncat(gpw_chars, chars_ucase2, GPW_CHAR_BUFFER); -- if (gpw_use_num) strncat(gpw_chars, chars_num2, GPW_CHAR_BUFFER); -- if (gpw_use_sym) strncat(gpw_chars, chars_sym2, GPW_CHAR_BUFFER); -+ if (gpw_use_lcase) strncat(gpw_chars, chars_lcase2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); -+ if (gpw_use_ucase) strncat(gpw_chars, chars_ucase2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); -+ if (gpw_use_num) strncat(gpw_chars, chars_num2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); -+ if (gpw_use_sym) strncat(gpw_chars, chars_sym2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); - } - - gpw_num_chars = strlen(gpw_chars); diff -Nru fpm2-0.76.1/debian/patches/missing-format-argument.patch fpm2-0.78/debian/patches/missing-format-argument.patch --- fpm2-0.76.1/debian/patches/missing-format-argument.patch 1970-01-01 02:00:00.000000000 +0200 +++ fpm2-0.78/debian/patches/missing-format-argument.patch 2010-05-20 09:51:42.000000000 +0200 @@ -0,0 +1,22 @@ +Description: Fix missing format argument. +Author: Daniel T Chen +Forwarded: by e-mail - 2010-05-20 +Last-Update: 2010-05-20 +--- a/src/fpm.c ++++ b/src/fpm.c +@@ -974,6 +974,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + message_type, + GTK_BUTTONS_CLOSE, ++ "%s", + message); + gtk_window_set_title (GTK_WINDOW(dw), _("Information")); + gtk_dialog_run (GTK_DIALOG (dw)); +@@ -1542,6 +1543,7 @@ + GTK_DIALOG_DESTROY_WITH_PARENT, + GTK_MESSAGE_QUESTION, + GTK_BUTTONS_YES_NO, ++ "%s", + message); + gtk_window_set_title (GTK_WINDOW(dw), _("Question")); + diff -Nru fpm2-0.76.1/debian/patches/potential-buffer-overflows.patch fpm2-0.78/debian/patches/potential-buffer-overflows.patch --- fpm2-0.76.1/debian/patches/potential-buffer-overflows.patch 1970-01-01 02:00:00.000000000 +0200 +++ fpm2-0.78/debian/patches/potential-buffer-overflows.patch 2010-05-20 09:51:39.000000000 +0200 @@ -0,0 +1,32 @@ +Description: Fix potential buffer overflows. +Author: Daniel T Chen +Forwarded: by e-mail - 2010-05-20 +Last-Update: 2010-05-20 +--- a/src/fpm_gpw.c ++++ b/src/fpm_gpw.c +@@ -70,16 +70,17 @@ + gpw_no_amb=no_amb; + + strncpy(gpw_chars, "", GPW_CHAR_BUFFER); +- if (gpw_use_lcase) strncat(gpw_chars, chars_lcase1, GPW_CHAR_BUFFER-1); +- if (gpw_use_ucase) strncat(gpw_chars, chars_ucase1, GPW_CHAR_BUFFER-1); +- if (gpw_use_num) strncat(gpw_chars, chars_num1, GPW_CHAR_BUFFER-1); +- if (gpw_use_sym) strncat(gpw_chars, chars_sym1, GPW_CHAR_BUFFER-1); ++ gpw_chars[GPW_CHAR_BUFFER-1] = '\0'; ++ if (gpw_use_lcase) strncat(gpw_chars, chars_lcase1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); ++ if (gpw_use_ucase) strncat(gpw_chars, chars_ucase1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); ++ if (gpw_use_num) strncat(gpw_chars, chars_num1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); ++ if (gpw_use_sym) strncat(gpw_chars, chars_sym1, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); + if (!no_amb) + { +- if (gpw_use_lcase) strncat(gpw_chars, chars_lcase2, GPW_CHAR_BUFFER-1); +- if (gpw_use_ucase) strncat(gpw_chars, chars_ucase2, GPW_CHAR_BUFFER-1); +- if (gpw_use_num) strncat(gpw_chars, chars_num2, GPW_CHAR_BUFFER-1); +- if (gpw_use_sym) strncat(gpw_chars, chars_sym2, GPW_CHAR_BUFFER-1); ++ if (gpw_use_lcase) strncat(gpw_chars, chars_lcase2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); ++ if (gpw_use_ucase) strncat(gpw_chars, chars_ucase2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); ++ if (gpw_use_num) strncat(gpw_chars, chars_num2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); ++ if (gpw_use_sym) strncat(gpw_chars, chars_sym2, (GPW_CHAR_BUFFER-1)-strlen(gpw_chars)); + } + + gpw_num_chars = strlen(gpw_chars); diff -Nru fpm2-0.76.1/debian/patches/series fpm2-0.78/debian/patches/series --- fpm2-0.76.1/debian/patches/series 2010-03-16 00:52:00.000000000 +0200 +++ fpm2-0.78/debian/patches/series 2010-05-20 09:50:14.000000000 +0200 @@ -1 +1,3 @@ -debian-changes-0.76.1-1ubuntu1 +xml-cleanup-parser.patch +missing-format-argument.patch +potential-buffer-overflows.patch diff -Nru fpm2-0.76.1/debian/patches/xml-cleanup-parser.patch fpm2-0.78/debian/patches/xml-cleanup-parser.patch --- fpm2-0.76.1/debian/patches/xml-cleanup-parser.patch 1970-01-01 02:00:00.000000000 +0200 +++ fpm2-0.78/debian/patches/xml-cleanup-parser.patch 2010-05-20 09:51:01.000000000 +0200 @@ -0,0 +1,44 @@ +Description: Don't splatter xmlCleanupParser() everywhere; call it once when + the app exits. Not only is the former wrong according to the huge warning in + libxml2's parser.c, but doing so makes it look like PulseAudio is +(incorrectly) the culprit +Author: Daniel T Chen +Bug-Ubuntu: https://bugs.launchpad.net/bugs/428702 +Forwarded: by e-mail - 2010-05-20 +Last-Update: 2010-05-20 +--- a/src/fpm_file.c ++++ b/src/fpm_file.c +@@ -235,7 +235,6 @@ + // printf("Saved %d password(s).\n", i); + // state->dirty = FALSE; + xmlFreeDoc(doc); +- xmlCleanupParser(); + fpm_dirty(FALSE); + } + +@@ -531,7 +530,6 @@ + i++; + } + xmlFreeDoc(doc); +- xmlCleanupParser(); + free(file_version); + + // dia_str = g_strdup_printf(_("Loaded %d password(s)."), i); +@@ -732,7 +730,6 @@ + i++; + } + xmlFreeDoc(doc); +- xmlCleanupParser(); + /* free(file_version); */ + + // state->dirty = TRUE; +--- a/src/main.c ++++ b/src/main.c +@@ -73,5 +73,7 @@ + fpm_tr_cleanup(); + unlock_fpm_file(); + ++ xmlCleanupParser(); ++ + return 0; + } diff -Nru fpm2-0.76.1/fpm2.desktop fpm2-0.78/fpm2.desktop --- fpm2-0.76.1/fpm2.desktop 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/fpm2.desktop 2010-03-02 08:52:54.000000000 +0200 @@ -7,18 +7,20 @@ GenericName=Password Manager GenericName[cs]=Správce hesel GenericName[de]=Kennwortverwalter +GenericName[se]=Lösenordshanterare GenericName[fr]=Gestionnaire de Mots de Passe GenericName[it]=Gestore di Parole d'Ordine Comment=Manage passwords Comment[cs]=Správa hesel Comment[de]=Kennwörter verwalten +Comment[se]=Hantera lösenord Comment[fr]=Gérer les mots de passe Comment[it]=Gestire le parole d'ordine -Icon=/home/koval/fpm2/share/pixmaps/fpm2/logo.png +Icon=/usr/share/pixmaps/fpm2/logo.png Categories=GTK;Utility; -Exec=fpm2 +Exec=fpm2 %f TryExec=fpm2 Terminal=false StartupNotify=true diff -Nru fpm2-0.76.1/fpm2.desktop.in fpm2-0.78/fpm2.desktop.in --- fpm2-0.76.1/fpm2.desktop.in 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/fpm2.desktop.in 2010-02-24 08:12:33.000000000 +0200 @@ -7,18 +7,20 @@ GenericName=Password Manager GenericName[cs]=Správce hesel GenericName[de]=Kennwortverwalter +GenericName[se]=Lösenordshanterare GenericName[fr]=Gestionnaire de Mots de Passe GenericName[it]=Gestore di Parole d'Ordine Comment=Manage passwords Comment[cs]=Správa hesel Comment[de]=Kennwörter verwalten +Comment[se]=Hantera lösenord Comment[fr]=Gérer les mots de passe Comment[it]=Gestire le parole d'ordine Icon=@PACKAGE_PIXMAP_DIR@/logo.png Categories=GTK;Utility; -Exec=fpm2 +Exec=fpm2 %f TryExec=fpm2 Terminal=false StartupNotify=true diff -Nru fpm2-0.76.1/fpm2.glade fpm2-0.78/fpm2.glade --- fpm2-0.76.1/fpm2.glade 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/fpm2.glade 2010-03-02 08:52:54.000000000 +0200 @@ -69,6 +69,7 @@ True + False gtk-save True @@ -98,7 +99,7 @@ - + True gtk-convert 1 @@ -119,7 +120,7 @@ - + True gtk-harddisk 1 @@ -147,7 +148,7 @@ - + True gtk-leave-fullscreen 1 @@ -185,13 +186,14 @@ True + False Copy _Password True - + True gtk-copy 1 @@ -207,13 +209,14 @@ True + False Copy _Username True - + True gtk-copy 1 @@ -229,13 +232,14 @@ True + False Copy _Both True - + True gtk-copy 1 @@ -263,7 +267,7 @@ - + True gtk-new 1 @@ -279,13 +283,14 @@ True + False _Edit Item True - + True gtk-edit 1 @@ -301,13 +306,14 @@ True + False _Clone Item True - + True gtk-copy 1 @@ -323,13 +329,14 @@ True + False _Delete Item True - + True gtk-delete 1 @@ -362,6 +369,105 @@ + + True + _View + True + + + + + + + True + _Title + True + False + + + + + + + True + U_RL + True + False + + + + + + + True + _User + True + False + + + + + + + True + _Password + True + False + + + + + + + True + _Category + True + False + + + + + + + True + _Notes + True + False + + + + + + + True + _Launcher + True + False + + + + + + + True + + + + + + True + Tool_bar + True + True + + + + + + + + + True _Settings @@ -378,7 +484,7 @@ - + True gtk-execute 1 @@ -399,7 +505,7 @@ - + True gtk-dialog-authentication 1 @@ -413,23 +519,7 @@ - - True - - - - - - True - _Toolbar - True - True - - - - - - + True @@ -464,7 +554,7 @@ - + True gtk-info 1 @@ -515,6 +605,7 @@ True + False Save password list gtk-save True @@ -561,6 +652,7 @@ True + False gtk-edit True True @@ -589,6 +681,7 @@ True + False Jump True gtk-go-forward @@ -606,6 +699,7 @@ True + False User True gtk-copy @@ -623,6 +717,7 @@ True + False Pass True gtk-copy @@ -730,6 +825,7 @@ + @@ -3369,7 +3465,7 @@ False FPM2 (c) 2000-2003 John Conneely & other contributors -(c) 2008-2009 Aleš Koval +(c) 2008-2010 Aleš Koval Figaro's Password Manager Rewriten for GTK2. This application is licensed under the GNU General Public License Version 2 or (at your option) any later version. @@ -3387,7 +3483,9 @@ French - Christoph J. Thompson German - Mike Constabel Hungarian - Peter Polonkai -Spanish - Antonio Rguez. Capita +Italian - Nicola Jelmorini +Spanish - Antonio Rguez. Capita +Russian - Boorkov Sergey aka Leo logo.png @@ -3409,9 +3507,6 @@ True False False - - _Preferences - @@ -3696,9 +3791,6 @@ -1 False 0 - - Search Conditions - label_item @@ -4553,6 +4645,26 @@ False + + + + True + True + Open _search dialog + True + GTK_RELIEF_NORMAL + True + False + False + True + + + + 0 + False + False + + @@ -4561,7 +4673,73 @@ True - <b>On startup</b> + <b>On Startup</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + label_item + + + + + 0 + False + False + + + + + + 10 + True + 0 + 0.5 + GTK_SHADOW_NONE + + + + True + 0.5 + 0.5 + 1 + 1 + 3 + 0 + 12 + 10 + + + + True + Call Launcher +Copy Username +Copy Password +Copy Both +Open Edit Window + False + True + + + + + + + + + True + <b>When Activated Entry</b> False True GTK_JUSTIFY_LEFT @@ -4668,7 +4846,7 @@ True - <b>Copy target</b> + <b>Copy Target</b> False True GTK_JUSTIFY_LEFT @@ -4908,9 +5086,6 @@ GDK_GRAVITY_NORTH_WEST True False - - Generate Entropy - diff -Nru fpm2-0.76.1/fpm2.spec fpm2-0.78/fpm2.spec --- fpm2-0.76.1/fpm2.spec 2009-11-09 09:18:21.000000000 +0200 +++ fpm2-0.78/fpm2.spec 2010-03-03 13:53:15.000000000 +0200 @@ -1,6 +1,6 @@ Summary: Password manager with GTK2 GUI Name: fpm2 -Version: 0.76.1 +Version: 0.78 Release: 1%{?dist} License: GPLv2+ Group: Applications/Productivity @@ -59,16 +59,24 @@ %{_datadir}/applications/*.desktop %changelog -* Mon Nov 09 2009 Aleš Koval - 0.76.1-1 +* Wed Mar 3 2010 Aleš Koval - 0.78-1 +- Update to 0.78 +- Fixed crash in master password dialog after open keyfile (#569520) + +* Tue Feb 23 2010 Aleš Koval - 0.77-1 +- Update to 0.77 +- Fix ImplicitDSOLinking (#565058) + +* Mon Nov 9 2009 Aleš Koval - 0.76.1-1 - Update to 0.76.1 -* Fri Nov 06 2009 Aleš Koval - 0.76-1 +* Fri Nov 6 2009 Aleš Koval - 0.76-1 - Update to 0.76 -* Tue Apr 07 2009 Christoph J. Thompson +* Tue Apr 7 2009 Christoph J. Thompson - Pixmaps are now in /usr/share/pixmaps/fpm2 -* Mon Mar 02 2009 Aleš Koval - 0.75-1 +* Mon Mar 2 2009 Aleš Koval - 0.75-1 - Update to 0.75 * Mon Jul 7 2008 Aleš Koval - 0.72-1 diff -Nru fpm2-0.76.1/Makefile.in fpm2-0.78/Makefile.in --- fpm2-0.76.1/Makefile.in 2009-11-09 09:18:45.000000000 +0200 +++ fpm2-0.78/Makefile.in 2010-03-03 13:52:22.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -367,7 +367,7 @@ # (which will cause the Makefiles to be regenerated when you run `make'); # (2) otherwise, pass the desired values on the `make' command line. $(RECURSIVE_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -392,7 +392,7 @@ fi; test -z "$$fail" $(RECURSIVE_CLEAN_TARGETS): - @failcom='exit 1'; \ + @fail= failcom='exit 1'; \ for f in x $$MAKEFLAGS; do \ case $$f in \ *=* | --[!k]*);; \ @@ -569,7 +569,8 @@ fi; \ done -test -n "$(am__skip_mode_fix)" \ - || find "$(distdir)" -type d ! -perm -777 -exec chmod a+rwx {} \; -o \ + || find "$(distdir)" -type d ! -perm -755 \ + -exec chmod u+rwx,go+rx {} \; -o \ ! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \ ! -type d ! -perm -400 -exec chmod a+r {} \; -o \ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \ @@ -613,17 +614,17 @@ distcheck: dist case '$(DIST_ARCHIVES)' in \ *.tar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).tar.gz | $(am__untar) ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).tar.gz | $(am__untar) ;;\ *.tar.bz2*) \ - bunzip2 -c $(distdir).tar.bz2 | $(am__untar) ;;\ + bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\ *.tar.lzma*) \ - unlzma -c $(distdir).tar.lzma | $(am__untar) ;;\ + lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\ *.tar.xz*) \ xz -dc $(distdir).tar.xz | $(am__untar) ;;\ *.tar.Z*) \ uncompress -c $(distdir).tar.Z | $(am__untar) ;;\ *.shar.gz*) \ - GZIP=$(GZIP_ENV) gunzip -c $(distdir).shar.gz | unshar ;;\ + GZIP=$(GZIP_ENV) gzip -dc $(distdir).shar.gz | unshar ;;\ *.zip*) \ unzip $(distdir).zip ;;\ esac diff -Nru fpm2-0.76.1/pixmaps/Makefile.in fpm2-0.78/pixmaps/Makefile.in --- fpm2-0.76.1/pixmaps/Makefile.in 2009-11-09 09:18:45.000000000 +0200 +++ fpm2-0.78/pixmaps/Makefile.in 2010-03-03 13:52:22.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/bg.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/bg.gmo differ diff -Nru fpm2-0.76.1/po/bg.po fpm2-0.78/po/bg.po --- fpm2-0.76.1/po/bg.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/bg.po 2010-02-24 08:12:33.000000000 +0200 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: fpm2 0.72\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 13:41+0100\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" "PO-Revision-Date: 2008-07-07 17:17+0200\n" "Last-Translator: Yovko Yovkov \n" "Language-Team: Bulgarian\n" @@ -18,255 +18,292 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Непозната опция\n" - -#: src/interface.c:120 src/interface.c:983 src/interface.c:1015 src/fpm.c:1346 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Файл" -#: src/interface.c:166 +#: src/interface.c:175 #, fuzzy msgid "_Import Passwords" msgstr "_Внасяне на пароли" -#: src/interface.c:174 +#: src/interface.c:183 #, fuzzy msgid "_Export Passwords" msgstr "_Изнасяне на пароли" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "_Минимизиране" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "_Редактиране" -#: src/interface.c:209 src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "Копиране на _парола" -#: src/interface.c:220 src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "Копиране на п_отребител" -#: src/interface.c:231 src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "Копиране на двете" -#: src/interface.c:247 src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "Eintrag _hinzufügen" -#: src/interface.c:258 src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "_Добавяне на обект" -#: src/interface.c:269 src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 #, fuzzy msgid "_Clone Item" msgstr "_Клониране на обект" -#: src/interface.c:280 src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "_Изтриване на обект" -#: src/interface.c:300 +#: src/interface.c:309 +#, fuzzy +msgid "_View" +msgstr "_Файл" + +#: src/interface.c:316 +#, fuzzy +msgid "_Title" +msgstr "Заглавие" + +#: src/interface.c:320 +#, fuzzy +msgid "U_RL" +msgstr "URL" + +#: src/interface.c:324 +#, fuzzy +msgid "_User" +msgstr "Потр." + +#: src/interface.c:328 +#, fuzzy +msgid "_Password" +msgstr "Парола:" + +#: src/interface.c:332 +#, fuzzy +msgid "_Category" +msgstr "Категория" + +#: src/interface.c:336 +#, fuzzy +msgid "_Notes" +msgstr "Бележки:" + +#: src/interface.c:340 +#, fuzzy +msgid "_Launcher" +msgstr "Програма:" + +#: src/interface.c:349 +#, fuzzy +msgid "Tool_bar" +msgstr "_Лента с инструменти" + +#: src/interface.c:354 msgid "_Settings" msgstr "_Настройки" -#: src/interface.c:307 +#: src/interface.c:361 #, fuzzy msgid "_Launcher Preferences" msgstr "Страртиран Настройки" -#: src/interface.c:315 +#: src/interface.c:369 #, fuzzy msgid "Change _Password" msgstr "_Промяна на парола" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "_Лента с инструменти" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Помощ" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "_Текущ файл с пароли" -#: src/interface.c:375 +#: src/interface.c:419 #, fuzzy msgid "Save password list" msgstr "Запиши списък с промени" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Нов" -#: src/interface.c:397 src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Пуск" -#: src/interface.c:403 src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Потр." -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Пар." -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Категория" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Намери:" -#: src/interface.c:475 src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" msgstr "_Отличава малки и главни букви" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Преглед / Редактриане на обекти" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Заглавие:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "URL / Арг:" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Парола:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Покажи парола" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Потребителско име" -#: src/interface.c:827 src/callbacks.c:597 src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Категория:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Добари паролата в списъка с подразбиращите се" -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Бележки:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Програма:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Генериране..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Заповядайте в" -#: src/interface.c:1027 +#: src/interface.c:1107 #, fuzzy msgid "Key _File:" msgstr "_Файл с ключове" -#: src/interface.c:1033 +#: src/interface.c:1113 #, fuzzy msgid "_Password:" msgstr "Парола:" -#: src/interface.c:1044 src/interface.c:1567 src/callbacks.c:1204 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Избиране на файл с ключове" -#: src/interface.c:1061 +#: src/interface.c:1141 #, fuzzy msgid "Please enter your master password" msgstr "Въведете парола:" -#: src/interface.c:1070 src/callbacks.c:1424 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Покажи прозореца за избор на файл с ключове" -#: src/interface.c:1189 src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Автоматично енериране на пароли" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Брой символи:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Използване на малки бувки (a, b, c,... )" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Използване на големи букви (A, B, C.. )" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Използване на числа (1, 2, 3... )" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Използване на символи (!, @, #...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Изключва неопределени символи (l, I&1, O&0, usw.)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Еквивалентен бит: 2^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Брой комбинации: 10^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Оптимизиране на генериране" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Генерирана парола:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Генериране!" -#: src/interface.c:1435 +#: src/interface.c:1515 #, fuzzy msgid "Choose Master Password" msgstr "Избиране на парола" -#: src/interface.c:1457 +#: src/interface.c:1537 #, fuzzy msgid "Welcome to Figaro's Password Manager 2" msgstr "Заповядайте във Figaro's Password Manager 2" -#: src/interface.c:1478 +#: src/interface.c:1558 #, fuzzy msgid "" "Please choose the password which will be used to encrypt your passwords. It " @@ -276,24 +313,24 @@ "Figaro's Password Manager!\n" "\n" "Изберете парола, която ще бъде използвана за да крипитира вашите пароли." -"Важно е да запомните тази парола, защото без нея няма да имате достъп " -"до паролите съхранени във вашия списък." +"Важно е да запомните тази парола, защото без нея няма да имате достъп до " +"паролите съхранени във вашия списък." -#: src/interface.c:1506 +#: src/interface.c:1586 #, fuzzy msgid "Please choose a _password:" msgstr "Избиране на _парола:" -#: src/interface.c:1515 +#: src/interface.c:1595 #, fuzzy msgid "_Verify it by typing it again here:" msgstr "Потвърждава на парола:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Парола за достъп" -#: src/interface.c:1545 +#: src/interface.c:1625 #, fuzzy msgid "" "Optionally you may specify the file which will be used to encrypt your " @@ -302,63 +339,63 @@ msgstr "" "Figaro's Password Manager!\n" "\n" -"Може да изберете файл, който заедно с вашата парола ще бъде използван " -"за криптиране на паролите. Пазете внимателно този файл! Той е необходим " -"за разчитането на вашите пароли!" +"Може да изберете файл, който заедно с вашата парола ще бъде използван за " +"криптиране на паролите. Пазете внимателно този файл! Той е необходим за " +"разчитането на вашите пароли!" -#: src/interface.c:1556 +#: src/interface.c:1636 #, fuzzy msgid "_Key File:" msgstr "_Файл с ключове:" -#: src/interface.c:1573 +#: src/interface.c:1653 #, fuzzy msgid "Key File" msgstr "Arhiwi" -#: src/interface.c:1690 +#: src/interface.c:1770 #, fuzzy msgid "Launcher Preferences" msgstr "Пуск настройки" -#: src/interface.c:1748 src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "основен избор" -#: src/interface.c:1754 src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "в клипборд" -#: src/interface.c:1760 src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "не копирай" -#: src/interface.c:1790 +#: src/interface.c:1870 #, fuzzy msgid "Copy _User:" msgstr "Копиране _потребител" -#: src/interface.c:1797 +#: src/interface.c:1877 #, fuzzy msgid "Command _Line:" msgstr "Команден _ред:" -#: src/interface.c:1804 +#: src/interface.c:1884 #, fuzzy msgid "Copy Pass_word:" msgstr "Копиране _парола:" -#: src/interface.c:1811 +#: src/interface.c:1891 #, fuzzy msgid "Launcher _Name:" msgstr "_Име на пуск:" -#: src/interface.c:1839 +#: src/interface.c:1919 #, fuzzy msgid "Launcher" msgstr "Пуск:" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -370,22 +407,22 @@ "$u = Потребител\n" "$p = Парола (не се препоръчва)" -#: src/interface.c:1854 +#: src/interface.c:1934 #, fuzzy msgid "Command Line _Variables" msgstr "Команден Ред:" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "" -#: src/interface.c:1955 +#: src/interface.c:2035 msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -393,267 +430,292 @@ "Figaro's Password Manager\n" "GTK2 вариант" -#: src/interface.c:1957 +#: src/interface.c:2037 msgid "" "This application is licensed under the GNU General Public License Version 2 " "or (at your option) any later version.\n" msgstr "" -"Този продукт е лицензиран под GNU General Public License версия 2 " -"или (по ваше желание) всяка следваща версия.\n" +"Този продукт е лицензиран под GNU General Public License версия 2 или (по " +"ваше желание) всяка следваща версия.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "FPM2 в интернет" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Настройки" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Търсене по _заглавие" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Търсене по _URL" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Търсене по _потребител" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Търсене по _бележки" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Обхват на тъесене" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Само в текущата _категория" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Правила за търсене" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Търсене" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Записване при добавяне на обект" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Записване при _промяна на обект" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Записване при _изтриване на обект" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Записване при _изход" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Автоматично записване на файл" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Създаване на резервно копие на _файловете" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Запази " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " История" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Архиви" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Записване" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Разреши икона в _лентата" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "_Постоянна икона в лентата" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "_Автоматично минимизиране в лентата" -#: src/interface.c:2289 src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "след " -#: src/interface.c:2298 src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr "минути " -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "_Заключи програмата след минимизиране" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Икона за лентата" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Символ за лентата" -#: src/interface.c:2362 +#: src/interface.c:2446 #, fuzzy msgid "_Open this category" msgstr "_Отвори тази категория" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "" + +#: src/interface.c:2464 +#, fuzzy +msgid "On Startup" msgstr "При стартиране" -#: src/interface.c:2405 +#: src/interface.c:2483 +#, fuzzy +msgid "Call Launcher" +msgstr "Програма:" + +#: src/interface.c:2484 +#, fuzzy +msgid "Copy Username" +msgstr "Копиране на п_отребител" + +#: src/interface.c:2485 +#, fuzzy +msgid "Copy Password" +msgstr "Копиране на _парола" + +#: src/interface.c:2486 +#, fuzzy +msgid "Copy Both" +msgstr "Копиране на двете" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "" + +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "_Изчистване на обекта след поставяне" -#: src/interface.c:2409 +#: src/interface.c:2522 #, fuzzy -msgid "Copy target" +msgid "Copy Target" msgstr "Копиране на обект" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Други" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Настройки" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Правила за търсене" - -#: src/interface.c:2681 src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Ентропия на генериране" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Движете мишката за натрупване на ентропия" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "_Покажи / Скрий" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Заключи" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Отключи" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Икони и текст" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Само икони" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Само текст" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Скрий лентата с инструментите" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Отказване на промените?" -#: src/callbacks.c:500 src/callbacks.c:1295 src/fpm.c:421 src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Потвърдете изтриването" -#: src/callbacks.c:530 src/callbacks.c:918 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Парола в категорията: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 #, fuzzy msgid "Export passwords" msgstr "_Изнасяне на пароли" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Тип на експорта" -#: src/callbacks.c:579 src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "Текст XML" -#: src/callbacks.c:585 src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 #, fuzzy msgid "Launchers:" msgstr "Пуск:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Не изнасяй" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" msgstr "Изнасяне само на стартерите, които се използват в избраната категория" -#: src/callbacks.c:591 +#: src/callbacks.c:563 #, fuzzy msgid "Export all" msgstr "Изнасяне на _всичко" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Внасяне на файл с пароли" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Тип на внасяне:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Не внасяй" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Внасяне само на пускове" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Внасяне и заместване на всички пускове" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "Не променя типа на обектите и внасяне такива каквито са" -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, fuzzy, c-format msgid "" "Current location of password file:\n" @@ -664,56 +726,76 @@ "Път до файла с паролите:\n" "%s" -#: src/callbacks.c:732 src/fpm.c:538 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Запазване на промените" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Отваряне на файл с пароли" -#: src/callbacks.c:765 +#: src/callbacks.c:736 #, fuzzy msgid "Save Password File" msgstr "Записване на файл с пароли" -#: src/callbacks.c:776 src/callbacks.c:1272 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Не посочен файл с пароли" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 #, fuzzy msgid "New Password File" msgstr "Нов файл с пароли" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 #, fuzzy msgid "Please enter launcher name." msgstr "Въведете име на пуска:" -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Скриване на диалога за файл с ключове" +#: src/callbacks.c:1497 +#, fuzzy +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Отказване на промените?" + #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Не мога а намеря pixmap файл: %s" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Заглавие" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "URL" -#: src/fpm.c:129 +#: src/fpm.c:93 +#, fuzzy +msgid "Password" +msgstr "Парола:" + +#: src/fpm.c:95 +#, fuzzy +msgid "Notes" +msgstr "Бележки:" + +#: src/fpm.c:96 +#, fuzzy +msgid "Launcher" +msgstr "Програма:" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "Не мога да отворя %s" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -722,28 +804,7 @@ "Не мога да заключа %s.\n" "Файла вече е заключен." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "Не мога да създам връзка към %s" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "Не мога да направя fstat %s" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"Съществува заключващ файл %s.\n" -"Ако мислите, че това е грешка, изтрийте\n" -"файловет в директорията %s." - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -752,32 +813,32 @@ "Паролата надхвърля ограничението до %d символа\n" "Паролата е скъсена до %d символа." -#: src/fpm.c:597 +#: src/fpm.c:538 #, fuzzy msgid "primary selection" msgstr "основен избор" -#: src/fpm.c:598 +#: src/fpm.c:539 #, fuzzy msgid "user" msgstr "потребител" -#: src/fpm.c:602 +#: src/fpm.c:543 #, fuzzy msgid "clipboard" msgstr "клипборд" -#: src/fpm.c:605 +#: src/fpm.c:546 #, fuzzy msgid "password" msgstr "парола" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Копиране %s в %s" -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -785,7 +846,7 @@ "Не дефиниран пуск за тази парола.\n" "Дефинирайте пуск в Настройки на пуск." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -793,15 +854,17 @@ "Не дефиниран пуск за тази парола..\n" "Дефинирайте пуск в Редактиране на пароли'." -#: src/fpm.c:729 src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "Не мога да прочета файла с ключовете" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Грешна парола Опитайте отново." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" @@ -814,50 +877,50 @@ "\n" "Искате ли да преминете към новия по - сигурен шифър?\n" "\n" -"Бележка: Няма да можете да използвате новия формат на шифъра/файла " -"със по - стари версии на FPM2." +"Бележка: Няма да можете да използвате новия формат на шифъра/файла със по - " +"стари версии на FPM2." -#: src/fpm.c:792 +#: src/fpm.c:758 #, fuzzy msgid "Conversion of password file is done!" msgstr "" "Конвертирането на файла приключи успешно:\n" "%s" -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Посочени различни пароли." -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Прекалено кратка парола." -#: src/fpm.c:1000 +#: src/fpm.c:978 #, fuzzy msgid "Information" msgstr "Информация" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaro's Password Manager 2 - заключен" -#: src/fpm.c:1506 +#: src/fpm.c:1547 #, fuzzy msgid "Question" msgstr "Въпрос" -#: src/fpm.c:1519 +#: src/fpm.c:1560 #, fuzzy msgid "Primary selection" msgstr "Основен избор" -#: src/fpm.c:1520 +#: src/fpm.c:1561 #, fuzzy msgid "Clipboard" msgstr "Клипборд" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -865,59 +928,91 @@ "\n" "Изберете ред." -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "%d съхранени пароли" -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, fuzzy, c-format msgid "Exported clear XML passwords to %s." msgstr "Изнесен XML файл с пароли: %s" -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format msgid "" "Sorry, the password file cannot be read because it uses a future file " "format. Please download the latest version of FPM2 and try again.\n" msgstr "" -"Файла с паролите не може да бъде отворен, защото използва формат" -"поддържан само от по - новите версии на FPM2" -"Свалете по - нова версия на FPM2 и опитайте отново\n" +"Файла с паролите не може да бъде отворен, защото използва форматподдържан " +"само от по - новите версии на FPM2Свалете по - нова версия на FPM2 и " +"опитайте отново\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Файла не е в XML формат" -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 #, fuzzy msgid "File is not valid FPM2 password file." msgstr "Файла не е валиден FPM2 файл с пароли" -#: src/fpm_file.c:615 src/fpm_file.c:672 +#: src/fpm_file.c:613 src/fpm_file.c:670 #, fuzzy msgid "Invalid password file." msgstr "Не валиден файл с пароли" -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 #, fuzzy, c-format msgid "Imported %d password(s)." msgstr "%d пароли внесени" +#~ msgid "Unrecognized option.\n" +#~ msgstr "Непозната опция\n" + +#~ msgid "_Preferences" +#~ msgstr "_Настройки" + +#~ msgid "Search Conditions" +#~ msgstr "Правила за търсене" + +#~ msgid "Could not create a link to %s" +#~ msgstr "Не мога да създам връзка към %s" + +#~ msgid "Could not fstat %s" +#~ msgstr "Не мога да направя fstat %s" + +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "Съществува заключващ файл %s.\n" +#~ "Ако мислите, че това е грешка, изтрийте\n" +#~ "файловет в директорията %s." + #~ msgid "Loaded %d password(s)." #~ msgstr "%d Passwörter geladen" Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/cs.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/cs.gmo differ diff -Nru fpm2-0.76.1/po/cs.po fpm2-0.78/po/cs.po --- fpm2-0.76.1/po/cs.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/cs.po 2010-02-24 08:12:33.000000000 +0200 @@ -2,15 +2,15 @@ # Copyright (C) 2008 THE fpm2'S COPYRIGHT HOLDER # This file is distributed under the same license as the fpm2 package. # Aleš Koval , 2008.,2009 -# Aleš Koval , 2009 +# Aleš Koval , 2009, 2010. msgid "" msgstr "" "Project-Id-Version: fpm2 0.72\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 13:41+0100\n" -"PO-Revision-Date: 2009-02-25 13:37+0100\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" +"PO-Revision-Date: 2010-02-09 08:34+0100\n" "Last-Translator: Aleš Koval \n" -"Language-Team: \n" +"Language-Team: <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -18,244 +18,272 @@ "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" "X-Generator: Virtaal 0.3.0\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Neznámá volba.\n" - -#: src/interface.c:120 src/interface.c:983 src/interface.c:1015 src/fpm.c:1346 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Soubor" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" msgstr "_Importovat hesla" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" msgstr "_Exportovat hesla" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "_Minimalizovat do lišty" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "_Upravit" -#: src/interface.c:209 src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "Zkopírovat hes_lo" -#: src/interface.c:220 src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "Zkopírovat _jméno" -#: src/interface.c:231 src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "Zkopírovat _obojí" -#: src/interface.c:247 src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "_Přidat položku" -#: src/interface.c:258 src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "_Upravit položku" -#: src/interface.c:269 src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 msgid "_Clone Item" msgstr "_Zdvojit položku" -#: src/interface.c:280 src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "_Smazat položku" -#: src/interface.c:300 +#: src/interface.c:309 +msgid "_View" +msgstr "_Zobrazit" + +#: src/interface.c:316 +msgid "_Title" +msgstr "Název" + +#: src/interface.c:320 +msgid "U_RL" +msgstr "" + +#: src/interface.c:324 +msgid "_User" +msgstr "Uživatel" + +#: src/interface.c:328 +msgid "_Password" +msgstr "_Heslo" + +#: src/interface.c:332 +msgid "_Category" +msgstr "Kategorie" + +#: src/interface.c:336 +msgid "_Notes" +msgstr "Poznámka" + +#: src/interface.c:340 +msgid "_Launcher" +msgstr "Spouštěč" + +#: src/interface.c:349 +msgid "Tool_bar" +msgstr "_Panel nástrojů" + +#: src/interface.c:354 msgid "_Settings" msgstr "Nastav_ení" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Nastavení _spouštěčů" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "Změna _hesla" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "_Panel nástrojů" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Nápověda" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "Soubor s hesly" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Uložit soubor s hesly" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Přidat" -#: src/interface.c:397 src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Spustit" -#: src/interface.c:403 src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Uživatel" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Heslo" -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Kategorie" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Hledat:" -#: src/interface.c:475 src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" msgstr "_Rozlišovat velikost" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Zobrazit / Upravit položku" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Název:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Heslo:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Zobrazit heslo" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Uživatel:" -#: src/interface.c:827 src/callbacks.c:597 src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Kategorie:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Zahrnout do defaultního seznamu." -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Poznámka:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Spouštěč:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Heslo..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Vítejte v" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "K_líč:" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "_Heslo:" -#: src/interface.c:1044 src/interface.c:1567 src/callbacks.c:1204 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Vybrat klíčový soubor" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Prosím zadejte své hlavní heslo" -#: src/interface.c:1070 src/callbacks.c:1424 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Zobrazit dialog klíčového souboru" -#: src/interface.c:1189 src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Automatické generování hesla" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Počet znaků:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Použít malá písmena (a, b, c, ...)" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Použít velká písmena (A, B, C, ...)" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Použít čísla (1, 2, 3, ...)" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Použít ostatní znaky (!, @, #, ...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Vyloučit nejednoznačné znaky (l,I&1, O&0, ...)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Bitový ekvivalent: 2 ^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Počet kombinací: 10 ^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Volby generátoru" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Vytvořené heslo:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Generovat!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Zvol si hlavní heslo" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" msgstr "Vítejte v Figaro's Password Manageru 2" -#: src/interface.c:1478 +#: src/interface.c:1558 msgid "" "Please choose the password which will be used to encrypt your passwords. It " "is vital that you remember this password; without it, you can not access " @@ -265,19 +293,19 @@ "hesla. Zapamatujte si toto heslo! Jeho zapomenutím ztratíte přístup k celému " "seznamu chráněných hesel." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "Prosím zvolte si _heslo:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "_Opakujte znovu pro kontrolu:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Hlavní heslo" -#: src/interface.c:1545 +#: src/interface.c:1625 msgid "" "Optionally you may specify the file which will be used to encrypt your " "passwords along with master password. Do not lose this file, is necessary " @@ -287,51 +315,51 @@ "hesel společně s hlavním heslem. Neztraťte tento soubor! Bez něho nebude " "možné získat přístup k seznamu hesel." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "_Klíčový soubor:" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "Klíčový soubor" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Nastavení _spouštěčů" -#: src/interface.c:1748 src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "do primary sel." -#: src/interface.c:1754 src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "do schránky" -#: src/interface.c:1760 src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "nekopírovat" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Zkopírovat _jméno:" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "Pří_kazový řádek:" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "Zkopírovat _heslo:" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "Jméno _spouštěče:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Spouštěč" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -343,21 +371,21 @@ "$u = jméno\n" "$p = heslo (nedoporučuje se)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "Para_metry příkazového řádku:" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "" -#: src/interface.c:1955 +#: src/interface.c:2035 msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -365,260 +393,280 @@ "Figaro's Password Manager\n" "Přepsán do GTK2" -#: src/interface.c:1957 +#: src/interface.c:2037 msgid "" "This application is licensed under the GNU General Public License Version 2 " "or (at your option) any later version.\n" msgstr "" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "Domácí stránka FPM2" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Nastavení" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Hledat v _názvu" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Hledat v UR_L" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Hledat v _uživateli" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Hledat v _poznámce" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Rozsah hledání" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Jen v současné _kategorii" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Podmínky hledání" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Hledání" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Uložit při _přidání hesla" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Uložit při _změně hesla" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Uložit při _smazání hesla" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Uložit při _ukončení programu" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Automatické ukládání souborů" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Vytvářet záložní soubory" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Ponechat" -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " záložních souborů" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Ukládání souborů" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Ukládání" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Povolit tray ikonu" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "Vždy zobrazovat tray ikonu" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "Automaticky minimalizovat" -#: src/interface.c:2289 src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "za " -#: src/interface.c:2298 src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr " minut" -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "Uzamknout po minimalizaci" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Tray ikona" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Tray ikona" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" msgstr "_Otevřít kategorii" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "Otevřít _hledání" + +#: src/interface.c:2464 +msgid "On Startup" msgstr "Při startu" -#: src/interface.c:2405 +#: src/interface.c:2483 +msgid "Call Launcher" +msgstr "Spustit spouštěč" + +#: src/interface.c:2484 +msgid "Copy Username" +msgstr "Zkopírovat jméno" + +#: src/interface.c:2485 +msgid "Copy Password" +msgstr "Zkopírovat heslo" + +#: src/interface.c:2486 +msgid "Copy Both" +msgstr "Zkopírovat obojí" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "Otevřít pro úpravu" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "Při aktivaci záznamu" + +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "Vymazat _cíl po kopírování" -#: src/interface.c:2409 -msgid "Copy target" +#: src/interface.c:2522 +msgid "Copy Target" msgstr "Cíl kopírování" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Ostatní" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Nastavení" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Podmínky hledání" - -#: src/interface.c:2681 src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Vytváření náhodných dat" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Prosím pohybujte myší pro získání náhodných dat" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "Zobrazit / _Skrýt" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Uzamknout" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Odemknout" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Ikony a text" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Jen ikony" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Jen text" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Skrýt panel nástrojů" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Určitě chcete zrušit všechny změny?" -#: src/callbacks.c:500 src/callbacks.c:1295 src/fpm.c:421 src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "<Žádný>" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Určitě chcete smazat tuto položku?" -#: src/callbacks.c:530 src/callbacks.c:918 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Počet hesel v současné kategorii: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Exportovat hesla" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Typ exportu:" -#: src/callbacks.c:579 src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "Čisté XML" -#: src/callbacks.c:585 src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 msgid "Launchers:" msgstr "Spouštěč:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Neexportovat" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" msgstr "Exportovat jen spouštěče, které se používají ve vybrané kategorii." -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Exportovat vše" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Importovat hesla" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Typ importu:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Neimportovat" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Importovat jen nové spouštěče" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Importovat a nahradit všechny současné spouštěče" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "Neměnit kategorii hesel" -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, c-format msgid "" "Current location of password file:\n" @@ -631,78 +679,76 @@ "\n" "Použitá šifra: %s" -#: src/callbacks.c:732 src/fpm.c:538 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Chcete uložit změny?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Otevřít soubor s hesly" -#: src/callbacks.c:765 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Uložit soubor s hesly" -#: src/callbacks.c:776 src/callbacks.c:1272 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Nepojmenovaný soubor s hesly" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Nový soubor s hesly" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Prosím napište jméno spouštěče." -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Skrýt dialog klíčového souboru" +#: src/callbacks.c:1497 +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Skutečně chcete rozšifrovat a zobrazit všechna hesla?" + #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Název" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "" -#: src/fpm.c:129 +#: src/fpm.c:93 +msgid "Password" +msgstr "Heslo" + +#: src/fpm.c:95 +msgid "Notes" +msgstr "Poznámka" + +#: src/fpm.c:96 +msgid "Launcher" +msgstr "Spouštěč" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" "File already locked." msgstr "" -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -711,28 +757,28 @@ "Heslo přesáhlo povolenou délku %d znaků\n" "Zadal jste %d znaků." -#: src/fpm.c:597 +#: src/fpm.c:538 msgid "primary selection" msgstr "primárního výběru" -#: src/fpm.c:598 +#: src/fpm.c:539 msgid "user" msgstr "jméno uživatele" -#: src/fpm.c:602 +#: src/fpm.c:543 msgid "clipboard" msgstr "schránky" -#: src/fpm.c:605 +#: src/fpm.c:546 msgid "password" msgstr "heslo" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Kopíruji %s do %s." -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -740,7 +786,7 @@ "Spouštěč není definován.\n" "Prosím definujte ho v nastavení spouštěčů." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -748,15 +794,17 @@ "Tento záznam nemá přiřazený spouštěč.\n" "Pro jeho přiřazení použijte \"Upravit\"." -#: src/fpm.c:729 src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "Nemohu přečíst klíčový soubor!" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Nesprávné heslo. Zkuste to znovu." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" @@ -772,40 +820,40 @@ "Prosím mějte na paměti, že tento soubor pak nebude možné otevírat ve starší " "verzi FPM2." -#: src/fpm.c:792 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "Převod souboru s hesly na nový formát skončil úspěšně!" -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Hesla nejsou totožná!" -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Heslo je příliš krátké!" -#: src/fpm.c:1000 +#: src/fpm.c:978 msgid "Information" msgstr "Informace" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaro's Password Manager 2 - uzamčen" -#: src/fpm.c:1506 +#: src/fpm.c:1547 msgid "Question" msgstr "Otázka" -#: src/fpm.c:1519 +#: src/fpm.c:1560 msgid "Primary selection" msgstr "Primární výběr" -#: src/fpm.c:1520 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Schránka" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -813,31 +861,39 @@ "\n" "Prosím vyberte položku!" -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "<Žádná>" -#: src/fpm_file.c:231 -#, fuzzy, c-format +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 +#, c-format msgid "Saved %d password(s)." -msgstr "Uložit soubor s hesly" +msgstr "Počet uložených hesel: %d" -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, c-format msgid "Exported clear XML passwords to %s." msgstr "Hesla byla vyexportována do nešifrovaného XML souboru %s." -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format msgid "" "Sorry, the password file cannot be read because it uses a future file " @@ -846,23 +902,32 @@ "Soubor s hesly nemůže být načten, protože používá nový formát. Prosím " "stáhněte si nejnovější verzi FPM2 a vyzkoušejte to znovu.\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Soubor pravděpodobně není XML." -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." msgstr "Soubor nemá platný formát." -#: src/fpm_file.c:615 src/fpm_file.c:672 +#: src/fpm_file.c:613 src/fpm_file.c:670 msgid "Invalid password file." msgstr "Poškozený soubor s hesly." -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 #, c-format msgid "Imported %d password(s)." msgstr "Počet naimportovaných hesel: %d" +#~ msgid "Unrecognized option.\n" +#~ msgstr "Neznámá volba.\n" + +#~ msgid "_Preferences" +#~ msgstr "_Nastavení" + +#~ msgid "Search Conditions" +#~ msgstr "Podmínky hledání" + #, fuzzy #~ msgid "Loaded %d password(s)." #~ msgstr "Uložit soubor s hesly" Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/de.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/de.gmo differ diff -Nru fpm2-0.76.1/po/de.po fpm2-0.78/po/de.po --- fpm2-0.76.1/po/de.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/de.po 2010-02-24 08:12:33.000000000 +0200 @@ -7,10 +7,10 @@ # msgid "" msgstr "" -"Project-Id-Version: fpm2 0.72\n" +"Project-Id-Version: fpm2 0.77\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 13:41+0100\n" -"PO-Revision-Date: 2008-07-07 17:17+0200\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" +"PO-Revision-Date: 2010-02-11 10:50+0100\n" "Last-Translator: Mike Constabel \n" "Language-Team: German\n" "MIME-Version: 1.0\n" @@ -18,244 +18,272 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Unbekannte Option.\n" - -#: src/interface.c:120 src/interface.c:983 src/interface.c:1015 src/fpm.c:1346 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Datei" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" msgstr "Passwörter _importieren" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" msgstr "Passwörter _exportieren" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "_Minimieren" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "_Bearbeiten" -#: src/interface.c:209 src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "_Passwort kopieren" -#: src/interface.c:220 src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "Ben_utzername kopieren" -#: src/interface.c:231 src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "_Beides kopieren" -#: src/interface.c:247 src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "Eintrag _hinzufügen" -#: src/interface.c:258 src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "Eintrag _bearbeiten" -#: src/interface.c:269 src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 msgid "_Clone Item" msgstr "Eintrag _kopieren" -#: src/interface.c:280 src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "Eintrag _löschen" -#: src/interface.c:300 +#: src/interface.c:309 +msgid "_View" +msgstr "_Ansicht" + +#: src/interface.c:316 +msgid "_Title" +msgstr "_Titel" + +#: src/interface.c:320 +msgid "U_RL" +msgstr "U_RL" + +#: src/interface.c:324 +msgid "_User" +msgstr "Ben_utzer" + +#: src/interface.c:328 +msgid "_Password" +msgstr "_Passwort" + +#: src/interface.c:332 +msgid "_Category" +msgstr "_Kategorie" + +#: src/interface.c:336 +msgid "_Notes" +msgstr "_Notizen" + +#: src/interface.c:340 +msgid "_Launcher" +msgstr "_Starter" + +#: src/interface.c:349 +msgid "Tool_bar" +msgstr "Symbol_leiste" + +#: src/interface.c:354 msgid "_Settings" msgstr "_Einstellungen" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Programm_starter Einstellungen" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "_Passwort ändern" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "Symbol_leiste" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Hilfe" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "_Aktuelle Passwortdatei" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Passwortdatei speichern" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Neu" -#: src/interface.c:397 src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Springe" -#: src/interface.c:403 src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Benutzer" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Passwort" -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Kategorie" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Suche:" -#: src/interface.c:475 src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" -msgstr "_Unterscheide Groß-/Kleinschreibung" +msgstr "Unterscheide _Groß-/Kleinschreibung" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Passworteintrag ansehen / bearbeiten" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Titel:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "URL / Arg:" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Passwort:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Zeige Passwort" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Benutzername" -#: src/interface.c:827 src/callbacks.c:597 src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Kategorie" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Zeige diesen Eintrag in der Standardliste" -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Notiz:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Starter:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Erzeuge..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Willkommen bei" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "Schlüssel_datei" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "_Passwort:" -#: src/interface.c:1044 src/interface.c:1567 src/callbacks.c:1204 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Wähle Schlüsseldatei" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Bitte gebe Dein Masterpasswort ein" -#: src/interface.c:1070 src/callbacks.c:1424 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Zeige Schlüsseldatei-Dialog" -#: src/interface.c:1189 src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Passwort automatisch erzeugen" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Anzahl Zeichen:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Verwende Kleinbuchstaben (a, b, c,... )" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Verwende Großbuchstaben (A, B, C.. )" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Verwende Ziffern (1, 2, 3... )" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Verwende Symbole (!, @, #...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Vermeide mehrdeutige Zeichen (l, I&1, O&0, usw.)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Bit äquivalent: 2^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Anzahl Kombinationen: 10^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Einstellungen zur Passwortgenerierung" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Erzeugtes Passwort:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Erzeuge!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Wähle ein HauptAAAAAApasswort" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" msgstr "Willkommen zum Figaro's Password Manager 2" -#: src/interface.c:1478 +#: src/interface.c:1558 msgid "" "Please choose the password which will be used to encrypt your passwords. It " "is vital that you remember this password; without it, you can not access " @@ -265,73 +293,73 @@ "verschlüsselt werden.Es ist wichtig, dass Du Dir das Passwort merkst, ohne " "dieses kann die Passwortdatei nicht mehr geöffnet werden." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "Bitte wähle ein Passwort:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "Zur Überprüfung gib es erneut ein:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Hauptpasswort" -#: src/interface.c:1545 +#: src/interface.c:1625 msgid "" "Optionally you may specify the file which will be used to encrypt your " "passwords along with master password. Do not lose this file, is necessary " "for access to your passwords." msgstr "" "Optional kannst Du eine Datei auswählen, mit der die Datenbank zusätzlich " -"zum Hauptpasswort verschlüsselt wird. Verliere diese Datei nicht, sie ist zwingend " -"nötig um die Datenbank zu öffnen." +"zum Hauptpasswort verschlüsselt wird. Verliere diese Datei nicht, sie ist " +"zwingend nötig um die Datenbank zu öffnen." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "Schlüssel_datei" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "Schlüsseldatei" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Programm_starter Einstellungen" -#: src/interface.c:1748 src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "zur primären Auswahl" -#: src/interface.c:1754 src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "zur Zwischenablage" -#: src/interface.c:1760 src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "nicht kopieren" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Kopiere Benutzername" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "Kommandozeile:" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "Kopiere Passwort:" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "Name des Programmstarters:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Starter" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -343,23 +371,23 @@ "$u = Benutzername\n" "$p = Passwort (nicht empfehlenswert)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "Kommandozeilen_variablen" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "FPM2" -#: src/interface.c:1955 +#: src/interface.c:2035 msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" "(c) 2000-2003 John Conneely & andere Mitwirkende\n" "(c) 2008-2009 Aleš Koval" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -367,7 +395,7 @@ "Figaro's Password Manager\n" "GTK2-Port" -#: src/interface.c:1957 +#: src/interface.c:2037 msgid "" "This application is licensed under the GNU General Public License Version 2 " "or (at your option) any later version.\n" @@ -375,254 +403,278 @@ "Dieses Programm ist freigegeben unter der GNU General Public License >= " "Version 2.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "FPM2 Homepage" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Einstellungen" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Suche in _Titel" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Suche in _URL" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Suche in _Benutzername" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Suche in _Notiz" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Suchbereich" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Suche nur in aktueller _Kategorie" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Suchbedingungen" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Suchen" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "wenn Eintrag _hinzugefügt wurde" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "wenn Eintrag ge_ändert wurde" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "wenn Eintrag ge_löscht wurde" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "beim Be_enden" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Automatisches Speichern der Passwortdatei" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Erzeuge _Backups der Passwortdatei" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Behalte " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " Backupdateien" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Backups" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Speichern" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "_Verwende Tray Symbol" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "_Tray Symbol immer sichtbar" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "_Automatisches minimieren" -#: src/interface.c:2289 src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "nach " -#: src/interface.c:2298 src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr "Minuten " -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "_Sperre Programm nach dem minimieren" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Tray Symbol" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Tray Symbol" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" msgstr "_Öffne diese Kategorie" -#: src/interface.c:2376 -msgid "On startup" -msgstr "Beim starten" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "Öffne _Suchdialog" + +#: src/interface.c:2464 +msgid "On Startup" +msgstr "Beim Starten" + +#: src/interface.c:2483 +msgid "Call Launcher" +msgstr "Starter aufrufen" + +#: src/interface.c:2484 +msgid "Copy Username" +msgstr "Benutzername kopieren" + +#: src/interface.c:2485 +msgid "Copy Password" +msgstr "Passwort kopieren" + +#: src/interface.c:2486 +msgid "Copy Both" +msgstr "Beides kopieren" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "Öffne Bearbeitungsfenster" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "Wenn Eintrag ausgewählt" -#: src/interface.c:2405 +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "_Leere Ziel nach dem einfügen" -#: src/interface.c:2409 -msgid "Copy target" +#: src/interface.c:2522 +msgid "Copy Target" msgstr "Kopierziel" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Sonstiges" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Einstellungen" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Suchbedingungen" - -#: src/interface.c:2681 src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Erzeuge Zufallswerte" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Bitte bewege die Maus um Zufallswerte zu erzeugen" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "_Zeigen / Verstecken" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Sperren" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Entsperren" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Symbole und Text" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Nur Symbole" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Nur Text" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Verstecke Symbolleiste" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Bist Du sicher, dass Du die Änderungen verwerfen willst?" -#: src/callbacks.c:500 src/callbacks.c:1295 src/fpm.c:421 src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Bist Du sicher, dass Du diesen Eintrag löschen möchtest" -#: src/callbacks.c:530 src/callbacks.c:918 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Passwörter in Kategorie: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Passwörter exportieren" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Exportformat:" -#: src/callbacks.c:579 src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "XML Klartext" -#: src/callbacks.c:585 src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 msgid "Launchers:" msgstr "Starter:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Nicht exportieren" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" -msgstr "Nur die Starter exportieren, die in der gewählten Kategorie verwendet werden" +msgstr "" +"Nur die Starter exportieren, die in der gewählten Kategorie verwendet werden" -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Alle Starter exportieren" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Importieren einer Passwortdatei" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Importformat:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Nicht importieren" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Importiere nur neue Starter" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Importiere und ersetze alle Starter" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." -msgstr "Ändere nicht die Kategorie von Einträgen sondern importiere sie so wie sie sind" +msgstr "" +"Ändere nicht die Kategorie von Einträgen sondern importiere sie so wie sie " +"sind" -#: src/callbacks.c:717 +#: src/callbacks.c:688 +#, c-format msgid "" "Current location of password file:\n" "%s\n" @@ -633,53 +685,69 @@ "%s\n" "Verschlüsselungsverfahren: %s" -#: src/callbacks.c:732 src/fpm.c:538 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Möchtest Du die Änderungen speichern?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Passwortdatei öffnen" -#: src/callbacks.c:765 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Passwortdatei speichern" -#: src/callbacks.c:776 src/callbacks.c:1272 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Unbenannte Passwortdatei" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Neue Passwortdatei" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Bitte wähle einen Starternamen." -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Verstecke den Schlüsseldatei-Dialog" +#: src/callbacks.c:1497 +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Bist Du sicher, dass Du Alle Passwörter entschlüsseln und anzeigen möchtest?" + #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Kann pixmap Datei nicht finden: %s" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Titel" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "URL" -#: src/fpm.c:129 +#: src/fpm.c:93 +msgid "Password" +msgstr "Passwort" + +#: src/fpm.c:95 +msgid "Notes" +msgstr "Notizen" + +#: src/fpm.c:96 +msgid "Launcher" +msgstr "Starter" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "Kann %s nicht öffnen" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -688,28 +756,7 @@ "Kann %s nicht sperren.\n" "Datei ist bereits gesperrt." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "Kann keinen link zu %s anlegen" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "Kann keinen fstst auf %s durchführen" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"Lock Datei %s existiert.\n" -"Wenn Du meinst die Ist ein Fehler, lösche die Datei\n" -"im Verzeichnis %s." - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -718,29 +765,28 @@ "Passwort ist länger als %d Zeichen\n" "Dein Passwort würde auf %d Zeichen gekürzt." -#: src/fpm.c:597 -#, fuzzy +#: src/fpm.c:538 msgid "primary selection" msgstr "Primärauswahl" -#: src/fpm.c:598 +#: src/fpm.c:539 msgid "user" msgstr "Benutzer" -#: src/fpm.c:602 +#: src/fpm.c:543 msgid "clipboard" msgstr "Zwischenablage" -#: src/fpm.c:605 +#: src/fpm.c:546 msgid "password" msgstr "Passwort" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Kopiere %s nach %s." -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -748,7 +794,7 @@ "Dieses Programmstarter Kommando ist nicht definiert.\n" "Bitte definiere es in den Programmstarter Einstellungen." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -756,15 +802,17 @@ "Der Programmstarter für diesen Eintrag ist nicht definiert.\n" "Bitte definiere einen unter 'Passwort bearbeiten'." -#: src/fpm.c:729 src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "Kann Schlüsseldatei nicht lesen!" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Passwort falsch. Bitte versuch es nocheinmal." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" @@ -775,44 +823,46 @@ msgstr "" "Altes Datenbankformat festgestellt.\n" "\n" -"Möchtest Du die Datenbank mit einem sichereren Verschlüsselungsverfahren neu verschlüsseln?\n" +"Möchtest Du die Datenbank mit einem sichereren Verschlüsselungsverfahren neu " +"verschlüsseln?\n" "\n" -"Bedenke das Du die konvertierte Datenbank dann nicht mehr mit einer älteren Version von FPM2 öffnen kannst." +"Bedenke das Du die konvertierte Datenbank dann nicht mehr mit einer älteren " +"Version von FPM2 öffnen kannst." -#: src/fpm.c:792 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "Konvertierung der Datenbank abgeschlossen." -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Die Passwörter stimmen nicht überein." -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Dein Passwort ist zu kurz." -#: src/fpm.c:1000 +#: src/fpm.c:978 msgid "Information" msgstr "Information" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaro's Password Manager 2 - gesperrt" -#: src/fpm.c:1506 +#: src/fpm.c:1547 msgid "Question" msgstr "Frage" -#: src/fpm.c:1519 +#: src/fpm.c:1560 msgid "Primary selection" -msgstr "Primäreauswahl" +msgstr "Primärauswahl" -#: src/fpm.c:1520 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Zwischenablage" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -820,51 +870,62 @@ "\n" "Bitte wähle eine Zeile." -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "%d Passwörter gespeichert" -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 +#, c-format msgid "Exported clear XML passwords to %s." msgstr "Passwörter als Klartext-XML exportiert nach %s." -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format msgid "" "Sorry, the password file cannot be read because it uses a future file " "format. Please download the latest version of FPM2 and try again.\n" msgstr "" -"Diese Datenbank kann nicht gelesen werden da sie ein neueres Format verwendet als die von Dir verwendete FPM2-Version.\n" +"Diese Datenbank kann nicht gelesen werden da sie ein neueres Format " +"verwendet als die von Dir verwendete FPM2-Version.\n" "Bitte lade die neueste Version von FPM2 herunter und versuche es erneut.\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Datei ist nicht im XML-Format?" -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." msgstr "Datei ist keine gültige FPM2-Passwortdatei" -#: src/fpm_file.c:615 src/fpm_file.c:672 +#: src/fpm_file.c:613 src/fpm_file.c:670 msgid "Invalid password file." msgstr "Ungültige Passwortdatei" -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 +#, c-format msgid "Imported %d password(s)." msgstr "%d Passwörter importiert" Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/es.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/es.gmo differ diff -Nru fpm2-0.76.1/po/es.po fpm2-0.78/po/es.po --- fpm2-0.76.1/po/es.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/es.po 2010-02-24 08:12:33.000000000 +0200 @@ -2,347 +2,365 @@ # Spanish messages for fpm2. # Copyright (C) 2008 THE fpm2'S COPYRIGHT HOLDER # This file is distributed under the same license as the fpm2 package. -# Antonio Rguez. Capita , 2009 -# antoniorc , 2009 +# Antonio Rguez. Capita , 2009, 2010. +# Antonio Rguez. Capita , 2010. msgid "" msgstr "" -"Project-Id-Version: fpm2 0.72\n" +"Project-Id-Version: fpm2 0.77\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 13:41+0100\n" -"PO-Revision-Date: 2009-02-28 10:55+0100\n" -"Last-Translator: Antonio Rguez. Capita \n" -"Language-Team: Antonio Rguez. Capita\n" -"Language: es\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" +"PO-Revision-Date: 2010-02-14 19:13+0100\n" +"Last-Translator: Antonio Rguez. Capita \n" +"Language-Team: es <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: es\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.3.1\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Opción desconocida.\n" - -#: src/interface.c:120 -#: src/interface.c:983 -#: src/interface.c:1015 -#: src/fpm.c:1346 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "Figaro's Password Manager 2" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Archivo" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" msgstr "_Importar contraseñas" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" msgstr "_Exportar contraseñas" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "_Minimizar al área de notificación" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "_Editar" -#: src/interface.c:209 -#: src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "Copiar _contraseña" -#: src/interface.c:220 -#: src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "Copiar _usuario" -#: src/interface.c:231 -#: src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "Copiar a_mbos" -#: src/interface.c:247 -#: src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "_Añadir elemento" -#: src/interface.c:258 -#: src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "_Editar elemento" -#: src/interface.c:269 -#: src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 msgid "_Clone Item" msgstr "C_lonar elemento" -#: src/interface.c:280 -#: src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "Bo_rrar elemento" -#: src/interface.c:300 +#: src/interface.c:309 +msgid "_View" +msgstr "_Ver" + +#: src/interface.c:316 +msgid "_Title" +msgstr "_Título" + +#: src/interface.c:320 +msgid "U_RL" +msgstr "U_RL" + +#: src/interface.c:324 +msgid "_User" +msgstr "_Usuario" + +#: src/interface.c:328 +msgid "_Password" +msgstr "_Contraseña" + +#: src/interface.c:332 +msgid "_Category" +msgstr "_Categoría" + +#: src/interface.c:336 +msgid "_Notes" +msgstr "_Notas" + +#: src/interface.c:340 +msgid "_Launcher" +msgstr "_Lanzador" + +#: src/interface.c:349 +msgid "Tool_bar" +msgstr "_Barra de herramientas" + +#: src/interface.c:354 msgid "_Settings" msgstr "_Opciones" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Preferencias _lanzador" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "_Cambiar contraseña" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "_Barra de herramientas" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Ayuda" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "Archivo actual de claves" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Guardar lista de contraseñas" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Nuevo" -#: src/interface.c:397 -#: src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Ir a" -#: src/interface.c:403 -#: src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Usuario" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Contraseña" -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Categoría" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Buscar:" -#: src/interface.c:475 -#: src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" msgstr "Coincidir con _mayúsculas y minúsculas" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Ver / Editar Contraseña" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Título:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "URL / Arg:" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Contraseña:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Ver contraseña" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Nombre usuario:" -#: src/interface.c:827 -#: src/callbacks.c:597 -#: src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Categoría:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Incluir esta contraseña en la lista por defecto." -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Notas:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Lanzador:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Generar..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Bienvenido a" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "_Archivo clave" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "_Contraseña:" -#: src/interface.c:1044 -#: src/interface.c:1567 -#: src/callbacks.c:1204 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Seleccionar archivo clave" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Introduzca su contraseña maestra" -#: src/interface.c:1070 -#: src/callbacks.c:1424 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Mostrar diálogo de Archivo Clave" -#: src/interface.c:1189 -#: src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Autogenerar contraseña" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Número de caracteres:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Usar minúsculas (a, b, c,...)" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Usar mayúsculas (A, B, C, ...)" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Usar números (1, 2, 3, ...)" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Usar símbolos (!, @, #, ...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Incluir caracteres ambiguos (l,I&1, O&0, ...)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Bit equivalente: 2 ^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Número de combinaciones: 10 ^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Opciones de generación" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Contraseña generada:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "¡Generar!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Elija la contraseña maestra" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" msgstr "Bienvenido a Figaro's Password Manager 2" -#: src/interface.c:1478 -msgid "Please choose the password which will be used to encrypt your passwords. It is vital that you remember this password; without it, you can not access your password list." -msgstr "Introduzca la contraseña que se usará para cifrar sus contraseñas. Es vital que recuerde esta contraseña; sin ella, no podrá acceder a su lista de contraseñas." +#: src/interface.c:1558 +msgid "" +"Please choose the password which will be used to encrypt your passwords. It " +"is vital that you remember this password; without it, you can not access " +"your password list." +msgstr "" +"Introduzca la contraseña que se usará para cifrar sus contraseñas. Es vital " +"que recuerde esta contraseña; sin ella, no podrá acceder a su lista de " +"contraseñas." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "Introduzca su _contraseña:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "_Verifique tecleando de nuevo:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Contraseña Maestra" -#: src/interface.c:1545 -msgid "Optionally you may specify the file which will be used to encrypt your passwords along with master password. Do not lose this file, is necessary for access to your passwords." -msgstr "Opcionalmente puede especificar un archivo que será usado para cifrar sus contraseñas junto con la contraseña maestra. No pierda este archivo, será necesario para acceder a sus contraseñas." +#: src/interface.c:1625 +msgid "" +"Optionally you may specify the file which will be used to encrypt your " +"passwords along with master password. Do not lose this file, is necessary " +"for access to your passwords." +msgstr "" +"Opcionalmente puede especificar un archivo que será usado para cifrar sus " +"contraseñas junto con la contraseña maestra. No pierda este archivo, será " +"necesario para acceder a sus contraseñas." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "Archivo _clave:" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "Archivo Clave" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Preferencias _lanzador" -#: src/interface.c:1748 -#: src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "a primera sel." -#: src/interface.c:1754 -#: src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "al portapapeles" -#: src/interface.c:1760 -#: src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "no copiar" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Copiar _usuario:" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "_Línea de comandos:" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "Copiar _contraseña:" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "_Nombre lanzador:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Lanzador" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -354,23 +372,23 @@ "$u = nombre de usuario\n" "$p = contraseña (no recomendado)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "Variables de línea de comandos" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "FPM2" -#: src/interface.c:1955 +#: src/interface.c:2035 msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -378,267 +396,283 @@ "Figaro's Password Manager\n" "Reescrito para GTK2" -#: src/interface.c:1957 -msgid "This application is licensed under the GNU General Public License Version 2 or (at your option) any later version.\n" -msgstr "Esta aplicación está sujeta a una licencia GNU General Public License Version 2 o (a su elección) cualquier versión posterior.\n" +#: src/interface.c:2037 +msgid "" +"This application is licensed under the GNU General Public License Version 2 " +"or (at your option) any later version.\n" +msgstr "" +"Esta aplicación está sujeta a una licencia GNU General Public License " +"Version 2 o (a su elección) cualquier versión posterior.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "Sitio web de FPM2" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Preferencias" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Buscar en _título" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Buscar en u_rl" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Buscar en _usuario" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Buscar en _notas" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Ámbito de la búsqueda" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Sólo en la _categoría actual" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Condiciones de búsqueda" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Buscar" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Guardar cuando se _añade entrada" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Guardar cuando se _modifica entrada" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Guardar cuando se _elimina entrada" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Guardar al _salir" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Guardado Automático del Archivo" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Crear una copia de seguridad de los archivos" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Mantener " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " históricos de copias de seguridad" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Guardado de Archivo" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Guardando" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Activar el _icono del área de notificación" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "Icono del área de notificación siempre visible" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "Auto _minimizar al área de notificación" -#: src/interface.c:2289 -#: src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "después de " -#: src/interface.c:2298 -#: src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr " minutos" -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr " Bloquear el programa tras minimizar" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Icono Área Notificación" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Icono Área Notificación" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" msgstr "_Abrir esta categoría" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "Abrir cuadro de bú_squeda" + +#: src/interface.c:2464 +msgid "On Startup" msgstr "Al inicio" -#: src/interface.c:2405 +#: src/interface.c:2483 +msgid "Call Launcher" +msgstr "Usar Lanzador" + +#: src/interface.c:2484 +msgid "Copy Username" +msgstr "Copiar Usuario" + +#: src/interface.c:2485 +msgid "Copy Password" +msgstr "Copiar Contraseña" + +#: src/interface.c:2486 +msgid "Copy Both" +msgstr "Copiar Ambos" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "Abrir Ventana Editor" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "Cuando se activa una Entrada" + +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "_Eliminar objetivo tras pegar" -#: src/interface.c:2409 -msgid "Copy target" -msgstr "Copiar objetivo" +#: src/interface.c:2522 +msgid "Copy Target" +msgstr "Copiar Objetivo" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Otros" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Preferencias" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Condiciones de búsqueda" - -#: src/interface.c:2681 -#: src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Generar entropía" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Por favor, mueva el ratón para recopilar entropía" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "_Mostrar / Ocultar" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Bloquear" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Desbloquear" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Iconos y texto" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Sólo iconos" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Sólo texto" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Ocultar barra de herramientas" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "¿Seguro que desea descartar los cambios?" -#: src/callbacks.c:500 -#: src/callbacks.c:1295 -#: src/fpm.c:421 -#: src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "¿Está seguro que desea eliminar este elemento?" -#: src/callbacks.c:530 -#: src/callbacks.c:918 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Contraseñas en categoría: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Exportar contraseñas" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Tipo de exportación:" -#: src/callbacks.c:579 -#: src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "XML Plano" -#: src/callbacks.c:585 -#: src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 msgid "Launchers:" msgstr "Lanzadores:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "No exportar" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" -msgstr "Exportar sólo los lanzadores que se han usado en la categoría seleccionada" +msgstr "" +"Exportar sólo los lanzadores que se han usado en la categoría seleccionada" -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Exportar todo" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Importar archivo de contraseñas" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Tipo de importación:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "No importar" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Sólo importar nuevos lanzadores" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Importar y reemplazar todos los lanzadores actuales" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "No cambiar la categoría de los elementos." -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, c-format msgid "" "Current location of password file:\n" @@ -651,56 +685,69 @@ "\n" "Cifrado: %s" -#: src/callbacks.c:732 -#: src/fpm.c:538 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "¿Quiere guardar los cambios?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Abrir archivo de contraseñas" -#: src/callbacks.c:765 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Guardar archivo de contraseñas" -#: src/callbacks.c:776 -#: src/callbacks.c:1272 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Archivo de contraseñas sin título" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Nuevo archivo de contraseñas" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Introduzca nombre del lanzador." -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Ocultar diálogo de Archivo Clave" -#: src/support.c:90 -#: src/support.c:114 +#: src/callbacks.c:1497 +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "¿Seguro que desea descifrar y mostrar TODAS las contraseñas?" + +#: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "No se puede encontrar el archivo pixmap: %s" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Título" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "URL" -#: src/fpm.c:129 +#: src/fpm.c:93 +msgid "Password" +msgstr "Contraseña" + +#: src/fpm.c:95 +msgid "Notes" +msgstr "Notas" + +#: src/fpm.c:96 +msgid "Launcher" +msgstr "Lanzador" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "No se puede abrir %s" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -709,27 +756,7 @@ "No se puede bloquear %s\n" "Archivo ya bloqueado." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "No se puede crear un enlace a %s" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "No se puede fstat %s" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"Existe el archivo de bloqueo %s\n" -"Si sabe que esto es un error, elimine los archivos de bloqueo en la carpeta %s" - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -738,28 +765,28 @@ "La contraseña excede el límite de %d caracteres\n" "Su contraseña de %d caracteres será recortada." -#: src/fpm.c:597 +#: src/fpm.c:538 msgid "primary selection" msgstr "primera selección" -#: src/fpm.c:598 +#: src/fpm.c:539 msgid "user" msgstr "usuario" -#: src/fpm.c:602 +#: src/fpm.c:543 msgid "clipboard" msgstr "portapapeles" -#: src/fpm.c:605 +#: src/fpm.c:546 msgid "password" msgstr "contraseña" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Copiar %s a %s." -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -767,7 +794,7 @@ "El comando del lanzador de esta contraseña no se ha definido.\n" "Asigne un comando en la pantalla de preferencias de lanzador." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -775,63 +802,66 @@ "El lanzador de esta contraseña no se ha definido.\n" "Asigne un lanzador en la pantalla de edición de elementos." -#: src/fpm.c:729 -#: src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "¡No es posible leer el archivo de contraseñas!" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Contraseña incorrecta. Pruebe otra vez." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" "Do you want change password file to new more secure cipher?\n" "\n" -"Please take note that it will not be possible to continue open this password file in the earlier version FPM2." +"Please take note that it will not be possible to continue open this password " +"file in the earlier version FPM2." msgstr "" "Detectado archivo con formato antiguo.\n" "\n" "¿Quiere cambiar el archivo de contraseñas a un cifrado nuevo más seguro?\n" "\n" -"Tenga en cuenta que no será posible seguir abriendo este archivo en versiones anteriores de FPM2." +"Tenga en cuenta que no será posible seguir abriendo este archivo en " +"versiones anteriores de FPM2." -#: src/fpm.c:792 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "¡Conversión del archivo de contraseñas finalizada!" -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Lo siento, las contraseñas no coinciden." -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Lo siento, su contraseña es demasiado corta." -#: src/fpm.c:1000 +#: src/fpm.c:978 msgid "Information" msgstr "Información" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaro's Password Manager 2 - bloqueado" -#: src/fpm.c:1506 +#: src/fpm.c:1547 msgid "Question" msgstr "Pregunta" -#: src/fpm.c:1519 +#: src/fpm.c:1560 msgid "Primary selection" msgstr "Primera selección" -#: src/fpm.c:1520 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Portapapeles" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -839,61 +869,101 @@ "\n" "Seleccione una fila." -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "Guardadas %d contraseña(s)." -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, c-format msgid "Exported clear XML passwords to %s." msgstr "Exportado XML de contraseñas sin cifrar a %s." -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format -msgid "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM2 and try again.\n" -msgstr "Lo siento, el archivo de contraseñas no se puede leer porque utiliza un formato de fichero más nuevo. Descargue la última versión de FPM2 y vuelva a intentarlo.\n" +msgid "" +"Sorry, the password file cannot be read because it uses a future file " +"format. Please download the latest version of FPM2 and try again.\n" +msgstr "" +"Lo siento, el archivo de contraseñas no se puede leer porque utiliza un " +"formato de fichero más nuevo. Descargue la última versión de FPM2 y vuelva a " +"intentarlo.\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "¿El archivo no es XML?" -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." msgstr "No es un fichero válido de contraseñas de FPM2" -#: src/fpm_file.c:615 -#: src/fpm_file.c:672 +#: src/fpm_file.c:613 src/fpm_file.c:670 msgid "Invalid password file." msgstr "Archivo de contraseñas incorrecto." -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 #, c-format msgid "Imported %d password(s)." msgstr "Importadas %d contraseña(s)." +#~ msgid "Unrecognized option.\n" +#~ msgstr "Opción desconocida.\n" + +#~ msgid "_Preferences" +#~ msgstr "_Preferencias" + +#~ msgid "Search Conditions" +#~ msgstr "Condiciones de búsqueda" + +#~ msgid "Could not create a link to %s" +#~ msgstr "No se puede crear un enlace a %s" + +#~ msgid "Could not fstat %s" +#~ msgstr "No se puede fstat %s" + +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "Existe el archivo de bloqueo %s\n" +#~ "Si sabe que esto es un error, elimine los archivos de bloqueo en la " +#~ "carpeta %s" + #~ msgid "Loaded %d password(s)." #~ msgstr "Cargadas %d contraseña(s)." + #~ msgid "FPM2: Launcher Preferences" #~ msgstr "FPM2: Preferencias de lanzador" + #~ msgid "Plain text" #~ msgstr "Texto plano" + #~ msgid "CSV file" #~ msgstr "Archivo CSV" + #~ msgid "_Copy Both" #~ msgstr "Copiar a_mbos" @@ -904,44 +974,57 @@ #, fuzzy #~ msgid "category|" #~ msgstr "Categoría" + #~ msgid "" #~ msgstr "" #, fuzzy #~ msgid "FPM2: New Password File" #~ msgstr "FPM2: Nuevo archivo de contraseñas" + #~ msgid "Edit" #~ msgstr "Editar" + #~ msgid "Delete" #~ msgstr "Eliminar" + #~ msgid "" #~ msgstr "" + #~ msgid "Please select which launcher you wish to edit." #~ msgstr "Por favor, seleccione el lanzador que desea editar." + #~ msgid "Please select which launcher you wish to delete." #~ msgstr "Por favor, seleccione el lanzador que desea eliminar." + #~ msgid "Enter your password here." #~ msgstr "Introduzca su contraseña aquí." + #~ msgid "All Files" #~ msgstr "Todos archivos" #, fuzzy #~ msgid "Save Export Password File" #~ msgstr "Guardar archivo de contraseñas exportado" + #~ msgid "New Password Entry" #~ msgstr "Nueva entrada de contraseña" + #~ msgid "Edit Password Entry" #~ msgstr "Editar entrada de contraseña" + #~ msgid "Run launcher" #~ msgstr "Ejecutar lanzador" + #~ msgid "Copy user field to clipboard" #~ msgstr "Copiar campo usuario al portapapeles" + #~ msgid "Copy password field to clipboard" #~ msgstr "Copiar campo contraseña al portapapeles" #, fuzzy #~ msgid "_Delete item" #~ msgstr "_Eliminar entrada" + #~ msgid "Please select a row.\n" #~ msgstr "Seleccione una fila.\n" - Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/eu.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/eu.gmo differ diff -Nru fpm2-0.76.1/po/eu.po fpm2-0.78/po/eu.po --- fpm2-0.76.1/po/eu.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/eu.po 2010-02-24 08:12:33.000000000 +0200 @@ -8,340 +8,367 @@ msgstr "" "Project-Id-Version: fpm2 0.72\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 13:41+0100\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" "PO-Revision-Date: 2009-07-29 13:43+0100\n" "Last-Translator: Ales Zabala Alava (Shagi) \n" -"Language: eu\n" +"Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"Language-Team: \n" - -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Aukera ezezaguna.\n" -#: src/interface.c:120 -#: src/interface.c:983 -#: src/interface.c:1015 -#: src/fpm.c:1346 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "Figaroren Pasahitz Kudeatzailea 2" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Fitxategia" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" msgstr "Pasahitzak _Inportatu" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" msgstr "Pasahitzak _Esportatu" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "Erretilura ikonotu (_M)" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "_Editatu" -#: src/interface.c:209 -#: src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "_Pasahitza kopiatu" -#: src/interface.c:220 -#: src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "Erabiltzailea Kopiat_u" -#: src/interface.c:231 -#: src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "_Biak kopiatu" -#: src/interface.c:247 -#: src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "Elementu_a Gehitu" -#: src/interface.c:258 -#: src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "Elementua _Editatu" -#: src/interface.c:269 -#: src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 msgid "_Clone Item" msgstr "Elementua Klonatu (_C)" -#: src/interface.c:280 -#: src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "Elementua Ezabatu (_D)" -#: src/interface.c:300 +#: src/interface.c:309 +#, fuzzy +msgid "_View" +msgstr "_Fitxategia" + +#: src/interface.c:316 +#, fuzzy +msgid "_Title" +msgstr "Izenburua" + +#: src/interface.c:320 +#, fuzzy +msgid "U_RL" +msgstr "URL" + +#: src/interface.c:324 +#, fuzzy +msgid "_User" +msgstr "Erabiltzailea" + +#: src/interface.c:328 +#, fuzzy +msgid "_Password" +msgstr "_Pasahitza:" + +#: src/interface.c:332 +#, fuzzy +msgid "_Category" +msgstr "Kategoria" + +#: src/interface.c:336 +#, fuzzy +msgid "_Notes" +msgstr "Oharrak:" + +#: src/interface.c:340 +#, fuzzy +msgid "_Launcher" +msgstr "Abiarazlea:" + +#: src/interface.c:349 +#, fuzzy +msgid "Tool_bar" +msgstr "_Tresna barra" + +#: src/interface.c:354 msgid "_Settings" msgstr "Hobe_spenak" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Abiaraz_learen Hobespenak" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "_Pasahitza aldatu" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "_Tresna barra" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "Laguntza (_H)" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "Uneko Pasahitz Fitxategia" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Pasahitz zerrenda gorde" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Berria" -#: src/interface.c:397 -#: src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Salto" -#: src/interface.c:403 -#: src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Erabiltzailea" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Pasahitza" -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Kategoria" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Bilatu:" -#: src/interface.c:475 -#: src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" msgstr "Larriak/Xeheak bereizi (_M)" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Pasahitz elementua Ikusi / Editatu" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Izenburua:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "URL / Arg:" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Pasahitza:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Pasahitza erakutsi" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Erabiltzaile Izena:" -#: src/interface.c:827 -#: src/callbacks.c:597 -#: src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Kategoria:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Pasahitz hau lehenetsitako zerrendan txertatu." -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Oharrak:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Abiarazlea:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Sortu..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Ongi etorri" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "Gako_Fitxategia:" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "_Pasahitza:" -#: src/interface.c:1044 -#: src/interface.c:1567 -#: src/callbacks.c:1204 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Gako Fitxategia Aukeratu" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Pasahitz nagusia sartu mesedez" -#: src/interface.c:1070 -#: src/callbacks.c:1424 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Gako Fitxategia Aukeratzeko Elkarrizketa Erakutsi" -#: src/interface.c:1189 -#: src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Pasahitza Automatikoki Sortu" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Karaktere Kopurua:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Letra xeheak erabili (a, b, c,...)" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Letra larriak erabili (A, B, C, ...)" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Zenbakiak erabili (1, 2, 3, ...)" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Ikurrak erabili (!, @, #, ...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Karaktere zalantzagarriak ekidin (l,I&1, O&0, etab.)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Bit baliokidea: 2 ^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Konbinazio kopurua: 10 ^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Sortze Aukerak" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Sortutako Pasahitza:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Sortu!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Pasahitz nagusia aukeratu" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" msgstr "Ongi etorri Figaroren Pasahitz Kudeatzailea 2ra" -#: src/interface.c:1478 -msgid "Please choose the password which will be used to encrypt your passwords. It is vital that you remember this password; without it, you can not access your password list." -msgstr "Aukeratu mesedez zure pasahitzak zifratzeko erabiliko den pasahitza. Ezinbestekoa da pasahitz hau gogoratzea; bera gabe ezingo duzu zure pasahitz zerrenda atzitu." +#: src/interface.c:1558 +msgid "" +"Please choose the password which will be used to encrypt your passwords. It " +"is vital that you remember this password; without it, you can not access " +"your password list." +msgstr "" +"Aukeratu mesedez zure pasahitzak zifratzeko erabiliko den pasahitza. " +"Ezinbestekoa da pasahitz hau gogoratzea; bera gabe ezingo duzu zure pasahitz " +"zerrenda atzitu." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "_Pasahitz bat aukeratu:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "Berretsi berriro idatziz (_V):" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Pasahitz nagusia" -#: src/interface.c:1545 -msgid "Optionally you may specify the file which will be used to encrypt your passwords along with master password. Do not lose this file, is necessary for access to your passwords." -msgstr "Nahi izanez gero zure pasahitzak pasahitz nagusiarekin batera zifratzeko erabiliko den fitxategia adieraz dezakezu. Ez galdu fitxategi hau, zure pasahitzak atzitzeko beharrezkoa da." +#: src/interface.c:1625 +msgid "" +"Optionally you may specify the file which will be used to encrypt your " +"passwords along with master password. Do not lose this file, is necessary " +"for access to your passwords." +msgstr "" +"Nahi izanez gero zure pasahitzak pasahitz nagusiarekin batera zifratzeko " +"erabiliko den fitxategia adieraz dezakezu. Ez galdu fitxategi hau, zure " +"pasahitzak atzitzeko beharrezkoa da." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "Gako Fitxategia (_K):" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "Gako Fitxategia" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Abiarazlearen Hobespenak" -#: src/interface.c:1748 -#: src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "hautapen nagusira" -#: src/interface.c:1754 -#: src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "arbelera" -#: src/interface.c:1760 -#: src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "Ez kopiatu" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Erabiltzailea Kopiat_u:" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "Komando _Lerroa:" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "Pasahitza kopiatu (_W):" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "Abiarazlearen Ize_na:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Abiarazlea" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -353,23 +380,24 @@ "$u = erabiltzaile izena\n" "$p = pasahitza (ez gomendagarria)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "Komando lerroko aldagaiak (_V)" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "FPM2" -#: src/interface.c:1955 +#: src/interface.c:2035 +#, fuzzy msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" "(c) 2000-2003 John Conneely eta beste laguntzaileak\n" "(c) 2008-2009 Aleš Koval" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -377,267 +405,288 @@ "Figaroren Pasahitz Kudeatzailea\n" "GTK2rentzat berridatzia" -#: src/interface.c:1957 -msgid "This application is licensed under the GNU General Public License Version 2 or (at your option) any later version.\n" -msgstr "Aplikazio hau GNU Lizentzia Publiko Orokorra (GPL) 2 bertsioa edo (zure aukeran) ondorengo edozein bertsioarekin lizentziatuta dago.\n" +#: src/interface.c:2037 +msgid "" +"This application is licensed under the GNU General Public License Version 2 " +"or (at your option) any later version.\n" +msgstr "" +"Aplikazio hau GNU Lizentzia Publiko Orokorra (GPL) 2 bertsioa edo (zure " +"aukeran) ondorengo edozein bertsioarekin lizentziatuta dago.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "FPM2ren webgunea" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Hobespenak" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Izenburuan bila_tu" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "U_rl-an bilatu" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Erabiltzailean bilat_u" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Oharreta_n bilatu" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Bilaketa Esparrua" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Uneko kategorian bakarrik (_C)" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Bilaketa Baldintzak" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Bilatu" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Sarrer_a gehitzean gorde" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Sarrera aldatzean gorde (_C)" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Sarrera ezabatzean gor_de" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Irtetzean gorde (_Q)" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Fitxategiaren Gordetze Automatikoa" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "_Fitxategien segurtasun kopiak sortu" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Mantendu " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " segurtasun kopien historikoa" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Fitxategi Gordetzea" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Gordetzen" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Gaitu erretilu _ikonoa" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "Erretiluko ikonoa beti ikusgarri (_V)" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "Erretilu ikonora auto_matikoki bidali" -#: src/interface.c:2289 -#: src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "pasata " -#: src/interface.c:2298 -#: src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr " minutu" -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "Programa b_lokeatu minimizatu ondoren" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Erretiluko Ikonoa" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Erretiluko Ikonoa" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" msgstr "Kateg_oria hau ireki" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "" + +#: src/interface.c:2464 +#, fuzzy +msgid "On Startup" msgstr "Hasieran" -#: src/interface.c:2405 +#: src/interface.c:2483 +#, fuzzy +msgid "Call Launcher" +msgstr "Abiarazlea:" + +#: src/interface.c:2484 +#, fuzzy +msgid "Copy Username" +msgstr "Erabiltzailea Kopiat_u" + +#: src/interface.c:2485 +#, fuzzy +msgid "Copy Password" +msgstr "_Pasahitza kopiatu" + +#: src/interface.c:2486 +#, fuzzy +msgid "Copy Both" +msgstr "_Biak kopiatu" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "" + +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "Helburua itsatsi ondoren garbitu (_C)" -#: src/interface.c:2409 -msgid "Copy target" +#: src/interface.c:2522 +#, fuzzy +msgid "Copy Target" msgstr "Helburua kopiatu" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Besteak" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "Hobes_penak" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Bilaketa Baldintzak" - -#: src/interface.c:2681 -#: src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Entropia Sortu" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Mugitu zure sagua entropia biltzeko mesedez" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "Erakut_si / Ezkutatu" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "Gi_ltzatu" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "Desblokeat_u" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Ikonoak eta Testua" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Ikonoak Bakarrik" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Testua Bakarrik" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Tresna barra izkutatu" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Ziur zaude aldaketak ezeztatu nahi dituzula?" -#: src/callbacks.c:500 -#: src/callbacks.c:1295 -#: src/fpm.c:421 -#: src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Ziur zaude elementu hau ezabatu nahi duzula?" -#: src/callbacks.c:530 -#: src/callbacks.c:918 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "%d kategoriako pasahitzak" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Pasahitzak esportatu" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Esportazio mota:" -#: src/callbacks.c:579 -#: src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "XML Soila" -#: src/callbacks.c:585 -#: src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 msgid "Launchers:" msgstr "Abiarazleak:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Ez esportatu" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" msgstr "Hautatutako kategorian erabiltzen diren abiarazleak bakarrik esportatu" -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Guztia esportatu" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Pasahitz Fitxategia Inportatu" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Inportazio mota:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Ez inportatu" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Abiarazle berriak bakarrik inportatu" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Inportatu eta gainidatzi uneko abiarazle guztiak" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "Ez aldatu elementuen kategoria eta dagoen moduan inportatu." -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, c-format msgid "" "Current location of password file:\n" @@ -650,56 +699,73 @@ "\n" "Zifratzea: %s" -#: src/callbacks.c:732 -#: src/fpm.c:538 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Aldaketak gorde nahi dituzu?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Pasahitz Fitxategia Ireki" -#: src/callbacks.c:765 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Pasahitz Fitxategia Gorde" -#: src/callbacks.c:776 -#: src/callbacks.c:1272 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Izenbururik gabeko pasahitz fitxategia" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Pasahitz Fitxategi Berria" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Abiarazlearen izena sartu, mesedez." -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Gako Fitxategiaren Elkarrizketa Ezkutatu" -#: src/support.c:90 -#: src/support.c:114 +#: src/callbacks.c:1497 +#, fuzzy +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Ziur zaude aldaketak ezeztatu nahi dituzula?" + +#: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Ezin da pixmap fitxategia topatu: %s" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Izenburua" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "URL" -#: src/fpm.c:129 +#: src/fpm.c:93 +#, fuzzy +msgid "Password" +msgstr "Pasahitza:" + +#: src/fpm.c:95 +#, fuzzy +msgid "Notes" +msgstr "Oharrak:" + +#: src/fpm.c:96 +#, fuzzy +msgid "Launcher" +msgstr "Abiarazlea:" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "Ezin izan da %s ireki" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -708,28 +774,7 @@ "Ezin da %s giltzatu\n" "Fitxategia jadanik giltzatuta." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "Ezin da %s-(e)ra esteka sortu" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "Ezin zaio %s-(e)ri fstat egin" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"%s blokeo fitxategia existitzen da.\n" -"Ziur bazaude errore bat dela, ezabatu blokeo\n" -"fitxategiak %s direktorioan." - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -738,28 +783,28 @@ "Pasahitzak %d karaktereetako muga gainditu du\n" "Zure pasahitza %d karaktereetara moztu da." -#: src/fpm.c:597 +#: src/fpm.c:538 msgid "primary selection" msgstr "hautapen nagusia" -#: src/fpm.c:598 +#: src/fpm.c:539 msgid "user" msgstr "erabiltzailea" -#: src/fpm.c:602 +#: src/fpm.c:543 msgid "clipboard" msgstr "arbela" -#: src/fpm.c:605 +#: src/fpm.c:546 msgid "password" msgstr "pasahitza" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "%s %s-(e)ra kopiatu" -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -767,7 +812,7 @@ "Pasahitz honen abiarazlearen komandoa definitu gabe dago.\n" "Abiarazleen hobespenak editatzeko pantailan definitu mesedez." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -775,63 +820,66 @@ "Pasahitz honen abiarazlea definitu gabe dago.\n" "Pasahitza editatzeko pantailan definitu mesedez." -#: src/fpm.c:729 -#: src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "Ezin da fitxategia irakurri!" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Pasahitz ezegokia. Saiatu berriro mesedez." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" "Do you want change password file to new more secure cipher?\n" "\n" -"Please take note that it will not be possible to continue open this password file in the earlier version FPM2." +"Please take note that it will not be possible to continue open this password " +"file in the earlier version FPM2." msgstr "" "Formatu zaharreko fitxategia antzemanda.\n" "\n" "Pasahitz fitxategia zifratze sendoagora aldatu nahi duzu?\n" "\n" -"Mesedez kontutan hartu ezingo duzula fitxategi hau FPM2ren aurreko bertsioetan ireki." +"Mesedez kontutan hartu ezingo duzula fitxategi hau FPM2ren aurreko " +"bertsioetan ireki." -#: src/fpm.c:792 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "Pasahitz fitxategiaren bihurketa eginda!" -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Barkatu, pasahitzak ez datoz bat." -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Barkatu, zure pasahitza motzegia da." -#: src/fpm.c:1000 +#: src/fpm.c:978 msgid "Information" msgstr "Informazioa" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaroren Pasahitz Kudeatzailea 2 - giltzatuta" -#: src/fpm.c:1506 +#: src/fpm.c:1547 msgid "Question" msgstr "Galdera" -#: src/fpm.c:1519 +#: src/fpm.c:1560 msgid "Primary selection" msgstr "Hautapen nagusia" -#: src/fpm.c:1520 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Arbela" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -839,50 +887,85 @@ "\n" "Aukeratu lerro bat mesedez." -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "%d pasahitz gordeta." -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, c-format msgid "Exported clear XML passwords to %s." msgstr "Pasahitzak %s XML garbira esportatuta." -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format -msgid "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM2 and try again.\n" -msgstr "Barkatu, pasahitz fitxategia ezin da irakurri etorkizuneko fitxategi formatu bat erabiltzen duelako. Eskuratu mesedez FPM2-ren azkeneko bertsioa eta berriro saiatu.\n" +msgid "" +"Sorry, the password file cannot be read because it uses a future file " +"format. Please download the latest version of FPM2 and try again.\n" +msgstr "" +"Barkatu, pasahitz fitxategia ezin da irakurri etorkizuneko fitxategi formatu " +"bat erabiltzen duelako. Eskuratu mesedez FPM2-ren azkeneko bertsioa eta " +"berriro saiatu.\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Fitxategia ez da XML?" -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." msgstr "Fitxategia ez da baliozko FPM2 pasahitz fitxategia." -#: src/fpm_file.c:615 -#: src/fpm_file.c:672 +#: src/fpm_file.c:613 src/fpm_file.c:670 msgid "Invalid password file." msgstr "Pasahitz fitxategi ezegokia." -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 #, c-format msgid "Imported %d password(s)." msgstr "%d pasahitz inportatuta." +#~ msgid "Unrecognized option.\n" +#~ msgstr "Aukera ezezaguna.\n" + +#~ msgid "_Preferences" +#~ msgstr "Hobes_penak" + +#~ msgid "Search Conditions" +#~ msgstr "Bilaketa Baldintzak" + +#~ msgid "Could not create a link to %s" +#~ msgstr "Ezin da %s-(e)ra esteka sortu" + +#~ msgid "Could not fstat %s" +#~ msgstr "Ezin zaio %s-(e)ri fstat egin" + +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "%s blokeo fitxategia existitzen da.\n" +#~ "Ziur bazaude errore bat dela, ezabatu blokeo\n" +#~ "fitxategiak %s direktorioan." Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/fr.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/fr.gmo differ diff -Nru fpm2-0.76.1/po/fr.po fpm2-0.78/po/fr.po --- fpm2-0.76.1/po/fr.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/fr.po 2010-02-24 08:12:33.000000000 +0200 @@ -5,254 +5,282 @@ # msgid "" msgstr "" -"Project-Id-Version: fpm2 0.75\n" +"Project-Id-Version: fpm2 0.77\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-04-08 21:33+0200\n" -"PO-Revision-Date: 2009-04-08 21:33+0200\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" +"PO-Revision-Date: 2010-02-11 09:21+0100\n" "Last-Translator: Christoph J. Thompson \n" "Language-Team: French\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Option non reconnue.\n" - -#: src/interface.c:120 src/interface.c:983 src/interface.c:1015 src/fpm.c:1347 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "Gestionnaire de Mots de Passe de Figaro 2" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Fichier" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" msgstr "_Importer des Mots de Passe" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" msgstr "_Exporter les Mots de Passe" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "_Mettre en notification" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "_Editer" -#: src/interface.c:209 src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "Copier le Mot de _Passe" -#: src/interface.c:220 src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "Copier le Nom d'_Utilisateur" -#: src/interface.c:231 src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "Copier les _Deux" -#: src/interface.c:247 src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "_Ajouter un Signet" -#: src/interface.c:258 src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "_Editer un Signet" -#: src/interface.c:269 src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 msgid "_Clone Item" msgstr "_Clôner un Signet" -#: src/interface.c:280 src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "E_ffacer un Signet" -#: src/interface.c:300 +#: src/interface.c:309 +msgid "_View" +msgstr "_Voir" + +#: src/interface.c:316 +msgid "_Title" +msgstr "_Titre" + +#: src/interface.c:320 +msgid "U_RL" +msgstr "U_RL" + +#: src/interface.c:324 +msgid "_User" +msgstr "_Utilisateur" + +#: src/interface.c:328 +msgid "_Password" +msgstr "Mot de _Passe" + +#: src/interface.c:332 +msgid "_Category" +msgstr "Rubr_ique" + +#: src/interface.c:336 +msgid "_Notes" +msgstr "Comme_ntaires" + +#: src/interface.c:340 +msgid "_Launcher" +msgstr "_Raccourci" + +#: src/interface.c:349 +msgid "Tool_bar" +msgstr "_Barre d'Outils" + +#: src/interface.c:354 msgid "_Settings" msgstr "_Paramètres" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Éditeur de _Raccourci" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "Changer de Mot de _Passe" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "Barre d'Ou_tils" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Aide" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "Fichier de Mot de Passe actuel" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Enregistrer la collection de mots de passe" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Nouveau" -#: src/interface.c:397 src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Sauter" -#: src/interface.c:403 src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Utilisateur" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Mot de Passe" -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Rubrique" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Trouver:" -#: src/interface.c:475 src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" msgstr "_Respecter la casse" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Voir / Éditer un Signet" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Titre:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Mot de Passe:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Afficher" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Nom d'Utilisateur:" -#: src/interface.c:827 src/callbacks.c:597 src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Rubrique:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Inclure ce mot de passe dans la collection par défaut." -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Commentaires:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Raccourci:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Générer..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Bienvenue dans" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "_Fichier Clé:" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "Mot de _Passe:" -#: src/interface.c:1044 src/interface.c:1567 src/callbacks.c:1206 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Sélectioner le Fichier Clé" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Veuillez entrer votre mot de passe principal" -#: src/interface.c:1070 src/callbacks.c:1427 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Afficher la Boite de Dialogue de Fichier Clé" -#: src/interface.c:1189 src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Autogénérer le Mot de Passe" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Nombre de Caractères:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Utiliser des lettres minuscules (a, b, c)" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Utiliser des lettres majuscules (A, B, C)" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Utiliser des chiffres (1, 2, 3)" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Utiliser des symboles (!, @, #)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Pas de caractères ambigus (l,I&1, O&0)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Nombre de combinaisons: 10 ^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Options de Génération" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Mot de Passe Généré:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Générer!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Choisir un Mot de Passe Principal" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" msgstr "Bienvenue dans le Gestionnaire de Mots de Passe de Figaro 2" -#: src/interface.c:1478 +#: src/interface.c:1558 msgid "" "Please choose the password which will be used to encrypt your passwords. It " "is vital that you remember this password; without it, you can not access " @@ -262,73 +290,73 @@ "passe. Il est crucial que vous vous rappeliez de ce mot de passe. Sans ce " "dernier vous ne pouvez pas accéder à votre collection de mots de passe." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "Veuillez choisir un mot de _passe:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "_Vérifiez-le en le retapant ici:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Mot de Passe Principal" -#: src/interface.c:1545 +#: src/interface.c:1625 msgid "" "Optionally you may specify the file which will be used to encrypt your " "passwords along with master password. Do not lose this file, is necessary " "for access to your passwords." msgstr "" -"Accessoirement vous pouvez choisir le fichier qui sera utilisé pour " -"crypter vos mots de passe avec le mot de passe principal. Ne perdez pas ce " -"fichier, il est nécéssaire pour accéder à vos mots de passe." +"Accessoirement vous pouvez choisir le fichier qui sera utilisé pour crypter " +"vos mots de passe avec le mot de passe principal. Ne perdez pas ce fichier, " +"il est nécéssaire pour accéder à vos mots de passe." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "Fichier _Clé:" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "Fichier Clé" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Éditeur de Raccourci" -#: src/interface.c:1748 src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "dans la sél. principale" -#: src/interface.c:1754 src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "dans le presse papier" -#: src/interface.c:1760 src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "ne pas copier" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Copier le Nom d'_Utilisateur:" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "_Ligne de Commande" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "Copier le Mot de _Passe" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "Nom du _Raccourci:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Raccourci" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -340,23 +368,23 @@ "$u = nom d'utilisateur\n" "$p = mot de passe (non recommandé)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "_Variables de Ligne de Commande" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "" -#: src/interface.c:1955 +#: src/interface.c:2035 msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" "(c) 2000-2003 John Conneely & les autres contributeurs\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -364,261 +392,284 @@ "Gestionnaire de Mot de Passe de Figaro\n" "Réécrit avec GTK2." -#: src/interface.c:1957 +#: src/interface.c:2037 msgid "" "This application is licensed under the GNU General Public License Version 2 " "or (at your option) any later version.\n" msgstr "" -"Ce programme est régi par les termes de la Licence Publique Générale GNU Version 2 " -"ou (a votre discrétion) toute autre version ultérieure.\n" +"Ce programme est régi par les termes de la Licence Publique Générale GNU " +"Version 2 ou (a votre discrétion) toute autre version ultérieure.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "Site web de FPM2" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Préférences" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Chercher un _titre" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Chercher une U_RL" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Chercher un nom d'_utilisateur" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Chercher dans les _commentaires" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Domaine de Recherche" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Seulement dans cette _rubrique" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Chercher" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Enregistrer lors de l'ajout d'un signet" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Enregistrer lors de la modification d'un signet" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Enregistrer lors de l'effacement d'un signet" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Enregistrer avant de quitter" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Sauvegarde Automatique" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Faire une sauvegarde des _fichiers" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Garder les " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " sauvegardes précédentes" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Enregistrement des Fichiers" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Enregistrement" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Activer l'icône de notification" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "Icône de notification toujours _visible" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "_Mettre en notification automatiquement" -#: src/interface.c:2289 src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "après " -#: src/interface.c:2298 src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr "" -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "_Verrouiller le programme après réduction" -#: src/interface.c:2334 + +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Icône de Notification" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Icône de Notification" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" msgstr "_Ouvrir cette rubrique" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "_Rechercher" + +#: src/interface.c:2464 +msgid "On Startup" msgstr "Au démarrage" -#: src/interface.c:2405 +#: src/interface.c:2483 +msgid "Call Launcher" +msgstr "Lancer le raccourci" + +#: src/interface.c:2484 +msgid "Copy Username" +msgstr "Copier le Nom d'_Utilisateur" + +#: src/interface.c:2485 +msgid "Copy Password" +msgstr "Copier le Mot de _Passe" + +#: src/interface.c:2486 +msgid "Copy Both" +msgstr "Copier les _Deux" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "Editer" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "Quand une entrée est activée" + +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "_Effacer la cible après qu'elle est été collée" -#: src/interface.c:2409 -msgid "Copy target" +#: src/interface.c:2522 +msgid "Copy Target" msgstr "Copier la cible" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Autres" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Préférences" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Conditions de Recherche" - -#: src/interface.c:2681 src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Générer de l'Entropie" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Veuillez bouger la souris pour créer de l'entropie" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "_Afficher / Cacher" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Verrouiller" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Déverrouiller" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Icônes et Texte" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Icônes Seulement" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Texte Seulement" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Cacher la barre d'outils" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Voulez-vous vraiment abandonner les modifications?" -#: src/callbacks.c:500 src/callbacks.c:1298 src/fpm.c:421 src/fpm.c:525 -#: src/fpm.c:947 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Voulez-vous vraiment effacer ce signet?" -#: src/callbacks.c:530 src/callbacks.c:920 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Mots de passe dans cette rubrique: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Exporter les mots de passe" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Format d'Exportation" -#: src/callbacks.c:579 src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "XML Simple" -#: src/callbacks.c:585 src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 msgid "Launchers:" msgstr "Raccourcis:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Ne pas exporter" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" -msgstr "Exporter uniquement les raccourci qui sont utilisés dans la rubrique sélectionée" +msgstr "" +"Exporter uniquement les raccourci qui sont utilisés dans la rubrique " +"sélectionée" -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Exporter tout" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Importer un Fichier de Mot de Passe" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Format d'Importation" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Ne pas importer" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Importer uniquement les nouveaux raccourcis" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Importer et remplacer tous les raccourcis" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "Importer les signets tel quel sans les changer de rubrique." -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, c-format msgid "" "Current location of password file:\n" @@ -631,53 +682,69 @@ "\n" "Méthode de chiffrage: %s" -#: src/callbacks.c:732 src/fpm.c:539 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Voulez-vous enregistrer les modifications?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Ouvrir le Fichier de Mot de Passe" -#: src/callbacks.c:766 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Enregistrer le Fichier de Mot de Passe" -#: src/callbacks.c:778 src/callbacks.c:1275 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Fichier de mot de passe sans nom" -#: src/callbacks.c:1263 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Nouveau Fichier de Mot de Passe" -#: src/callbacks.c:1377 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Veuillez entrer le nom du raccourci." -#: src/callbacks.c:1422 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Cacher la Boite de Dialogue des Fichiers Clé" +#: src/callbacks.c:1497 +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Voulez-vous vraiment déchiffrer et afficher TOUS les mots de passe?" + #: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Le fichier pixmap %s n'est pas accessible" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Nom" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "" -#: src/fpm.c:129 +#: src/fpm.c:93 +msgid "Password" +msgstr "Mot de Passe" + +#: src/fpm.c:95 +msgid "Notes" +msgstr "Commentaires" + +#: src/fpm.c:96 +msgid "Launcher" +msgstr "Raccourci" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "Le fichier %s n'est pas accessible." -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -686,28 +753,7 @@ "Le fichier %s n'a pas pu être\n" "verrouillé car il l'est déjà." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "Un lien vers %s n'a pas pu être créé" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "Le fichier %s n'est pas accessible (fstat)" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"Le fichier de verrouillage %s est présent.\n" -"Si cela ne dois pas être le cas, effacez les\n" -"fichiers de verrouillage dans le dossier %s." - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -716,28 +762,28 @@ "Le mot de passe fait plus de %d caractères\n" "Il a été tronqué de %d caractères." -#: src/fpm.c:598 +#: src/fpm.c:538 msgid "primary selection" msgstr "sélection principale" -#: src/fpm.c:599 +#: src/fpm.c:539 msgid "user" msgstr "utilisateur" -#: src/fpm.c:603 +#: src/fpm.c:543 msgid "clipboard" msgstr "presse papier" -#: src/fpm.c:606 +#: src/fpm.c:546 msgid "password" msgstr "mot de passe" -#: src/fpm.c:608 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Copier %s dans %s." -#: src/fpm.c:703 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -745,7 +791,7 @@ "Ce mot de passe n'a pas de commande de raccourci.\n" "Veuillez la définir dans l'éditeur de raccourci." -#: src/fpm.c:707 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -753,15 +799,17 @@ "Ce mot de passe n'a pas de raccourci.\n" "Veuillez en créer un dans l'éditeur de signet." -#: src/fpm.c:730 src/fpm.c:853 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "Le fichier clé ne peut être lu!" -#: src/fpm.c:766 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Mot de passe erroné. Veuillez recommencer." -#: src/fpm.c:777 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" @@ -772,45 +820,46 @@ msgstr "" "Le format du fichier de mot de passe est ancien.\n" "\n" -"Souhaitez-vous convertir le fichier de mot de passe au nouveau format plus sécurisé?\n" +"Souhaitez-vous convertir le fichier de mot de passe au nouveau format plus " +"sécurisé?\n" "\n" "Sachez qu'une fois converti, ce fichier de mot de passe ne pourra plus être " "utilisé avec l'ancienne version de FPM2." -#: src/fpm.c:793 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "Le fichier de mot de passe a été converti!" -#: src/fpm.c:839 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Désolé, les mots de passe sonts différents." -#: src/fpm.c:844 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Désolé, votre mot de passe est trop court." -#: src/fpm.c:1001 +#: src/fpm.c:978 msgid "Information" msgstr "" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1440 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Gestionnaire de Mots de Passe de Figaro 2 - Verrouillé" -#: src/fpm.c:1507 +#: src/fpm.c:1547 msgid "Question" msgstr "" -#: src/fpm.c:1520 +#: src/fpm.c:1560 msgid "Primary selection" msgstr "Sélection principale" -#: src/fpm.c:1521 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Presse Papier" -#: src/fpm.c:1527 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -818,52 +867,85 @@ "\n" "Veuillez sélectionner une rangée." -#: src/fpm.h:54 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:55 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:56 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "%d mot(s) de passe enregistré(s)." -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, c-format msgid "Exported clear XML passwords to %s." msgstr "Mots de passe XML en clair exportés dans %s." -#: src/fpm_file.c:371 +#: src/fpm_file.c:370 #, c-format msgid "" "Sorry, the password file cannot be read because it uses a future file " "format. Please download the latest version of FPM2 and try again.\n" msgstr "" "Le fichier de mot de passe ne peut malheureusement pas être lu car il " -"utilise un nouveau format. Veuillez installer la dernière version de " -"FPM2 et rééssayer.\n" +"utilise un nouveau format. Veuillez installer la dernière version de FPM2 et " +"rééssayer.\n" -#: src/fpm_file.c:598 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Ce fichier n'est probablement pas en XML." -#: src/fpm_file.c:604 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." msgstr "Ce fichier n'est pas un fichier de mots de passe FPM2." -#: src/fpm_file.c:614 src/fpm_file.c:671 +#: src/fpm_file.c:613 src/fpm_file.c:670 msgid "Invalid password file." msgstr "Ce fichier de mots de passe n'est pas valide." -#: src/fpm_file.c:739 +#: src/fpm_file.c:738 #, c-format msgid "Imported %d password(s)." msgstr "%d mot(s) de passe importé(s)." + +#~ msgid "Unrecognized option.\n" +#~ msgstr "Option non reconnue.\n" + +#~ msgid "_Preferences" +#~ msgstr "_Préférences" + +#~ msgid "Search Conditions" +#~ msgstr "Conditions de Recherche" + +#~ msgid "Could not create a link to %s" +#~ msgstr "Un lien vers %s n'a pas pu être créé" + +#~ msgid "Could not fstat %s" +#~ msgstr "Le fichier %s n'est pas accessible (fstat)" + +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "Le fichier de verrouillage %s est présent.\n" +#~ "Si cela ne dois pas être le cas, effacez les\n" +#~ "fichiers de verrouillage dans le dossier %s." Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/hu.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/hu.gmo differ diff -Nru fpm2-0.76.1/po/hu.po fpm2-0.78/po/hu.po --- fpm2-0.76.1/po/hu.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/hu.po 2010-02-24 08:12:33.000000000 +0200 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: fpm2 0.71\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-02-25 13:41+0100\n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" "PO-Revision-Date: 2009-03-01 10:57+0100\n" "Last-Translator: Peter Polonkai \n" "Language-Team: Nedudu Team \n" @@ -15,330 +15,357 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Ismeretlen opció.\n" - -#: src/interface.c:120 -#: src/interface.c:983 -#: src/interface.c:1015 -#: src/fpm.c:1346 +#: src/interface.c:129 src/interface.c:1063 src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "Figaro Jelszó Kezelő 2" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_Fájl" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" msgstr "Jelszavak importálása" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" msgstr "Jelszavak exportálása" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" msgstr "_Kicsinyítés a tálcára" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" msgstr "Sz_erkesztés" -#: src/interface.c:209 -#: src/interface.c:2567 +#: src/interface.c:218 src/interface.c:2684 msgid "Copy _Password" msgstr "_Jelszó másolása" -#: src/interface.c:220 -#: src/interface.c:2575 +#: src/interface.c:229 src/interface.c:2692 msgid "Copy _Username" msgstr "_Felhasználónév másolása" -#: src/interface.c:231 -#: src/interface.c:2583 +#: src/interface.c:240 src/interface.c:2700 msgid "Copy _Both" msgstr "_Mind másolása" -#: src/interface.c:247 -#: src/interface.c:2596 +#: src/interface.c:256 src/interface.c:2713 msgid "_Add Item" msgstr "Elem hozzá_adása" -#: src/interface.c:258 -#: src/interface.c:2604 +#: src/interface.c:267 src/interface.c:2721 msgid "_Edit Item" msgstr "_Elem szerkesztése" -#: src/interface.c:269 -#: src/interface.c:2612 +#: src/interface.c:278 src/interface.c:2729 msgid "_Clone Item" msgstr "Elem _klónozása" -#: src/interface.c:280 -#: src/interface.c:2620 +#: src/interface.c:289 src/interface.c:2737 msgid "_Delete Item" msgstr "Elem _törlése" -#: src/interface.c:300 +#: src/interface.c:309 +#, fuzzy +msgid "_View" +msgstr "_Fájl" + +#: src/interface.c:316 +#, fuzzy +msgid "_Title" +msgstr "Fejléc" + +#: src/interface.c:320 +#, fuzzy +msgid "U_RL" +msgstr "URL" + +#: src/interface.c:324 +#, fuzzy +msgid "_User" +msgstr "Felhasználó" + +#: src/interface.c:328 +#, fuzzy +msgid "_Password" +msgstr "_Jelszó:" + +#: src/interface.c:332 +#, fuzzy +msgid "_Category" +msgstr "Kategória" + +#: src/interface.c:336 +#, fuzzy +msgid "_Notes" +msgstr "Megjegyzés:" + +#: src/interface.c:340 +#, fuzzy +msgid "_Launcher" +msgstr "Futtató:" + +#: src/interface.c:349 +#, fuzzy +msgid "Tool_bar" +msgstr "Eszköz_tár" + +#: src/interface.c:354 msgid "_Settings" msgstr "_Beállítások" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Futtatók beállításai" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "Jelszó cseréje" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "Eszköz_tár" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Súgó" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "Jelenlegi Jelszó fájl" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Jelszó fájl mentése" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Új" -#: src/interface.c:397 -#: src/interface.c:810 +#: src/interface.c:441 src/interface.c:890 msgid "Jump" msgstr "Ugrás" -#: src/interface.c:403 -#: src/fpm_clist.c:149 +#: src/interface.c:447 src/fpm.c:92 msgid "User" msgstr "Felhasználó" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Jelszó" -#: src/interface.c:422 +#: src/interface.c:466 src/fpm.c:94 msgid "Category" msgstr "Kategória" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Keresés:" -#: src/interface.c:475 -#: src/interface.c:2138 +#: src/interface.c:519 src/interface.c:2222 msgid "_Match case" msgstr "_Kis/nagybetű érzékeny" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" msgstr "Jelszó elem megtekintése / szerkesztése" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Fejléc:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "URL / Paraméter:" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Jelszó" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Jelszó mutatása" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Felhasználónév:" -#: src/interface.c:827 -#: src/callbacks.c:597 -#: src/callbacks.c:664 +#: src/interface.c:907 src/callbacks.c:569 src/callbacks.c:635 msgid "Category:" msgstr "Kategória:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." msgstr "Jelszó hozzáadása az listához." -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Megjegyzés:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Futtató:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Generálás..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Üdvözli a" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "_Kulcs Fájl:" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "_Jelszó:" -#: src/interface.c:1044 -#: src/interface.c:1567 -#: src/callbacks.c:1204 +#: src/interface.c:1124 src/interface.c:1647 src/callbacks.c:1182 msgid "Select Key File" msgstr "Kulcsfájl választása" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Kérem adja meg a mester jelszót" -#: src/interface.c:1070 -#: src/callbacks.c:1424 +#: src/interface.c:1150 src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Kulcsfájl választási ablak mutatása" -#: src/interface.c:1189 -#: src/interface.c:1207 +#: src/interface.c:1269 src/interface.c:1287 msgid "Autogenerate Password" msgstr "Automatikusan generált jelszó" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Karakterek száma:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Használjon kisbetűket (a, b, c,... )" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Használjon nagybetűket (A, B, C,... )" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Használjon számokat (1, 2, 3... )" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Használjon szimbólumokat (!, @, #...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Kerülje a hasonló karaktereket (l,I&1, O&0, stb.)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Egyenértékü bitek: 2 ^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Kombinációk száma: 10 ^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Generálási opciók" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Generált jelszó:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Generálás!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Válasszon mester jelszót" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" msgstr "Üdvözli a Figaro Jelszó Kezelő 2" -#: src/interface.c:1478 -msgid "Please choose the password which will be used to encrypt your passwords. It is vital that you remember this password; without it, you can not access your password list." -msgstr "Válasszon jelszót, amit arra fogn használni, hogy titkosítsa a jelszavait. Létfontosságú, hogy emlékezzen erre a jelszóra; mert enélkül nem tud hozzáférni a jelszólistához." +#: src/interface.c:1558 +msgid "" +"Please choose the password which will be used to encrypt your passwords. It " +"is vital that you remember this password; without it, you can not access " +"your password list." +msgstr "" +"Válasszon jelszót, amit arra fogn használni, hogy titkosítsa a jelszavait. " +"Létfontosságú, hogy emlékezzen erre a jelszóra; mert enélkül nem tud " +"hozzáférni a jelszólistához." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "Kérem válasszon jelszót:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "Ellenőrzésként gépelje be újra:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Mester jelszó" -#: src/interface.c:1545 -msgid "Optionally you may specify the file which will be used to encrypt your passwords along with master password. Do not lose this file, is necessary for access to your passwords." -msgstr "Választhatóan megadhatja azt a fájlt, amit arra használhat, hogy mesterjelszóval egyetemben titkosítsa a jelszavait. Nem veszítse el ezt a fájlt, szükség vam rá a jelszavakhoz való hozzáférésre.." +#: src/interface.c:1625 +msgid "" +"Optionally you may specify the file which will be used to encrypt your " +"passwords along with master password. Do not lose this file, is necessary " +"for access to your passwords." +msgstr "" +"Választhatóan megadhatja azt a fájlt, amit arra használhat, hogy " +"mesterjelszóval egyetemben titkosítsa a jelszavait. Nem veszítse el ezt a " +"fájlt, szükség vam rá a jelszavakhoz való hozzáférésre.." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "_Kulcs fájl:" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "Kulcs fájl" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Futtatók beállításai" -#: src/interface.c:1748 -#: src/interface.c:1772 +#: src/interface.c:1828 src/interface.c:1852 msgid "to primary sel." msgstr "elsődleges" -#: src/interface.c:1754 -#: src/interface.c:1778 +#: src/interface.c:1834 src/interface.c:1858 msgid "to clipboard" msgstr "vágólapra" -#: src/interface.c:1760 -#: src/interface.c:1784 +#: src/interface.c:1840 src/interface.c:1864 msgid "don't copy" msgstr "nem másol" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Felhasználónév másolása:" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "_Parancssor:" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "_Jelszó másolása:" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "Futtató neve:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Futtató" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -350,23 +377,24 @@ "$u = felhasználónév\n" "$p = jelszó (nem ajánlott)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "_Parancssori paraméterek" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "FPM2" -#: src/interface.c:1955 +#: src/interface.c:2035 +#, fuzzy msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" "(c) 2000-2003 John Conneely & egyéb közreműködők\n" "(c) 2008-2009 Aleš Koval" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -374,267 +402,289 @@ "Figaro Jelszó Kezelő\n" "Újraírva GTK2 használatával." -#: src/interface.c:1957 -msgid "This application is licensed under the GNU General Public License Version 2 or (at your option) any later version.\n" -msgstr "Erre a programra a GNU General Public License 2 verzió vonatkozik vagy (opciónálisan) későbbi verziók.\n" +#: src/interface.c:2037 +msgid "" +"This application is licensed under the GNU General Public License Version 2 " +"or (at your option) any later version.\n" +msgstr "" +"Erre a programra a GNU General Public License 2 verzió vonatkozik vagy " +"(opciónálisan) későbbi verziók.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "FPM2 honlap" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Beállítások" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Keresés a _fejlécben" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Keresés az u_rl-ben" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Keresés a _felhasználónévben" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Keresés a megjegyzésekben" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Keresési terület" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Csak az aktuális _kategóriában" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Keresési feltételek" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Keresés" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Mentés elem hozzá_adásakor" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Mentés elem _módosításakor" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Mentés elem _törlésekor" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Mentés _kilépéskor" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Automatikus fájl mentés" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Biztonsági másolat készítése a _fájlokról" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Megőrzés " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" msgstr " biztonsági másolat fájl" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Fájl elmentve" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Mentés" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Tálca_ikon engedélyezése" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "Tálcaikon mindig _látszik" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "_Automatikusan tálcára rejti" -#: src/interface.c:2289 -#: src/interface.c:2321 +#: src/interface.c:2373 src/interface.c:2405 msgid "after " msgstr "ennyi idő után " -#: src/interface.c:2298 -#: src/interface.c:2330 +#: src/interface.c:2382 src/interface.c:2414 msgid " minutes" msgstr " perc" -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "Záro_lás ha a program ablakát elhagyja" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Tálcaikon" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Tálcaikon" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" msgstr "_Ezen kategória megnyitása" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "" + +#: src/interface.c:2464 +#, fuzzy +msgid "On Startup" msgstr "Indításkor" -#: src/interface.c:2405 +#: src/interface.c:2483 +#, fuzzy +msgid "Call Launcher" +msgstr "Futtató:" + +#: src/interface.c:2484 +#, fuzzy +msgid "Copy Username" +msgstr "_Felhasználónév másolása" + +#: src/interface.c:2485 +#, fuzzy +msgid "Copy Password" +msgstr "_Jelszó másolása" + +#: src/interface.c:2486 +#, fuzzy +msgid "Copy Both" +msgstr "_Mind másolása" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "" + +#: src/interface.c:2518 msgid "_Clear target after paste" msgstr "_Cél törlése beillesztés után" -#: src/interface.c:2409 -msgid "Copy target" +#: src/interface.c:2522 +#, fuzzy +msgid "Copy Target" msgstr "Másolási cél" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Egyebek" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Beállítások" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Keresési feltételek" - -#: src/interface.c:2681 -#: src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Entrópia generálása" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Kérem mozgassa az egeret az entrópia gyűjtéséhez" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "_Mutat / Elrejt" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Zárol" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Felold" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Ikon és szöveg" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Ikon" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Szöveg" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Eszköztár elrejtése" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Valóban elveti a változásokat?" -#: src/callbacks.c:500 -#: src/callbacks.c:1295 -#: src/fpm.c:421 -#: src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 src/callbacks.c:1276 src/fpm.c:335 src/fpm.c:437 +#: src/fpm.c:445 src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Valóban törölni szeretné ezt az elemet?" -#: src/callbacks.c:530 -#: src/callbacks.c:918 +#: src/callbacks.c:505 src/callbacks.c:896 src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Jelszavak száma ebben a kategóriában: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Jelszavak exportálása" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Exportálás típusa:" -#: src/callbacks.c:579 -#: src/callbacks.c:651 +#: src/callbacks.c:551 src/callbacks.c:622 msgid "Plain XML" msgstr "Sima XML" -#: src/callbacks.c:585 -#: src/callbacks.c:655 +#: src/callbacks.c:557 src/callbacks.c:626 msgid "Launchers:" msgstr "Futtatók:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Ne legyen exportálás" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" -msgstr "Csak az indítók exportálása amik a kiválasztott kategóriában használatosak" +msgstr "" +"Csak az indítók exportálása amik a kiválasztott kategóriában használatosak" -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Mind exportálása" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Jelszó fájl importálása" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Importálás típusa:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Ne legyen importálás" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Csak az új indítók importálása" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Importálás és minden aktuális futtató cseréje" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "Nem változtatja meg az elemek kategóriáját importáláskor." -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, c-format msgid "" "Current location of password file:\n" @@ -647,56 +697,73 @@ "\n" "Cipher: %s" -#: src/callbacks.c:732 -#: src/fpm.c:538 +#: src/callbacks.c:703 src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Elmenti a változásokat?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Jelszó fájl megnyitása" -#: src/callbacks.c:765 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Jelszó fájl mentése" -#: src/callbacks.c:776 -#: src/callbacks.c:1272 +#: src/callbacks.c:747 src/callbacks.c:1253 msgid "Untitled password file" msgstr "Névtelen jelszó fájl" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Új jelszó fájl" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Kérem adja meg a futtató nevét.:" -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Kulcsfálj párbeszéd ablak rejtése" -#: src/support.c:90 -#: src/support.c:114 +#: src/callbacks.c:1497 +#, fuzzy +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Valóban elveti a változásokat?" + +#: src/support.c:90 src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Nem található képfájl %s" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Fejléc" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "URL" -#: src/fpm.c:129 +#: src/fpm.c:93 +#, fuzzy +msgid "Password" +msgstr "Jelszó" + +#: src/fpm.c:95 +#, fuzzy +msgid "Notes" +msgstr "Megjegyzés:" + +#: src/fpm.c:96 +#, fuzzy +msgid "Launcher" +msgstr "Futtató:" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "Nem sikerült megnyitni: %s" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -705,28 +772,7 @@ "Nem sikerült zárolni: %s\n" "A fájl már zárolva van." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "Nem sikerült linket létrehozni ehhez %s" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "Nem sikerült az fstat: %s" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"Lock fájl %s létezik.\n" -"Ha ön tudja hogy ez egy hiba, akkor kérem törölje\n" -"a lock fájlokat ebben a könyvtárban: %s." - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -735,28 +781,28 @@ "A jelszó meghaladta a(z) %d karaktert\n" "Az ön jelszava %d karakter ami meglett csonkítva." -#: src/fpm.c:597 +#: src/fpm.c:538 msgid "primary selection" msgstr "elsődleges kiválasztás" -#: src/fpm.c:598 +#: src/fpm.c:539 msgid "user" msgstr "felhasználó" -#: src/fpm.c:602 +#: src/fpm.c:543 msgid "clipboard" msgstr "vágólap" -#: src/fpm.c:605 +#: src/fpm.c:546 msgid "password" msgstr "jelszó" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Másolás %s ide %s." -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -764,7 +810,7 @@ "A jelszó futtató program nincs megadva.\n" "Kérem adjon meg egyet a futtatók szerkesztése menüben." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -772,22 +818,24 @@ "A jelszó futtató program nincs megadva.\n" "Kérem válasszon mielőtt szerkesztené." -#: src/fpm.c:729 -#: src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 src/fpm.c:827 msgid "Cannot read key file!" msgstr "A kulcsfálj nem olvasható!" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "A jelszó érvénytelen. Próbálja újra." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" "Do you want change password file to new more secure cipher?\n" "\n" -"Please take note that it will not be possible to continue open this password file in the earlier version FPM2." +"Please take note that it will not be possible to continue open this password " +"file in the earlier version FPM2." msgstr "" "Régi fájl formátumot találtam.\n" "\n" @@ -795,40 +843,40 @@ "\n" "Figyelem, a korábbi FPM2 verzióban ezután nem lehet megnyitni a fájl." -#: src/fpm.c:792 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "Jelszó fájl konverziója kész!" -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Sajnálom, a jelszavak nem egyeznek." -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Sajnálom, az ön jelszava túl rövid." -#: src/fpm.c:1000 +#: src/fpm.c:978 msgid "Information" msgstr "Információ" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaro Jelszó Kezelő 2 - zárolva" -#: src/fpm.c:1506 +#: src/fpm.c:1547 msgid "Question" msgstr "Kérdés" -#: src/fpm.c:1519 +#: src/fpm.c:1560 msgid "Primary selection" msgstr "Esődleges kiválasztás" -#: src/fpm.c:1520 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Vágólap" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -836,53 +884,89 @@ "\n" "Kérem válasszon egy sort." -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "Elmentve %d jelszó." -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, c-format msgid "Exported clear XML passwords to %s." msgstr "Jelszavak exportálva sima text fájlba %s." -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format -msgid "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM2 and try again.\n" -msgstr "Sajnálom ez a jelszófálj nem nyitható meg ebben a verzióban, mert újabb fájl formátumot használ. Kérem töltse le az újabb verziót az FPM2 programból és próbálja újra.\n" +msgid "" +"Sorry, the password file cannot be read because it uses a future file " +"format. Please download the latest version of FPM2 and try again.\n" +msgstr "" +"Sajnálom ez a jelszófálj nem nyitható meg ebben a verzióban, mert újabb fájl " +"formátumot használ. Kérem töltse le az újabb verziót az FPM2 programból és " +"próbálja újra.\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Ez a fájl nem XML?" -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." msgstr "A fájl nem valós FPM2 jelszó fájl." -#: src/fpm_file.c:615 -#: src/fpm_file.c:672 +#: src/fpm_file.c:613 src/fpm_file.c:670 msgid "Invalid password file." msgstr "Érvénytelen jelszó fájl." -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 #, c-format msgid "Imported %d password(s)." msgstr "Importálva %d jelszó." +#~ msgid "Unrecognized option.\n" +#~ msgstr "Ismeretlen opció.\n" + +#~ msgid "_Preferences" +#~ msgstr "_Beállítások" + +#~ msgid "Search Conditions" +#~ msgstr "Keresési feltételek" + +#~ msgid "Could not create a link to %s" +#~ msgstr "Nem sikerült linket létrehozni ehhez %s" + +#~ msgid "Could not fstat %s" +#~ msgstr "Nem sikerült az fstat: %s" + +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "Lock fájl %s létezik.\n" +#~ "Ha ön tudja hogy ez egy hiba, akkor kérem törölje\n" +#~ "a lock fájlokat ebben a könyvtárban: %s." + #~ msgid "Loaded %d password(s)." #~ msgstr "Betöltve %d jelszó." @@ -901,14 +985,19 @@ #, fuzzy #~ msgid "FPM2: New Password File" #~ msgstr "Jelszó fájl megnyitása" + #~ msgid "Edit" #~ msgstr "Szerkesztés" + #~ msgid "Delete" #~ msgstr "Törlés" + #~ msgid "Enter your password here." #~ msgstr "Adja meg a jelszavát." + #~ msgid "Password File Import" #~ msgstr "Jelszó fájl importálása" + #~ msgid "" #~ "File Import\n" #~ "Select file that you wish to imports passwords from.\n" @@ -921,10 +1010,12 @@ #~ "\n" #~ "A fájlban a TAB elválasztó a határoló jel.\n" #~ "FEJLÉC FELHASZNÁLÓ JELSZÓ URL KATEGÓRIA\n" + #~ msgid "tab delimited" #~ msgstr "tab elválasztó" + #~ msgid "gpasman" #~ msgstr "gpasman" + #~ msgid "All Files" #~ msgstr "Minden fájl" - Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/it.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/it.gmo differ diff -Nru fpm2-0.76.1/po/it.po fpm2-0.78/po/it.po --- fpm2-0.76.1/po/it.po 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/po/it.po 2010-02-24 08:12:33.000000000 +0200 @@ -5,16 +5,16 @@ # Nicola Jelmorini , 2009, 2009. msgid "" msgstr "" -"Project-Id-Version: fpm2 0.75\n" +"Project-Id-Version: fpm2 0.77\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-09-17 13:41+0100\n" -"PO-Revision-Date: 2009-09-23 18:29+0100\n" -"Last-Translator: Nicola Jelmorini \n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" +"PO-Revision-Date: 2010-02-11 20:28+0100\n" +"Last-Translator: Nicola Jelmorini \n" "Language-Team: Nicola Jelmorini \n" -"Language: it\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: it\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Virtaal 0.3.1\n" "X-Poedit-Language: Italian\n" @@ -22,330 +22,358 @@ "X-Poedit-Bookmarks: 116,125,-1,-1,-1,-1,-1,-1,-1,-1\n" "X-Poedit-SourceCharset: utf-8\n" -#: src/main.c:58 -#, c-format -msgid "Unrecognized option.\n" -msgstr "Opzione sconosciuta.\n" - -#: src/interface.c:120 -#: src/interface.c:983 -#: src/interface.c:1015 -#: src/fpm.c:1346 +#: src/interface.c:129 +#: src/interface.c:1063 +#: src/interface.c:1095 +#: src/fpm.c:1378 msgid "Figaro's Password Manager 2" msgstr "Figaro's Password Manager 2" -#: src/interface.c:138 +#: src/interface.c:147 msgid "_File" msgstr "_File" -#: src/interface.c:166 +#: src/interface.c:175 msgid "_Import Passwords" -msgstr "_Importare le password" +msgstr "_Importa le password" -#: src/interface.c:174 +#: src/interface.c:183 msgid "_Export Passwords" -msgstr "_Esportare le password" +msgstr "_Esporta le password" -#: src/interface.c:187 +#: src/interface.c:196 msgid "_Minimize to tray" -msgstr "_Minimizzare nell'area di notifica" +msgstr "_Minimizza nell'area di notifica" -#: src/interface.c:202 +#: src/interface.c:211 msgid "_Edit" -msgstr "_Editare" +msgstr "_Modifica" -#: src/interface.c:209 -#: src/interface.c:2567 +#: src/interface.c:218 +#: src/interface.c:2684 msgid "Copy _Password" -msgstr "Copiare _password" +msgstr "Copia _password" -#: src/interface.c:220 -#: src/interface.c:2575 +#: src/interface.c:229 +#: src/interface.c:2692 msgid "Copy _Username" -msgstr "Copiare nome _utente" +msgstr "Copia nome _utente" -#: src/interface.c:231 -#: src/interface.c:2583 +#: src/interface.c:240 +#: src/interface.c:2700 msgid "Copy _Both" -msgstr "Copiare _entrambi" +msgstr "Copia _entrambi" -#: src/interface.c:247 -#: src/interface.c:2596 +#: src/interface.c:256 +#: src/interface.c:2713 msgid "_Add Item" -msgstr "_Aggiungere elemento" +msgstr "_Aggiungi elemento" -#: src/interface.c:258 -#: src/interface.c:2604 +#: src/interface.c:267 +#: src/interface.c:2721 msgid "_Edit Item" -msgstr "_Editare elemento" +msgstr "_Modifica elemento" -#: src/interface.c:269 -#: src/interface.c:2612 +#: src/interface.c:278 +#: src/interface.c:2729 msgid "_Clone Item" -msgstr "_Clonare elemento" +msgstr "_Clona elemento" -#: src/interface.c:280 -#: src/interface.c:2620 +#: src/interface.c:289 +#: src/interface.c:2737 msgid "_Delete Item" -msgstr "Ca_ncellare elemento" +msgstr "Ca_ncella elemento" + +#: src/interface.c:309 +msgid "_View" +msgstr "_Visualizza" + +#: src/interface.c:316 +msgid "_Title" +msgstr "_Titolo" + +#: src/interface.c:320 +msgid "U_RL" +msgstr "U_RL" + +#: src/interface.c:324 +msgid "_User" +msgstr "_Utente" + +#: src/interface.c:328 +msgid "_Password" +msgstr "_Password" + +#: src/interface.c:332 +msgid "_Category" +msgstr "_Categoria" + +#: src/interface.c:336 +msgid "_Notes" +msgstr "_Note" + +#: src/interface.c:340 +msgid "_Launcher" +msgstr "_Lanciatore" + +#: src/interface.c:349 +msgid "Tool_bar" +msgstr "_Barra degli strumenti" -#: src/interface.c:300 +#: src/interface.c:354 msgid "_Settings" msgstr "_Impostazioni" -#: src/interface.c:307 +#: src/interface.c:361 msgid "_Launcher Preferences" msgstr "Preferenze del _lanciatore" -#: src/interface.c:315 +#: src/interface.c:369 msgid "Change _Password" msgstr "_Cambiare la password" -#: src/interface.c:328 -msgid "_Toolbar" -msgstr "_Barra degli strumenti" - -#: src/interface.c:342 +#: src/interface.c:386 msgid "_Help" msgstr "_Aiuto" -#: src/interface.c:349 +#: src/interface.c:393 msgid "Current Password File" msgstr "File delle password corrente" -#: src/interface.c:375 +#: src/interface.c:419 msgid "Save password list" msgstr "Salvare la lista delle password" -#: src/interface.c:383 +#: src/interface.c:427 msgid "New" msgstr "Nuovo" -#: src/interface.c:397 -#: src/interface.c:810 +#: src/interface.c:441 +#: src/interface.c:890 msgid "Jump" msgstr "Vai a" -#: src/interface.c:403 -#: src/fpm_clist.c:149 +#: src/interface.c:447 +#: src/fpm.c:92 msgid "User" msgstr "Utente" -#: src/interface.c:409 +#: src/interface.c:453 msgid "Pass" msgstr "Password" -#: src/interface.c:422 +#: src/interface.c:466 +#: src/fpm.c:94 msgid "Category" msgstr "Categoria" -#: src/interface.c:457 +#: src/interface.c:501 msgid "Find:" msgstr "Cerca:" -#: src/interface.c:475 -#: src/interface.c:2138 +#: src/interface.c:519 +#: src/interface.c:2222 msgid "_Match case" msgstr "Differenzia _maiuscole e minuscole" -#: src/interface.c:733 +#: src/interface.c:813 msgid "View / Edit Password Item" -msgstr "Visualizza / Edita una password" +msgstr "Visualizza / Modifica una password" -#: src/interface.c:762 +#: src/interface.c:842 msgid "Title:" msgstr "Títolo:" -#: src/interface.c:769 +#: src/interface.c:849 msgid "URL / Arg:" msgstr "URL / Arg:" -#: src/interface.c:776 +#: src/interface.c:856 msgid "Password:" msgstr "Password:" -#: src/interface.c:795 +#: src/interface.c:875 msgid "Show Password" msgstr "Mostra la password" -#: src/interface.c:820 +#: src/interface.c:900 msgid "User Name:" msgstr "Nome utente:" -#: src/interface.c:827 -#: src/callbacks.c:597 -#: src/callbacks.c:664 +#: src/interface.c:907 +#: src/callbacks.c:569 +#: src/callbacks.c:635 msgid "Category:" msgstr "Categoria:" -#: src/interface.c:834 +#: src/interface.c:914 msgid "Include this password in the default list." -msgstr "Includere questa password nella lista di default." +msgstr "Includere questa password nella lista predefinita." -#: src/interface.c:854 +#: src/interface.c:934 msgid "Notes:" msgstr "Note:" -#: src/interface.c:862 +#: src/interface.c:942 msgid "Launcher:" msgstr "Lanciatore:" -#: src/interface.c:885 +#: src/interface.c:965 msgid "Generate..." msgstr "Generare..." -#: src/interface.c:1002 +#: src/interface.c:1082 msgid "Welcome to" msgstr "Benvenuto a" -#: src/interface.c:1027 +#: src/interface.c:1107 msgid "Key _File:" msgstr "_File chiave:" -#: src/interface.c:1033 +#: src/interface.c:1113 msgid "_Password:" msgstr "_Password:" -#: src/interface.c:1044 -#: src/interface.c:1567 -#: src/callbacks.c:1204 +#: src/interface.c:1124 +#: src/interface.c:1647 +#: src/callbacks.c:1182 msgid "Select Key File" msgstr "Selezionare il file chiave" -#: src/interface.c:1061 +#: src/interface.c:1141 msgid "Please enter your master password" msgstr "Per favore digita la tua password principale" -#: src/interface.c:1070 -#: src/callbacks.c:1424 +#: src/interface.c:1150 +#: src/callbacks.c:1405 msgid "Show Key File Dialog" msgstr "Mostrare il dialogo del file chiave" -#: src/interface.c:1189 -#: src/interface.c:1207 +#: src/interface.c:1269 +#: src/interface.c:1287 msgid "Autogenerate Password" msgstr "Auto-generare la password" -#: src/interface.c:1225 +#: src/interface.c:1305 msgid "Number of Characters:" msgstr "Numero di caratteri:" -#: src/interface.c:1235 +#: src/interface.c:1315 msgid "Use lowercase letters (a, b, c,... )" msgstr "Usare lettere minuscole (a, b, c,...)" -#: src/interface.c:1239 +#: src/interface.c:1319 msgid "Use uppercase letters (A, B, C.. )" msgstr "Usare lettere maiuscole (A, B, C, ...)" -#: src/interface.c:1243 +#: src/interface.c:1323 msgid "Use numbers (1, 2, 3... )" msgstr "Usare numeri (1, 2, 3, ...)" -#: src/interface.c:1247 +#: src/interface.c:1327 msgid "Use symbols (!, @, #...)" msgstr "Usare simboli (!, @, #, ...)" -#: src/interface.c:1251 +#: src/interface.c:1331 msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" msgstr "Evitare caratteri ambigui (l,I&1, O&0, ...)" -#: src/interface.c:1276 +#: src/interface.c:1356 msgid "Bit equivalent: 2 ^" msgstr "Bit equivalente: 2 ^" -#: src/interface.c:1284 +#: src/interface.c:1364 msgid "Number of combinations: 10 ^" msgstr "Numero di combinazioni: 10 ^" -#: src/interface.c:1292 +#: src/interface.c:1372 msgid "Generation Options" msgstr "Opzioni di generazione" -#: src/interface.c:1301 +#: src/interface.c:1381 msgid "Generated Password:" msgstr "Password generata:" -#: src/interface.c:1320 +#: src/interface.c:1400 msgid "Generate!" msgstr "Generare!" -#: src/interface.c:1435 +#: src/interface.c:1515 msgid "Choose Master Password" msgstr "Scegliere la password principale" -#: src/interface.c:1457 +#: src/interface.c:1537 msgid "Welcome to Figaro's Password Manager 2" -msgstr "Benvenuto al Figaro's Password Manager 2" +msgstr "Benvenuto in Figaro's Password Manager 2" -#: src/interface.c:1478 +#: src/interface.c:1558 msgid "Please choose the password which will be used to encrypt your passwords. It is vital that you remember this password; without it, you can not access your password list." -msgstr "Per favore scegli la password che verrà usata per crittografare le tue password. È vitale che tu ricorda questa password; senza di essa, non puoi accedere alla tua lista delle password." +msgstr "Per favore scegli la password che verrà usata per crittografare le tue password. È vitale che tu ricordi questa password; senza di essa, non puoi accedere alla tua lista delle password." -#: src/interface.c:1506 +#: src/interface.c:1586 msgid "Please choose a _password:" msgstr "Per favore scegli una _password:" -#: src/interface.c:1515 +#: src/interface.c:1595 msgid "_Verify it by typing it again here:" msgstr "_Verificala digitandola nuovamente qui:" -#: src/interface.c:1524 +#: src/interface.c:1604 msgid "Master Password" msgstr "Password principale" -#: src/interface.c:1545 +#: src/interface.c:1625 msgid "Optionally you may specify the file which will be used to encrypt your passwords along with master password. Do not lose this file, is necessary for access to your passwords." msgstr "Opzionalmente puoi specificare il file che verrà usato per crittografare le tue password assieme alla password principale. Non perdere questo file, è necessario per accedere alle tue password." -#: src/interface.c:1556 +#: src/interface.c:1636 msgid "_Key File:" msgstr "File _chiave:" -#: src/interface.c:1573 +#: src/interface.c:1653 msgid "Key File" msgstr "File chiave" -#: src/interface.c:1690 +#: src/interface.c:1770 msgid "Launcher Preferences" msgstr "Preferenze del lanciatore" -#: src/interface.c:1748 -#: src/interface.c:1772 +#: src/interface.c:1828 +#: src/interface.c:1852 msgid "to primary sel." -msgstr "alla sel. principale" +msgstr "nella sel. principale" -#: src/interface.c:1754 -#: src/interface.c:1778 +#: src/interface.c:1834 +#: src/interface.c:1858 msgid "to clipboard" -msgstr "agli appunti" +msgstr "negli appunti" -#: src/interface.c:1760 -#: src/interface.c:1784 +#: src/interface.c:1840 +#: src/interface.c:1864 msgid "don't copy" msgstr "non copiare" -#: src/interface.c:1790 +#: src/interface.c:1870 msgid "Copy _User:" msgstr "Copiare _Utente:" -#: src/interface.c:1797 +#: src/interface.c:1877 msgid "Command _Line:" msgstr "_Linea di comando:" -#: src/interface.c:1804 +#: src/interface.c:1884 msgid "Copy Pass_word:" msgstr "Copiare _pass_word:" -#: src/interface.c:1811 +#: src/interface.c:1891 msgid "Launcher _Name:" msgstr "_Nome del lanciatore:" -#: src/interface.c:1839 +#: src/interface.c:1919 msgid "Launcher" msgstr "Lanciatore" -#: src/interface.c:1848 +#: src/interface.c:1928 msgid "" "You can use the following variables in your command line:\n" "$a = argument / url\n" @@ -357,23 +385,23 @@ "$u = nome utente\n" "$p = password (non consigliato)" -#: src/interface.c:1854 +#: src/interface.c:1934 msgid "Command Line _Variables" msgstr "_Variabili della linea di comando" -#: src/interface.c:1954 +#: src/interface.c:2034 msgid "FPM2" msgstr "FPM2" -#: src/interface.c:1955 +#: src/interface.c:2035 msgid "" "(c) 2000-2003 John Conneely & other contributors\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" msgstr "" "(c) 2000-2003 John Conneely & altri contributori\n" -"(c) 2008-2009 Aleš Koval" +"(c) 2008-2010 Aleš Koval" -#: src/interface.c:1956 +#: src/interface.c:2036 msgid "" "Figaro's Password Manager\n" "Rewriten for GTK2." @@ -381,267 +409,288 @@ "Figaro's Password Manager\n" "Riscritto per GTK2" -#: src/interface.c:1957 +#: src/interface.c:2037 msgid "This application is licensed under the GNU General Public License Version 2 or (at your option) any later version.\n" msgstr "Questo applicativo è licenziato sotto la GNU General Public License versione 2 o (a propria scelta) ogni successiva versione.\n" -#: src/interface.c:1960 +#: src/interface.c:2040 msgid "FPM2 website" msgstr "sito web di FPM2" -#: src/interface.c:2065 +#: src/interface.c:2149 msgid "Preferences" msgstr "Preferenze" -#: src/interface.c:2102 +#: src/interface.c:2186 msgid "Search in _title" msgstr "Cercare nel _titolo" -#: src/interface.c:2106 +#: src/interface.c:2190 msgid "Search in u_rl" msgstr "Cercare nel u_rl" -#: src/interface.c:2110 +#: src/interface.c:2194 msgid "Search in _user" msgstr "Cercare nell'_utente" -#: src/interface.c:2114 +#: src/interface.c:2198 msgid "Search in _notes" msgstr "Cercare nelle _note" -#: src/interface.c:2118 +#: src/interface.c:2202 msgid "Search Scope" msgstr "Ambito della ricerca" -#: src/interface.c:2142 +#: src/interface.c:2226 msgid "Only in current _category" msgstr "Solo nella _categoria corrente" -#: src/interface.c:2146 +#: src/interface.c:2230 msgid "Search Conditions" msgstr "Condizioni di ricerca" -#: src/interface.c:2151 +#: src/interface.c:2235 msgid "Search" msgstr "Cercare" -#: src/interface.c:2174 +#: src/interface.c:2258 msgid "Save when entry _added" msgstr "Salvare quando la voce è _aggiunta" -#: src/interface.c:2178 +#: src/interface.c:2262 msgid "Save when entry _changed" msgstr "Salvare quando la voce è _modificata" -#: src/interface.c:2182 +#: src/interface.c:2266 msgid "Save when entry _deleted" msgstr "Salvare quando la voce è _cancellata" -#: src/interface.c:2186 +#: src/interface.c:2270 msgid "Save on _quit" msgstr "Salvare all'_uscita" -#: src/interface.c:2190 +#: src/interface.c:2274 msgid "Automatic File Saving" msgstr "Salvataggio automatico del file" -#: src/interface.c:2210 +#: src/interface.c:2294 msgid "Create a backup copy of _files" msgstr "Creare una copia di sicurezza dei _file" -#: src/interface.c:2219 +#: src/interface.c:2303 msgid "Keep " msgstr "Mantenere " -#: src/interface.c:2229 +#: src/interface.c:2313 msgid " history backup files" -msgstr " storicizza i file di backup" +msgstr " file di backup storicizzati" -#: src/interface.c:2233 +#: src/interface.c:2317 msgid "File Saving" msgstr "Salvataggio del file" -#: src/interface.c:2238 +#: src/interface.c:2322 msgid "Saving" msgstr "Salvataggio" -#: src/interface.c:2261 +#: src/interface.c:2345 msgid "Enable tray _icon" msgstr "Abilitare l'_icona nell'area di notifica" -#: src/interface.c:2265 +#: src/interface.c:2349 msgid "Tray icon always _visible" msgstr "Icona sempre visibile nell'area di notifica" -#: src/interface.c:2274 +#: src/interface.c:2358 msgid "Auto _minimize to tray icon" msgstr "Auto-minimizzare nell'area di notifica" -#: src/interface.c:2289 -#: src/interface.c:2321 +#: src/interface.c:2373 +#: src/interface.c:2405 msgid "after " msgstr "dopo" -#: src/interface.c:2298 -#: src/interface.c:2330 +#: src/interface.c:2382 +#: src/interface.c:2414 msgid " minutes" -msgstr "minuti" +msgstr " minuti" -#: src/interface.c:2306 +#: src/interface.c:2390 msgid "_Lock program past minimize" msgstr "_Bloccare il programma dopo che è stato minimizzato" -#: src/interface.c:2334 +#: src/interface.c:2418 msgid "Tray Icon" msgstr "Icona dell'area di notifica" -#: src/interface.c:2339 +#: src/interface.c:2423 msgid "Tray Icon" msgstr "Icona dell'area di notifica" -#: src/interface.c:2362 +#: src/interface.c:2446 msgid "_Open this category" -msgstr "_Aprire questa categoria" +msgstr "_Apri questa categoria" + +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "Apri il _dialogo di ricerca" -#: src/interface.c:2376 -msgid "On startup" +#: src/interface.c:2464 +msgid "On Startup" msgstr "All'avvio" -#: src/interface.c:2405 +#: src/interface.c:2483 +msgid "Call Launcher" +msgstr "Chiama il lanciatore" + +#: src/interface.c:2484 +msgid "Copy Username" +msgstr "Copia nome utente" + +#: src/interface.c:2485 +msgid "Copy Password" +msgstr "Copia password" + +#: src/interface.c:2486 +msgid "Copy Both" +msgstr "Copia entrambi" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "Apri la finestra di modifica" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "Quando la voce è attivata" + +#: src/interface.c:2518 msgid "_Clear target after paste" -msgstr "_Cancellare la destinazione dopo incolla" +msgstr "_Cancellare l'obiettivo dopo incolla" -#: src/interface.c:2409 -msgid "Copy target" -msgstr "Copiare la destinazione" +#: src/interface.c:2522 +msgid "Copy Target" +msgstr "Obiettivo della copia" -#: src/interface.c:2414 +#: src/interface.c:2527 msgid "Others" msgstr "Altri" -#: src/interface.c:2455 -msgid "_Preferences" -msgstr "_Preferenze" - -#: src/interface.c:2458 -msgid "Search Conditions" -msgstr "Condizioni di ricerca" - -#: src/interface.c:2681 -#: src/interface.c:2702 +#: src/interface.c:2797 msgid "Generate Entropy" msgstr "Generare entropia" -#: src/interface.c:2696 +#: src/interface.c:2812 msgid "Please move your mouse to collecting entropy" msgstr "Per favore muovi il tuo mouse per collezionare entropia" -#: src/interface.c:2732 +#: src/interface.c:2844 msgid "_Show / Hide" msgstr "_Mostrare / Nascondere" -#: src/interface.c:2740 +#: src/interface.c:2852 msgid "_Lock" msgstr "_Bloccare" -#: src/interface.c:2748 +#: src/interface.c:2860 msgid "_Unlock" msgstr "_Sbloccare" -#: src/interface.c:2816 +#: src/interface.c:2928 msgid "Icons and Text" msgstr "Icone e testo" -#: src/interface.c:2822 +#: src/interface.c:2934 msgid "Icons Only" msgstr "Solo icone" -#: src/interface.c:2827 +#: src/interface.c:2939 msgid "Text Only" msgstr "Solo testo" -#: src/interface.c:2837 +#: src/interface.c:2949 msgid "Hide toolbar" msgstr "Nascondere la barra degli strumenti" -#: src/callbacks.c:276 +#: src/callbacks.c:243 msgid "Are you sure you want discard changes?" msgstr "Sei sicuro di voler scartare le modifiche?" -#: src/callbacks.c:500 -#: src/callbacks.c:1295 -#: src/fpm.c:421 -#: src/fpm.c:524 -#: src/fpm.c:946 +#: src/callbacks.c:475 +#: src/callbacks.c:1276 +#: src/fpm.c:335 +#: src/fpm.c:437 +#: src/fpm.c:445 +#: src/fpm.c:924 msgctxt "key_file" msgid "" msgstr "" -#: src/callbacks.c:512 +#: src/callbacks.c:487 msgid "Are you sure you want to delete this item?" msgstr "Sei sicuro di voler cancellare questa voce?" -#: src/callbacks.c:530 -#: src/callbacks.c:918 +#: src/callbacks.c:505 +#: src/callbacks.c:896 +#: src/fpm.c:1603 #, c-format msgid "Passwords in category: %d" msgstr "Password nella categoria: %d" -#: src/callbacks.c:558 +#: src/callbacks.c:530 msgid "Export passwords" msgstr "Esportare le password" -#: src/callbacks.c:574 +#: src/callbacks.c:546 msgid "Export type:" msgstr "Tipo di esportazione:" -#: src/callbacks.c:579 -#: src/callbacks.c:651 +#: src/callbacks.c:551 +#: src/callbacks.c:622 msgid "Plain XML" msgstr "XML in chiaro" -#: src/callbacks.c:585 -#: src/callbacks.c:655 +#: src/callbacks.c:557 +#: src/callbacks.c:626 msgid "Launchers:" msgstr "Lanciatori:" -#: src/callbacks.c:589 +#: src/callbacks.c:561 msgid "Do not export" msgstr "Non esportare" -#: src/callbacks.c:590 +#: src/callbacks.c:562 msgid "Export only the launchers, which are used in the selected category" msgstr "Esportare solo i lanciatori, che sono usati nella categoria selezionata" -#: src/callbacks.c:591 +#: src/callbacks.c:563 msgid "Export all" msgstr "Esportare tutto" -#: src/callbacks.c:638 +#: src/callbacks.c:609 msgid "Import Password File" msgstr "Importare il file delle password" -#: src/callbacks.c:648 +#: src/callbacks.c:619 msgid "Import type:" msgstr "Tipo di importazione:" -#: src/callbacks.c:658 +#: src/callbacks.c:629 msgid "Do not import" msgstr "Non importare" -#: src/callbacks.c:659 +#: src/callbacks.c:630 msgid "Import only new launchers" msgstr "Importare solamente i lanciatori nuovi" -#: src/callbacks.c:660 +#: src/callbacks.c:631 msgid "Import and replace all current launchers" msgstr "Importare e sostituire tutti i lanciatori correnti" -#: src/callbacks.c:670 +#: src/callbacks.c:641 msgid "Do not change the category of items and import as it is." msgstr "Non cambiare la categoria delle voci ed importare così com'è." -#: src/callbacks.c:717 +#: src/callbacks.c:688 #, c-format msgid "" "Current location of password file:\n" @@ -654,56 +703,72 @@ "\n" "Cifratura: %s" -#: src/callbacks.c:732 -#: src/fpm.c:538 +#: src/callbacks.c:703 +#: src/fpm.c:479 msgid "Do you want to save changes?" msgstr "Vuoi salvare le modifiche?" -#: src/callbacks.c:738 +#: src/callbacks.c:709 msgid "Open Password File" msgstr "Aprire il file delle password" -#: src/callbacks.c:765 +#: src/callbacks.c:736 msgid "Save Password File" msgstr "Salvare il file delle password" -#: src/callbacks.c:776 -#: src/callbacks.c:1272 +#: src/callbacks.c:747 +#: src/callbacks.c:1253 msgid "Untitled password file" msgstr "File delle password senza nome" -#: src/callbacks.c:1261 +#: src/callbacks.c:1242 msgid "New Password File" msgstr "Nuovo file delle password" -#: src/callbacks.c:1374 +#: src/callbacks.c:1355 msgid "Please enter launcher name." msgstr "Per favore introdurre il nome del lanciatore." -#: src/callbacks.c:1419 +#: src/callbacks.c:1400 msgid "Hide Key File Dialog" msgstr "Nascondere il dialogo del file chiave" +#: src/callbacks.c:1497 +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Sei sicuro di voler decriptare e visualizzare TUTTE le password?" + #: src/support.c:90 #: src/support.c:114 #, c-format msgid "Couldn't find pixmap file: %s" msgstr "Impossibile trovare il file pixmap: %s" -#: src/fpm_clist.c:135 +#: src/fpm.c:90 msgid "Title" msgstr "Titolo" -#: src/fpm_clist.c:142 +#: src/fpm.c:91 msgid "URL" msgstr "URL" -#: src/fpm.c:129 +#: src/fpm.c:93 +msgid "Password" +msgstr "Password" + +#: src/fpm.c:95 +msgid "Notes" +msgstr "Note" + +#: src/fpm.c:96 +msgid "Launcher" +msgstr "Lanciatore" + +#: src/fpm.c:106 #, c-format msgid "Could not open %s" msgstr "Impossibile aprire %s" -#: src/fpm.c:155 +#: src/fpm.c:113 #, c-format msgid "" "Could not lock %s\n" @@ -712,28 +777,7 @@ "Impossibile bloccare %s\n" "Il file è già bloccato." -#: src/fpm.c:172 -#, c-format -msgid "Could not create a link to %s" -msgstr "Impossibile creare un collegamento a %s" - -#: src/fpm.c:181 -#, c-format -msgid "Could not fstat %s" -msgstr "Impossibile fstat %s" - -#: src/fpm.c:191 -#, c-format -msgid "" -"Lock file %s exists.\n" -"If you know this to be an error, clean up the\n" -"lock files inthe directory %s." -msgstr "" -"Il file di blocco %s esiste.\n" -"Se sai che questo è un errore, pulisci i\n" -"file di blocco nella cartella %s." - -#: src/fpm.c:349 +#: src/fpm.c:263 #, c-format msgid "" "Password exceeded limit of %d characters\n" @@ -742,28 +786,28 @@ "La password supera il limite di %d caratteri\n" "La tua password di %d caratteri è stata troncata." -#: src/fpm.c:597 +#: src/fpm.c:538 msgid "primary selection" msgstr "selezione principale" -#: src/fpm.c:598 +#: src/fpm.c:539 msgid "user" -msgstr "user" +msgstr "utente" -#: src/fpm.c:602 +#: src/fpm.c:543 msgid "clipboard" msgstr "appunti" -#: src/fpm.c:605 +#: src/fpm.c:546 msgid "password" msgstr "password" -#: src/fpm.c:607 +#: src/fpm.c:548 #, c-format msgid "Copy %s to %s." msgstr "Copiare %s su %s." -#: src/fpm.c:702 +#: src/fpm.c:659 msgid "" "This password's launcher command is undefined.\n" "Please define it in the edit launcher preference screen." @@ -771,7 +815,7 @@ "Questo comando del lanciatore della password non è definito.\n" "Per favore definirne uno nella schermata di modifica delle preferenze di un lanciatore." -#: src/fpm.c:706 +#: src/fpm.c:663 msgid "" "This password's launcher is undefined.\n" "Please define it in the edit password item screen." @@ -779,16 +823,18 @@ "Questo lanciatore della password non è definito.\n" "Per favore definirne uno nella schermata di modifica di una password." -#: src/fpm.c:729 -#: src/fpm.c:852 +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 +#: src/fpm.c:827 msgid "Cannot read key file!" msgstr "Non è possibile leggere il file chiave!" -#: src/fpm.c:765 +#: src/fpm.c:728 msgid "Password incorrect. Please try again." msgstr "Password non corretta. Per favore prova di nuovo." -#: src/fpm.c:776 +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 msgid "" "Old file format detected.\n" "\n" @@ -802,40 +848,40 @@ "\n" "Per favore tieni presente che non sarà più possibile continuare ad aprire questo file delle password in versioni precedenti di FPM2." -#: src/fpm.c:792 +#: src/fpm.c:758 msgid "Conversion of password file is done!" msgstr "La conversione del file delle password è terminata!" -#: src/fpm.c:838 +#: src/fpm.c:813 msgid "Sorry, the passwords do not match." msgstr "Spiacente, le password non coincidono." -#: src/fpm.c:843 +#: src/fpm.c:818 msgid "Sorry, your password is too short." msgstr "Spiacente, la tua password è troppo corta." -#: src/fpm.c:1000 +#: src/fpm.c:978 msgid "Information" msgstr "Informazione" #. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); -#: src/fpm.c:1439 +#: src/fpm.c:1474 msgid "Figaro's Password Manager 2 - locked" msgstr "Figaro's Password Manager 2 - bloccato" -#: src/fpm.c:1506 +#: src/fpm.c:1547 msgid "Question" msgstr "Domanda" -#: src/fpm.c:1519 +#: src/fpm.c:1560 msgid "Primary selection" msgstr "Selezione principale" -#: src/fpm.c:1520 +#: src/fpm.c:1561 msgid "Clipboard" msgstr "Appunti" -#: src/fpm.c:1526 +#: src/fpm.c:1567 msgid "" "\n" "Please select a row." @@ -843,50 +889,77 @@ "\n" "Per favore selezionare una riga." -#: src/fpm.h:71 +#: src/fpm.h:68 msgid "" msgstr "" -#: src/fpm.h:72 +#: src/fpm.h:69 msgid "" -msgstr "" +msgstr "" -#: src/fpm.h:73 +#: src/fpm.h:70 msgctxt "category" msgid "" msgstr "" -#: src/fpm_file.c:231 +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 #, c-format msgid "Saved %d password(s)." msgstr "Salvate %d password." -#: src/fpm_file.c:330 +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 #, c-format msgid "Exported clear XML passwords to %s." msgstr "Esportato file XML delle password in chiaro in %s." -#. fpm_message(glb_win_misc, "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM and try again.", GTK_MESSAGE_WARNING); -#: src/fpm_file.c:372 +#: src/fpm_file.c:370 #, c-format msgid "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM2 and try again.\n" msgstr "Spiacente, il file delle password non può essere letto perché utilizza un formato di file futuro. Per favore scarica l'ultima versione di FPM2 e prova di nuovo.\n" -#: src/fpm_file.c:599 +#: src/fpm_file.c:597 msgid "File is not XML?" msgstr "Il file non è XML?" -#: src/fpm_file.c:605 +#: src/fpm_file.c:603 msgid "File is not valid FPM2 password file." -msgstr "No es un fichero válido de contraseñas de FPM2" +msgstr "Il file non è un file di password FPM2 valido." -#: src/fpm_file.c:615 -#: src/fpm_file.c:672 +#: src/fpm_file.c:613 +#: src/fpm_file.c:670 msgid "Invalid password file." msgstr "File delle password non valido." -#: src/fpm_file.c:740 +#: src/fpm_file.c:738 #, c-format msgid "Imported %d password(s)." msgstr "Importate %d password." +#~ msgid "Unrecognized option.\n" +#~ msgstr "Opzione sconosciuta.\n" +#~ msgid "_Preferences" +#~ msgstr "_Preferenze" +#~ msgid "Search Conditions" +#~ msgstr "Condizioni di ricerca" +#~ msgid "Could not create a link to %s" +#~ msgstr "Impossibile creare un collegamento a %s" +#~ msgid "Could not fstat %s" +#~ msgstr "Impossibile fstat %s" +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "Il file di blocco %s esiste.\n" +#~ "Se sai che questo è un errore, pulisci i\n" +#~ "file di blocco nella cartella %s." + diff -Nru fpm2-0.76.1/po/Makefile.in.in fpm2-0.78/po/Makefile.in.in --- fpm2-0.76.1/po/Makefile.in.in 2009-11-09 09:18:43.000000000 +0200 +++ fpm2-0.78/po/Makefile.in.in 2010-03-03 13:52:20.000000000 +0200 @@ -95,6 +95,13 @@ $(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ --add-comments --keyword=_ --keyword=N_ \ + --keyword=C_:1c,2 \ + --keyword=NC_:1c,2 \ + --keyword=g_dngettext:2,3 \ + --flag=N_:1:pass-c-format \ + --flag=C_:2:pass-c-format \ + --flag=NC_:2:pass-c-format \ + --flag=g_dngettext:2:pass-c-format \ --flag=g_strdup_printf:1:c-format \ --flag=g_string_printf:2:c-format \ --flag=g_string_append_printf:2:c-format \ Binary files /tmp/kqV7GHTNUG/fpm2-0.76.1/po/ru.gmo and /tmp/lXNA0_jV59/fpm2-0.78/po/ru.gmo differ diff -Nru fpm2-0.76.1/po/ru.po fpm2-0.78/po/ru.po --- fpm2-0.76.1/po/ru.po 1970-01-01 02:00:00.000000000 +0200 +++ fpm2-0.78/po/ru.po 2010-02-24 08:12:33.000000000 +0200 @@ -0,0 +1,1010 @@ +# translation of fpm2. +# Copyright (C) 2008 THE fpm2'S COPYRIGHT HOLDER +# This file is distributed under the same license as the fpm2 package. +# Aleš Koval , 2008.,2009 +# Aleš Koval , 2009, 2010. +msgid "" +msgstr "" +"Project-Id-Version: fpm2 0.72\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-02-09 08:33+0100\n" +"PO-Revision-Date: 2010-02-13 20:34+0300\n" +"Last-Translator: Boorkov Sergey \n" +"Language-Team: <>\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: Virtaal 0.3.0\n" + +#: src/interface.c:129 +#: src/interface.c:1063 +#: src/interface.c:1095 +#: src/fpm.c:1378 +msgid "Figaro's Password Manager 2" +msgstr "Figaro's Password Manager 2" + +#: src/interface.c:147 +msgid "_File" +msgstr "_Файл" + +#: src/interface.c:175 +msgid "_Import Passwords" +msgstr "_Импорт Паролей" + +#: src/interface.c:183 +msgid "_Export Passwords" +msgstr "_Экспорт Паролей" + +#: src/interface.c:196 +msgid "_Minimize to tray" +msgstr "С_вернуть в трей" + +#: src/interface.c:211 +msgid "_Edit" +msgstr "_Правка" + +#: src/interface.c:218 +#: src/interface.c:2684 +msgid "Copy _Password" +msgstr "Копировать _Пароль" + +#: src/interface.c:229 +#: src/interface.c:2692 +msgid "Copy _Username" +msgstr "Копировать _Логин" + +#: src/interface.c:240 +#: src/interface.c:2700 +msgid "Copy _Both" +msgstr "Копировать _Оба" + +#: src/interface.c:256 +#: src/interface.c:2713 +msgid "_Add Item" +msgstr "_Новая Запись" + +#: src/interface.c:267 +#: src/interface.c:2721 +msgid "_Edit Item" +msgstr "_Редактировать Запись" + +#: src/interface.c:278 +#: src/interface.c:2729 +msgid "_Clone Item" +msgstr "_Копировать Запись" + +#: src/interface.c:289 +#: src/interface.c:2737 +msgid "_Delete Item" +msgstr "_Удалить Запись" + +#: src/interface.c:309 +msgid "_View" +msgstr "_Вид" + +#: src/interface.c:316 +msgid "_Title" +msgstr "_Название" + +#: src/interface.c:320 +msgid "U_RL" +msgstr "U_RL" + +#: src/interface.c:324 +msgid "_User" +msgstr "_Логин" + +#: src/interface.c:328 +msgid "_Password" +msgstr "_Пароль" + +#: src/interface.c:332 +msgid "_Category" +msgstr "_Категория" + +#: src/interface.c:336 +msgid "_Notes" +msgstr "_Примечание" + +#: src/interface.c:340 +msgid "_Launcher" +msgstr "_Загрузчик" + +#: src/interface.c:349 +msgid "Tool_bar" +msgstr "Панель _Инструментов" + +#: src/interface.c:354 +msgid "_Settings" +msgstr "_Настройки" + +#: src/interface.c:361 +msgid "_Launcher Preferences" +msgstr "Параметры _Загрузчика" + +#: src/interface.c:369 +msgid "Change _Password" +msgstr "Из_менить Пароль" + +#: src/interface.c:386 +msgid "_Help" +msgstr "Справк_а" + +#: src/interface.c:393 +msgid "Current Password File" +msgstr "_Текущий Файл Паролей" + +#: src/interface.c:419 +msgid "Save password list" +msgstr "Сохранить список паролей" + +#: src/interface.c:427 +msgid "New" +msgstr "Создать" + +#: src/interface.c:441 +#: src/interface.c:890 +msgid "Jump" +msgstr "Вход" + +#: src/interface.c:447 +#: src/fpm.c:92 +msgid "User" +msgstr "Логин" + +#: src/interface.c:453 +msgid "Pass" +msgstr "Пароль" + +#: src/interface.c:466 +#: src/fpm.c:94 +msgid "Category" +msgstr "Категория" + +#: src/interface.c:501 +msgid "Find:" +msgstr "Поиск:" + +#: src/interface.c:519 +#: src/interface.c:2222 +msgid "_Match case" +msgstr "_С учётом регистра" + +#: src/interface.c:813 +msgid "View / Edit Password Item" +msgstr "Просмотр / Правка Записи" + +#: src/interface.c:842 +msgid "Title:" +msgstr "Название:" + +#: src/interface.c:849 +msgid "URL / Arg:" +msgstr "URL / Арг.:" + +#: src/interface.c:856 +msgid "Password:" +msgstr "Пароль:" + +#: src/interface.c:875 +msgid "Show Password" +msgstr "Показать Пароль" + +#: src/interface.c:900 +msgid "User Name:" +msgstr "Логин:" + +#: src/interface.c:907 +#: src/callbacks.c:569 +#: src/callbacks.c:635 +msgid "Category:" +msgstr "Категория:" + +#: src/interface.c:914 +msgid "Include this password in the default list." +msgstr "Включить эту запись в список по умолчанию." + +#: src/interface.c:934 +msgid "Notes:" +msgstr "Прим.:" + +#: src/interface.c:942 +msgid "Launcher:" +msgstr "Загрузчик:" + +#: src/interface.c:965 +msgid "Generate..." +msgstr "Сгенерировать..." + +#: src/interface.c:1082 +msgid "Welcome to" +msgstr "Добро пожаловать в" + +#: src/interface.c:1107 +msgid "Key _File:" +msgstr "Ключевой _Файл:" + +#: src/interface.c:1113 +msgid "_Password:" +msgstr "_Пароль:" + +#: src/interface.c:1124 +#: src/interface.c:1647 +#: src/callbacks.c:1182 +msgid "Select Key File" +msgstr "Выберите Ключевой Файл" + +#: src/interface.c:1141 +msgid "Please enter your master password" +msgstr "Пожалуйста введите ваш мастер-пароль" + +#: src/interface.c:1150 +#: src/callbacks.c:1405 +msgid "Show Key File Dialog" +msgstr "Показать Диалог Ключевого Файла" + +#: src/interface.c:1269 +#: src/interface.c:1287 +msgid "Autogenerate Password" +msgstr "Автогенерация Пароля" + +#: src/interface.c:1305 +msgid "Number of Characters:" +msgstr "Количество символов:" + +#: src/interface.c:1315 +msgid "Use lowercase letters (a, b, c,... )" +msgstr "Используйте символы в нижнем регистре (a, b, c, ...)" + +#: src/interface.c:1319 +msgid "Use uppercase letters (A, B, C.. )" +msgstr "Используйте символы в верхнем регистре (A, B, C, ...)" + +#: src/interface.c:1323 +msgid "Use numbers (1, 2, 3... )" +msgstr "Используйте цифры (1, 2, 3, ...)" + +#: src/interface.c:1327 +msgid "Use symbols (!, @, #...)" +msgstr "Используйте знаки (!, @, #, ...)" + +#: src/interface.c:1331 +msgid "Avoid ambiguous characters (l,I&1, O&0, etc.)" +msgstr "Избегайте неоднозначных символов (l,I&1, O&0, ...)" + +#: src/interface.c:1356 +msgid "Bit equivalent: 2 ^" +msgstr "Битовый эквивалент: 2 ^" + +#: src/interface.c:1364 +msgid "Number of combinations: 10 ^" +msgstr "Количество комбинаций: 10 ^" + +#: src/interface.c:1372 +msgid "Generation Options" +msgstr "Настройки Генерации" + +#: src/interface.c:1381 +msgid "Generated Password:" +msgstr "Сгенерированный Пароль:" + +#: src/interface.c:1400 +msgid "Generate!" +msgstr "Генерировать!" + +#: src/interface.c:1515 +msgid "Choose Master Password" +msgstr "Выберите Мастер-Пароль" + +#: src/interface.c:1537 +msgid "Welcome to Figaro's Password Manager 2" +msgstr "Добро Пожаловать в Figaro's Password Manager 2" + +#: src/interface.c:1558 +msgid "Please choose the password which will be used to encrypt your passwords. It is vital that you remember this password; without it, you can not access your password list." +msgstr "Пожалуйста выберите пароль, который будет использован для шифрования ваших паролей. Важно хорошо его запомнить, так как без него вы не сможете получить доступ к списку ваших паролей." + +#: src/interface.c:1586 +msgid "Please choose a _password:" +msgstr "Пожалуйста введите _пароль:" + +#: src/interface.c:1595 +msgid "_Verify it by typing it again here:" +msgstr "Повторите _ввод пароля:" + +#: src/interface.c:1604 +msgid "Master Password" +msgstr "Мастер-Пароль" + +#: src/interface.c:1625 +msgid "Optionally you may specify the file which will be used to encrypt your passwords along with master password. Do not lose this file, is necessary for access to your passwords." +msgstr "Дополнительно вы можете указать файл который будет использоваться при шифровании ваших паролей одновременно с Мастер-Паролем. Не потеряйте этот файл, он нужен для доступа к вашим паролям." + +#: src/interface.c:1636 +msgid "_Key File:" +msgstr "_Ключевой Файл:" + +#: src/interface.c:1653 +msgid "Key File" +msgstr "Ключевой Файл" + +#: src/interface.c:1770 +msgid "Launcher Preferences" +msgstr "Настройка Загрузчика" + +#: src/interface.c:1828 +#: src/interface.c:1852 +msgid "to primary sel." +msgstr "в перв. выд." + +#: src/interface.c:1834 +#: src/interface.c:1858 +msgid "to clipboard" +msgstr "в буфер" + +#: src/interface.c:1840 +#: src/interface.c:1864 +msgid "don't copy" +msgstr "не копир." + +#: src/interface.c:1870 +msgid "Copy _User:" +msgstr "Копирование _Логина:" + +#: src/interface.c:1877 +msgid "Command _Line:" +msgstr "Командная _Строка:" + +#: src/interface.c:1884 +msgid "Copy Pass_word:" +msgstr "Копирование _Пароля:" + +#: src/interface.c:1891 +msgid "Launcher _Name:" +msgstr "Название _Загрузчика:" + +#: src/interface.c:1919 +msgid "Launcher" +msgstr "Загрузчик" + +#: src/interface.c:1928 +msgid "" +"You can use the following variables in your command line:\n" +"$a = argument / url\n" +"$u = user name\n" +"$p = password (not recommened)" +msgstr "" +"Вы можете использовать следующие ключи командной строки:\n" +"$a = аргумент / URL\n" +"$u = имя пользователя (логин)\n" +"$p = пароль (не рекомендуется)" + +#: src/interface.c:1934 +msgid "Command Line _Variables" +msgstr "Пара_метры Командной Строки:" + +#: src/interface.c:2034 +msgid "FPM2" +msgstr "FPM2" + +#: src/interface.c:2035 +msgid "" +"(c) 2000-2003 John Conneely & other contributors\n" +"(c) 2008-2010 Aleš Koval" +msgstr "" +"(c) 2000-2003 John Conneely и другие участники\n" +"(c) 2008-2010 Aleš Koval" + +#: src/interface.c:2036 +msgid "" +"Figaro's Password Manager\n" +"Rewriten for GTK2." +msgstr "" +"Figaro's Password Manager\n" +"Переписано для GTK2" + +#: src/interface.c:2037 +msgid "This application is licensed under the GNU General Public License Version 2 or (at your option) any later version.\n" +msgstr "Приложение распространяется под лицензией GNU General Public License Версия 2 или (на ваше усмотрение) любой более поздней версии.\n" + +#: src/interface.c:2040 +msgid "FPM2 website" +msgstr "Сайт FPM2" + +#: src/interface.c:2149 +msgid "Preferences" +msgstr "Настройки" + +#: src/interface.c:2186 +msgid "Search in _title" +msgstr "Искать в _названии" + +#: src/interface.c:2190 +msgid "Search in u_rl" +msgstr "И_скать в URL" + +#: src/interface.c:2194 +msgid "Search in _user" +msgstr "Искать в _логинах" + +#: src/interface.c:2198 +msgid "Search in _notes" +msgstr "_Искать в примечаниях" + +#: src/interface.c:2202 +msgid "Search Scope" +msgstr "Границы Поиска" + +#: src/interface.c:2226 +msgid "Only in current _category" +msgstr "Только в текущей _категории" + +#: src/interface.c:2230 +msgid "Search Conditions" +msgstr "Условия Поиска" + +#: src/interface.c:2235 +msgid "Search" +msgstr "Поиск" + +#: src/interface.c:2258 +msgid "Save when entry _added" +msgstr "При _добавлении записи" + +#: src/interface.c:2262 +msgid "Save when entry _changed" +msgstr "При изм_енении записи" + +#: src/interface.c:2266 +msgid "Save when entry _deleted" +msgstr "При _удалении записи" + +#: src/interface.c:2270 +msgid "Save on _quit" +msgstr "При в_ыходе" + +#: src/interface.c:2274 +msgid "Automatic File Saving" +msgstr "Автосохранение Файла" + +#: src/interface.c:2294 +msgid "Create a backup copy of _files" +msgstr "Создать резервну_ю копию файлов" + +#: src/interface.c:2303 +msgid "Keep " +msgstr "Хранить " + +#: src/interface.c:2313 +msgid " history backup files" +msgstr " резервных копий" + +#: src/interface.c:2317 +msgid "File Saving" +msgstr "Резервное Копирование" + +#: src/interface.c:2322 +msgid "Saving" +msgstr "Сохранение" + +#: src/interface.c:2345 +msgid "Enable tray _icon" +msgstr "Показывать иконку в _трее" + +#: src/interface.c:2349 +msgid "Tray icon always _visible" +msgstr "Всегда отобра_жать иконку" + +#: src/interface.c:2358 +msgid "Auto _minimize to tray icon" +msgstr "Пр_ятать в трей" + +#: src/interface.c:2373 +#: src/interface.c:2405 +msgid "after " +msgstr "после " + +#: src/interface.c:2382 +#: src/interface.c:2414 +msgid " minutes" +msgstr " мин." + +#: src/interface.c:2390 +msgid "_Lock program past minimize" +msgstr "Блокировать после _минимизации" + +#: src/interface.c:2418 +msgid "Tray Icon" +msgstr "Иконка в трее" + +#: src/interface.c:2423 +msgid "Tray Icon" +msgstr "Иконка в трее" + +#: src/interface.c:2446 +msgid "_Open this category" +msgstr "_Открыть эту категорию" + +#: src/interface.c:2460 +msgid "Open _search dialog" +msgstr "Показать строку _поиска" + +#: src/interface.c:2464 +msgid "On Startup" +msgstr "При старте" + +#: src/interface.c:2483 +msgid "Call Launcher" +msgstr "Загрузчик" + +#: src/interface.c:2484 +msgid "Copy Username" +msgstr "Копировать Логин" + +#: src/interface.c:2485 +msgid "Copy Password" +msgstr "Копировать Пароль" + +#: src/interface.c:2486 +msgid "Copy Both" +msgstr "Копировать Оба" + +#: src/interface.c:2487 +msgid "Open Edit Window" +msgstr "Открыть Окно Редактирования" + +#: src/interface.c:2489 +msgid "When Activated Entry" +msgstr "При Активации Записи" + +#: src/interface.c:2518 +msgid "_Clear target after paste" +msgstr "Очистить _цель после вставки" + +#: src/interface.c:2522 +msgid "Copy Target" +msgstr "Цель Копирования" + +#: src/interface.c:2527 +msgid "Others" +msgstr "Другие" + +#: src/interface.c:2797 +msgid "Generate Entropy" +msgstr "Генерация Энтропии" + +#: src/interface.c:2812 +msgid "Please move your mouse to collecting entropy" +msgstr "Пожалуйста двигайте мышью для получения энтропии" + +#: src/interface.c:2844 +msgid "_Show / Hide" +msgstr "_Показать / Скрыть" + +#: src/interface.c:2852 +msgid "_Lock" +msgstr "_Блокировать" + +#: src/interface.c:2860 +msgid "_Unlock" +msgstr "_Разблокировать" + +#: src/interface.c:2928 +msgid "Icons and Text" +msgstr "Значки и Текст" + +#: src/interface.c:2934 +msgid "Icons Only" +msgstr "Только Значки" + +#: src/interface.c:2939 +msgid "Text Only" +msgstr "Только Текст" + +#: src/interface.c:2949 +msgid "Hide toolbar" +msgstr "Скрыть панель инструментов" + +#: src/callbacks.c:243 +msgid "Are you sure you want discard changes?" +msgstr "Уверены что хотите отменить изменения?" + +#: src/callbacks.c:475 +#: src/callbacks.c:1276 +#: src/fpm.c:335 +#: src/fpm.c:437 +#: src/fpm.c:445 +#: src/fpm.c:924 +msgctxt "key_file" +msgid "" +msgstr "<Пусто>" + +#: src/callbacks.c:487 +msgid "Are you sure you want to delete this item?" +msgstr "Уверены что хотите удалить запись?" + +#: src/callbacks.c:505 +#: src/callbacks.c:896 +#: src/fpm.c:1603 +#, c-format +msgid "Passwords in category: %d" +msgstr "Записи в категории: %d" + +#: src/callbacks.c:530 +msgid "Export passwords" +msgstr "Экспорт Паролей" + +#: src/callbacks.c:546 +msgid "Export type:" +msgstr "Тип экспорта:" + +#: src/callbacks.c:551 +#: src/callbacks.c:622 +msgid "Plain XML" +msgstr "Простой XML" + +#: src/callbacks.c:557 +#: src/callbacks.c:626 +msgid "Launchers:" +msgstr "Загрузчики:" + +#: src/callbacks.c:561 +msgid "Do not export" +msgstr "Не экспортировать" + +#: src/callbacks.c:562 +msgid "Export only the launchers, which are used in the selected category" +msgstr "Экспортировать только загрузчики, используемые в выбранной категории" + +#: src/callbacks.c:563 +msgid "Export all" +msgstr "Экспортировать всё" + +#: src/callbacks.c:609 +msgid "Import Password File" +msgstr "Иморт Файла Паролей" + +#: src/callbacks.c:619 +msgid "Import type:" +msgstr "Тип импорта:" + +#: src/callbacks.c:629 +msgid "Do not import" +msgstr "Не импортировать" + +#: src/callbacks.c:630 +msgid "Import only new launchers" +msgstr "Импортировать только новые загрузчики" + +#: src/callbacks.c:631 +msgid "Import and replace all current launchers" +msgstr "Импортировать и заменить все существующие загрузчики" + +#: src/callbacks.c:641 +msgid "Do not change the category of items and import as it is." +msgstr "Не изменять категорию записей и импортировать как есть." + +#: src/callbacks.c:688 +#, c-format +msgid "" +"Current location of password file:\n" +"%s\n" +"\n" +"Cipher: %s" +msgstr "" +"Текущее расположение файла паролей:\n" +"%s\n" +"\n" +"Алгоритм шифрования: %s" + +#: src/callbacks.c:703 +#: src/fpm.c:479 +msgid "Do you want to save changes?" +msgstr "Хотите сохранить изменения?" + +#: src/callbacks.c:709 +msgid "Open Password File" +msgstr "Открыть Файл Паролей" + +#: src/callbacks.c:736 +msgid "Save Password File" +msgstr "Сохранить Файл Паролей" + +#: src/callbacks.c:747 +#: src/callbacks.c:1253 +msgid "Untitled password file" +msgstr "Безымянный файл паролей" + +#: src/callbacks.c:1242 +msgid "New Password File" +msgstr "Новый Файл Паролей" + +#: src/callbacks.c:1355 +msgid "Please enter launcher name." +msgstr "Пожалуйста введите имя загрузчика." + +#: src/callbacks.c:1400 +msgid "Hide Key File Dialog" +msgstr "Скрыть Диалог Ключевого Файла" + +#: src/callbacks.c:1497 +msgid "Are you sure you want decrypt and display ALL passwords?" +msgstr "Вы уверены что хотите расшифровать и отобразить ВСЕ пароли?" + +#: src/support.c:90 +#: src/support.c:114 +#, c-format +msgid "Couldn't find pixmap file: %s" +msgstr "Файл не найден: %s" + +#: src/fpm.c:90 +msgid "Title" +msgstr "Заголовок" + +#: src/fpm.c:91 +msgid "URL" +msgstr "URL" + +#: src/fpm.c:93 +msgid "Password" +msgstr "Пароль" + +#: src/fpm.c:95 +msgid "Notes" +msgstr "Примечание" + +#: src/fpm.c:96 +msgid "Launcher" +msgstr "Загрузчик" + +#: src/fpm.c:106 +#, c-format +msgid "Could not open %s" +msgstr "Не получается открыть %s" + +#: src/fpm.c:113 +#, c-format +msgid "" +"Could not lock %s\n" +"File already locked." +msgstr "" +"FPM2 уже работает.\n" +"Файл %s заблокирован.\n" +"Запуск второй копии приложения невозможен." + +#: src/fpm.c:263 +#, c-format +msgid "" +"Password exceeded limit of %d characters\n" +"Your password of %d characters was truncated." +msgstr "" +"Пароль превысил лимит в %d симв.\n" +"Ваш пароль был обрезан до %d симв." + +#: src/fpm.c:538 +msgid "primary selection" +msgstr "первичное выделение" + +#: src/fpm.c:539 +msgid "user" +msgstr "Логин" + +#: src/fpm.c:543 +msgid "clipboard" +msgstr "буфер" + +#: src/fpm.c:546 +msgid "password" +msgstr "Пароль" + +#: src/fpm.c:548 +#, c-format +msgid "Copy %s to %s." +msgstr "%s скопирован в %s." + +#: src/fpm.c:659 +msgid "" +"This password's launcher command is undefined.\n" +"Please define it in the edit launcher preference screen." +msgstr "" +"Эта команда загрузчика паролей не описана.\n" +"Пожалуйста опишите её в окне редактирования свойств загрузчика." + +#: src/fpm.c:663 +msgid "" +"This password's launcher is undefined.\n" +"Please define it in the edit password item screen." +msgstr "" +"Этот загрузчик паролей не определен.\n" +"Пожалуйста опишите его в окне редактирования записи." + +#. fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); +#: src/fpm.c:691 +#: src/fpm.c:827 +msgid "Cannot read key file!" +msgstr "Не удаётся прочесть ключевой файл!" + +#: src/fpm.c:728 +msgid "Password incorrect. Please try again." +msgstr "Неверный пароль... Повторите попытку." + +#. if (fpm_question(GTK_WINDOW(glb_win_misc), _("Old file format detected.\n\nDo you want change password file to new more secure cipher?\n\nPlease take note that it will not be possible to continue open this password file in the earlier version FPM2.")) +#: src/fpm.c:740 +msgid "" +"Old file format detected.\n" +"\n" +"Do you want change password file to new more secure cipher?\n" +"\n" +"Please take note that it will not be possible to continue open this password file in the earlier version FPM2." +msgstr "" +"Обнаружен файл в устаревшем формате.\n" +"\n" +"Желаете зашифровать файл паролей новым алгоритмом шифрования?\n" +"\n" +"Внимание! Файл, зашифрованный новым алгоритмом шифнования будет невозможно открыть в более ранней версии FPM2." + +#: src/fpm.c:758 +msgid "Conversion of password file is done!" +msgstr "Преобразование файла паролей завершено!" + +#: src/fpm.c:813 +msgid "Sorry, the passwords do not match." +msgstr "К сожалению, пароли не совпадают." + +#: src/fpm.c:818 +msgid "Sorry, your password is too short." +msgstr "К сожалению, ваш пароль очень короткий." + +#: src/fpm.c:978 +msgid "Information" +msgstr "Информация" + +#. g_signal_handlers_disconnect_by_func(gui->tray_icon, G_CALLBACK (tray_icon_on_menu), NULL); +#: src/fpm.c:1474 +msgid "Figaro's Password Manager 2 - locked" +msgstr "Figaro's Password Manager 2 - заблокирован" + +#: src/fpm.c:1547 +msgid "Question" +msgstr "Вопрос" + +#: src/fpm.c:1560 +msgid "Primary selection" +msgstr "Первичное выделение" + +#: src/fpm.c:1561 +msgid "Clipboard" +msgstr "Буфер" + +#: src/fpm.c:1567 +msgid "" +"\n" +"Please select a row." +msgstr "" +"\n" +"Пожалуйста выберите строку!" + +#: src/fpm.h:68 +msgid "" +msgstr "<Все категории>" + +#: src/fpm.h:69 +msgid "" +msgstr "<По умолчанию>" + +#: src/fpm.h:70 +msgctxt "category" +msgid "" +msgstr "<Без категории>" + +#. chmod(file_name, S_IRUSR | S_IWUSR); +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:232 +#, c-format +msgid "Saved %d password(s)." +msgstr "Сохранено записей: %d." + +#. cmd = g_strdup_printf("chmod 0600 %s", file_name); +#. fpm_execute_shell(cmd); +#. g_free(cmd); +#. +#: src/fpm_file.c:331 +#, c-format +msgid "Exported clear XML passwords to %s." +msgstr "Незашифрованные пароли были экспортированы в XML в файл %s." + +#: src/fpm_file.c:370 +#, c-format +msgid "Sorry, the password file cannot be read because it uses a future file format. Please download the latest version of FPM2 and try again.\n" +msgstr "К сожалению, файл паролей не может быть прочитан, т.к. он зашифрован более поздним алгоритмом шифрования. Пожалуйста скачайте последнюю версию FPM2 и повторите попытку.\n" + +#: src/fpm_file.c:597 +msgid "File is not XML?" +msgstr "Файл не XML?" + +#: src/fpm_file.c:603 +msgid "File is not valid FPM2 password file." +msgstr "Файл не является файлом паролей FPM2." + +#: src/fpm_file.c:613 +#: src/fpm_file.c:670 +msgid "Invalid password file." +msgstr "Неверный файл паролей." + +#: src/fpm_file.c:738 +#, c-format +msgid "Imported %d password(s)." +msgstr "Импортировано записей: %d" + +#~ msgid "Unrecognized option.\n" +#~ msgstr "Несуществующий параметр.\n" +#~ msgid "_Preferences" +#~ msgstr "_Настройки" +#~ msgid "Search Conditions" +#~ msgstr "Настройки Поиска" +#~ msgid "Could not create a link to %s" +#~ msgstr "Не удалось создать ссылку на %s" +#~ msgid "" +#~ "Lock file %s exists.\n" +#~ "If you know this to be an error, clean up the\n" +#~ "lock files inthe directory %s." +#~ msgstr "" +#~ "Блокирующий файл %s существует.\n" +#~ "Если вы уверены что это ошибка, сотрите\n" +#~ "файл в директории %s." + +#, fuzzy +#~ msgid "Loaded %d password(s)." +#~ msgstr "Uložit soubor s hesly" + +#, fuzzy +#~ msgid "FPM2: Launcher Preferences" +#~ msgstr "FPM: Nastavení spouštěčů" +#~ msgid "_Copy Both" +#~ msgstr "Zkopírovat _obojí" +#~ msgid "Du_plicate Item" +#~ msgstr "Du_plikovat položku" + +#, fuzzy +#~ msgid "FPM2: New Password File" +#~ msgstr "Otevřít soubor s hesly" +#~ msgid "Edit" +#~ msgstr "Upravit" +#~ msgid "Delete" +#~ msgstr "Smazat" +#~ msgid "" +#~ msgstr "" +#~ msgid "Please select which launcher you wish to edit." +#~ msgstr "Prosím zvolte si spouštěč, který chcete upravit." +#~ msgid "Please select which launcher you wish to delete." +#~ msgstr "Prosím zvolte si spouštěč, který chcete smazat." +#~ msgid "Enter your password here." +#~ msgstr "Zadej heslo." +#~ msgid "All Files" +#~ msgstr "Všechny soubory" + +#, fuzzy +#~ msgid "Save Export Password File" +#~ msgstr "Uložit soubor s hesly" +#~ msgid "New Password Entry" +#~ msgstr "Přidat novou položku" +#~ msgid "Edit Password Entry" +#~ msgstr "Upravit položku" +#~ msgid "Run launcher" +#~ msgstr "Spustit" +#~ msgid "Copy user field to clipboard" +#~ msgstr "Zkopírovat uživatele do schránky" +#~ msgid "Copy password field to clipboard" +#~ msgstr "Zkopírovat heslo do schránky" + +#, fuzzy +#~ msgid "_Delete item" +#~ msgstr "Smazat položku" +#~ msgid "Please select a row.\n" +#~ msgstr "Prosím vyberte položku!\n" + diff -Nru fpm2-0.76.1/README fpm2-0.78/README --- fpm2-0.76.1/README 2009-11-09 09:14:00.000000000 +0200 +++ fpm2-0.78/README 2010-02-24 08:12:33.000000000 +0200 @@ -1,4 +1,4 @@ -FIGARO'S PASSWORD MANAGER 2, v0.75 +FIGARO'S PASSWORD MANAGER 2, v0.77 Figaro's Password Manager 2 is a program that allows you to securely store the passwords using GTK2 interface. Features include: diff -Nru fpm2-0.76.1/src/callbacks.c fpm2-0.78/src/callbacks.c --- fpm2-0.76.1/src/callbacks.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/callbacks.c 2010-03-02 12:27:14.000000000 +0200 @@ -1,6 +1,6 @@ /* FIGARO'S PASSWORD MANAGER 2 (FPM2) * Copyright (C) 2000 John Conneely - * Copyright (C) 2008,2009 Aleš Koval + * Copyright (C) 2008-2010 Aleš Koval * * FPM is open source / free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -24,7 +24,6 @@ #endif #include -#include #include #include "fpm.h" @@ -119,20 +118,6 @@ GdkEventButton *event, gpointer user_data) { - // Limit dblclick on mouse button 1 only -/* if (event->button == 1) { - if((g_timer_elapsed(glb_timer_click, NULL) < FPM_MAX_DOUBLE_CLICK_TIME) && (glb_click_row == glb_cur_row)) - { - glb_click_count++; - } - else - { - g_timer_reset(glb_timer_click); - glb_click_count = 1; - glb_click_row = glb_cur_row; - } - } */ - if (event->button == 3) { glb_click_btn = TRUE; } @@ -160,15 +145,6 @@ GdkEventButton *event, gpointer user_data) { - // Limit dblclick on mouse button 1 only -/* if (event->button == 1) { - if((g_timer_elapsed(glb_timer_click, NULL) < FPM_MAX_DOUBLE_CLICK_TIME) && - (glb_click_count > 1)) - { - fpm_double_click(glb_edit_data); - } - } */ - if (event->button == 2) { if((g_timer_elapsed(glb_timer_click, NULL) < FPM_MAX_DOUBLE_CLICK_TIME) && (glb_click_count > 1)) @@ -194,13 +170,13 @@ if (gtk_tree_selection_get_selected(selection, &model, &selectedIter)) { gtk_tree_model_get(model, &selectedIter, - FPM_COL_DATA_POINTER, &glb_edit_data, + FPM_DATA_POINTER, &glb_edit_data, -1); row = gtk_tree_model_get_string_from_iter(model, &selectedIter); glb_cur_row = atoi(row); g_free(row); - + if (glb_click_btn) { if (gui->context_menu == NULL) @@ -212,7 +188,7 @@ glb_click_btn = FALSE; } } - + fpm_sensitive_menu(TRUE); } @@ -461,6 +437,9 @@ /* User is canceling from changing a password. Just close the screen. */ gtk_widget_destroy(glb_win_misc); } + + return TRUE; + } @@ -516,9 +495,10 @@ gtk_list_store_remove(GTK_LIST_STORE(model), &iter); glb_num_row--; - glb_edit_data = NULL; - state->dirty = TRUE; + fpm_sensitive_menu(FALSE); +// state->dirty = TRUE; + fpm_dirty(TRUE); if (ini->save_on_delete) passfile_save(glb_filename); @@ -542,12 +522,9 @@ gpointer user_data) { GtkWidget *dialog; - GtkWidget *hbox; GtkWidget *combo_box; GtkWidget *combo_box_category; - GtkFileFilter *filter; const gchar *fpm_directory; - int i; dialog = gtk_file_chooser_dialog_new ( _("Export passwords"), @@ -593,7 +570,7 @@ 0,0,15,0 ); combo_box_category = gtk_combo_box_new_text (); - fpm_populate_combo_box(combo_box_category, state->category); + fpm_populate_combo_box(GTK_COMBO_BOX(combo_box_category), state->category); gtk_table_attach_defaults (GTK_TABLE(table), GTK_WIDGET(combo_box_category), 1,2,2,3); gtk_widget_show_all (table); @@ -624,7 +601,6 @@ gpointer user_data) { GtkWidget *dialog; - GtkFileFilter *filter; const gchar *fpm_directory; GtkWidget *combo_box; GtkWidget *combo_box_category; @@ -659,7 +635,7 @@ gtk_table_attach (GTK_TABLE(table), gtk_label_new (_("Category:")), 0,1,2,3, 0,0,15,0); combo_box_category = gtk_combo_box_new_text (); - fpm_populate_combo_box(combo_box_category, state->category); + fpm_populate_combo_box(GTK_COMBO_BOX(combo_box_category), state->category); gtk_combo_box_remove_text (GTK_COMBO_BOX(combo_box_category), 0); gtk_combo_box_remove_text (GTK_COMBO_BOX(combo_box_category), 0); gtk_combo_box_insert_text (GTK_COMBO_BOX(combo_box_category), 0, _("Do not change the category of items and import as it is.")); @@ -737,7 +713,6 @@ GTK_STOCK_OPEN, GTK_RESPONSE_ACCEPT, NULL); -// fpm_directory = g_strjoin(NULL, g_get_home_dir(), "/.fpm2/", NULL); fpm_directory = g_build_filename (g_get_home_dir(), FPM_DIR, NULL); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), fpm_directory); @@ -766,7 +741,6 @@ NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); -// fpm_directory = g_strjoin(NULL, g_get_home_dir(), "/.fpm2/", NULL); fpm_directory = g_build_filename (g_get_home_dir(), FPM_DIR, NULL); gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), fpm_directory); @@ -826,10 +800,12 @@ } gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lookup_widget (glb_win_misc, "startup_category")), ini->startup_category_active); - fpm_populate_combo_box(lookup_widget (glb_win_misc, "startup_category_combo"), ini->startup_category); + fpm_populate_combo_box(GTK_COMBO_BOX(lookup_widget (glb_win_misc, "startup_category_combo")), ini->startup_category); - fpm_copy_target_combo(lookup_widget(glb_win_misc, "copy_target_combo"), ini->copy_target); + fpm_copy_target_combo(GTK_COMBO_BOX(lookup_widget(glb_win_misc, "copy_target_combo")), ini->copy_target); gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lookup_widget (glb_win_misc, "clear_target")), ini->clear_target); + gtk_combo_box_set_active (GTK_COMBO_BOX(lookup_widget(glb_win_misc, "dblclick_action_combo")), ini->dblclick_action); + gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(lookup_widget (glb_win_misc, "startup_search")), ini->startup_search); if (gtk_dialog_run (GTK_DIALOG (glb_win_misc)) == GTK_RESPONSE_OK) { @@ -899,15 +875,13 @@ GdkEvent *event, gpointer user_data) { -/* gtk_main_quit(); - return(TRUE); -*/ if(state->startup_tray) { gtk_widget_hide(gui->pass_window); state->locked = TRUE; } else gtk_main_quit(); + return TRUE; } void @@ -942,6 +916,7 @@ gpointer user_data) { gtk_widget_hide (GTK_WIDGET(lookup_widget (gui->main_window, "findbar"))); + fpm_sensitive_menu(FALSE); fpm_clist_create_view(state->category); } @@ -953,6 +928,7 @@ // Escape if (event->keyval == 0xff1b) { gtk_widget_hide (GTK_WIDGET(lookup_widget (gui->main_window, "findbar"))); + fpm_sensitive_menu(FALSE); fpm_clist_create_view(state->category); return TRUE; } @@ -966,6 +942,7 @@ { gchar *search_text; + fpm_sensitive_menu(FALSE); search_text = gtk_editable_get_chars(editable, 0, -1); fpm_search(search_text, FALSE); g_free(search_text); @@ -992,9 +969,12 @@ tray_icon_on_click (GtkStatusIcon *status_icon, gpointer user_data) { - if (state->locked) - fpm_unlock(); - else { + if (state->locked) { + if (GTK_WIDGET_VISIBLE(gui->pass_window)) + gtk_widget_hide(gui->pass_window); + else + fpm_unlock(); + } else { if(state->minimized && ini->after_unhide_set_startup_category) fpm_switch_view_category(ini->startup_category); fpm_tr_toggle_main_window(FALSE); @@ -1200,7 +1180,6 @@ gpointer user_data) { GtkWidget *dialog; - GtkFileFilter *filter; const gchar *fpm_directory; dialog = gtk_file_chooser_dialog_new (_("Select Key File"), @@ -1220,9 +1199,10 @@ filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); GtkComboBox *combo_box; - combo_box = GTK_COMBO_BOX(lookup_widget(glb_win_misc, "key_file_combo")); + combo_box = GTK_COMBO_BOX(lookup_widget(gtk_widget_get_toplevel(GTK_WIDGET(button)), "key_file_combo")); gtk_combo_box_insert_text(combo_box, 1, filename); gtk_combo_box_set_active(combo_box, 1); + g_free (filename); } gtk_widget_destroy (dialog); @@ -1280,6 +1260,7 @@ { glb_filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog)); + gtk_widget_set_sensitive(gui->main_window, FALSE); fpm_launcher_remove_all(); fpm_clear_list(); fpm_clist_populate_cat_list(); @@ -1373,7 +1354,7 @@ fpm_launcher_populate_combo_box(g_list_index(glb_launcher_list, current_launcher)); gtk_widget_set_sensitive(lookup_widget(glb_win_misc, "btn_launcher_add"), TRUE); - state->dirty = TRUE; + fpm_dirty(TRUE); } else { fpm_message(GTK_WINDOW(glb_win_misc), _("Please enter launcher name."), GTK_MESSAGE_WARNING); @@ -1476,4 +1457,86 @@ fpm_double_click(glb_edit_data); } +void +on_clist_main_columns_changed (GtkTreeView *treeview, + gpointer user_data) +{ + + GtkTreeViewColumn *treeViewColumn = NULL; + GList *columns; + gint id; + + g_list_free (columns_order); + columns_order = NULL; + + columns = gtk_tree_view_get_columns(gui->main_clist); + while (columns != NULL) { + id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(columns->data), "index")); + columns_order = g_list_append(columns_order, GINT_TO_POINTER(id)); + + treeViewColumn = GTK_TREE_VIEW_COLUMN(columns->data); + + gtk_tree_view_column_set_resizable (treeViewColumn, TRUE); + gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_FIXED); + + columns = g_list_next(columns); + } + + if(treeViewColumn != NULL) + gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + + g_list_free(columns); + +} + + +void +on_view_menu_activate (GtkMenuItem *menuitem, + gpointer user_data) +{ + + gint id, i = 0; + + id = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(menuitem), "index")); + + if ((id == FPM_PASSWORD) && GTK_CHECK_MENU_ITEM(menuitem)->active ) { + if (!(fpm_question(GTK_WINDOW(gui->main_window), _("Are you sure you want decrypt and display ALL passwords?")) + == GTK_RESPONSE_YES)) { + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(menuitem), FALSE); + return; + } + } + + fpm_view_modify_column(id, GTK_CHECK_MENU_ITEM (menuitem)->active); + + GList *columns = gtk_tree_view_get_columns(gui->main_clist); + while (columns != NULL) { + ini->columns_width[i] = gtk_tree_view_column_get_width(columns->data); + columns = g_list_next(columns); + i++; + } + g_list_free(columns); + ini->columns_width[i-1] = 150; + + fpm_clist_init(); + fpm_clist_create_view(state->category); + +} + + +void +on_dblclick_action_combo_changed (GtkComboBox *combobox, + gpointer user_data) +{ + ini->dblclick_action = gtk_combo_box_get_active(combobox); +} + + +void +on_startup_search_toggled (GtkToggleButton *togglebutton, + gpointer user_data) +{ + ini->startup_search = togglebutton->active; + +} diff -Nru fpm2-0.76.1/src/callbacks.h fpm2-0.78/src/callbacks.h --- fpm2-0.76.1/src/callbacks.h 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/callbacks.h 2010-02-24 08:12:33.000000000 +0200 @@ -1,6 +1,6 @@ /* FIGARO'S PASSWORD MANAGER 2 (FPM2) * Copyright (C) 2000 John Conneely - * Copyright (C) 2008,2009 Aleš Koval + * Copyright (C) 2008-2010 Aleš Koval * * FPM is open source / free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -563,3 +563,18 @@ GtkTreeViewColumn *column, gpointer user_data); +void +on_clist_main_columns_changed (GtkTreeView *treeview, + gpointer user_data); + +void +on_view_menu_activate (GtkMenuItem *menuitem, + gpointer user_data); + +void +on_dblclick_action_combo_changed (GtkComboBox *combobox, + gpointer user_data); + +void +on_startup_search_toggled (GtkToggleButton *togglebutton, + gpointer user_data); diff -Nru fpm2-0.76.1/src/fpm.c fpm2-0.78/src/fpm.c --- fpm2-0.76.1/src/fpm.c 2009-11-09 09:16:49.000000000 +0200 +++ fpm2-0.78/src/fpm.c 2010-03-02 12:28:35.000000000 +0200 @@ -1,6 +1,6 @@ /* FIGARO'S PASSWORD MANAGER 2 (FPM2) * Copyright (C) 2000 John Conneely - * Copyright (C) 2008,2009 Aleš Koval + * Copyright (C) 2008-2010 Aleš Koval * * FPM is open source / free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -28,12 +28,10 @@ #include "fpm_crypt.h" #include #include -#include -#include -#include #include #include +#include #include #include #include @@ -81,6 +79,20 @@ */ gboolean glb_need_decrypt; +GList *columns_order = NULL; + +gchar *columns_title [] = +{ + "", + N_("Title") , + N_("URL") , + N_("User"), + N_("Password"), + N_("Category"), + N_("Notes") , + N_("Launcher") +}; + void lock_fpm_file(gchar* glb_filename) { @@ -226,7 +238,8 @@ gboolean valid; /* Set dirty flag so we know we need to save later. */ - state->dirty = TRUE; +// state->dirty = TRUE; + fpm_dirty(TRUE); /* First update data structures */ data->title = fpm_get_entry(win_edit, "entry_title"); @@ -269,12 +282,12 @@ buffer = gtk_text_view_get_buffer (GTK_TEXT_VIEW (notes)); gtk_text_buffer_get_bounds (buffer, &start, &end); data->notes = gtk_text_iter_get_text (&start, &end); - + model = gtk_tree_view_get_model(gui->main_clist); valid = gtk_tree_model_get_iter_first(model, &iter); while (valid) { - gtk_tree_model_get(model, &iter, FPM_COL_DATA_POINTER, &data1, -1); + gtk_tree_model_get(model, &iter, FPM_DATA_POINTER, &data1, -1); if( data == data1 ) { row = atoi(gtk_tree_model_get_string_from_iter(model, &iter)); } @@ -298,7 +311,7 @@ passfile_save(glb_filename); } else - { + { // g_print("updating...\n"); if (ini->save_on_change) passfile_save(glb_filename); @@ -333,7 +346,6 @@ return (tmp); } - void fpm_set_entry(GtkWidget* win, gchar* entry_name, char* text) { @@ -367,10 +379,26 @@ fpm_toolbar_style(); gtk_widget_hide(GTK_WIDGET(lookup_widget (gui->main_window ,"hide_to_tray"))); + gui->main_clist = GTK_TREE_VIEW(lookup_widget (gui->main_window, "clist_main")); - // if(gtk_tree_view_get_model(gui->main_clist) == NULL) + fpm_clist_init(); + gint i; + GtkWidget *view = gtk_menu_item_get_submenu(GTK_MENU_ITEM(lookup_widget (gui->main_window ,"view1"))); + GList *children = gtk_container_get_children(GTK_CONTAINER(view)); + for (i = 1; i < FPM_NUM_COLS; i++) { + g_object_set_data(G_OBJECT(children->data), "index", GINT_TO_POINTER(i)); + + if (g_list_find(columns_order, GINT_TO_POINTER(i)) != NULL) { + g_signal_handlers_block_by_func(G_OBJECT(children->data), G_CALLBACK(on_view_menu_activate), NULL); + gtk_check_menu_item_set_active(GTK_CHECK_MENU_ITEM(children->data), TRUE); + g_signal_handlers_unblock_by_func(G_OBJECT(children->data), G_CALLBACK(on_view_menu_activate), NULL); + } + + children = g_list_next(children); + } + state->new_entry = FALSE; state->startup_tray = tray_on_startup; @@ -435,6 +463,7 @@ label = GTK_LABEL(lookup_widget(gui->pass_window, "label_password_message")); gtk_widget_hide(GTK_WIDGET(label)); + gtk_widget_grab_focus(lookup_widget(gui->pass_window, "entry_password")); gtk_widget_show(gui->pass_window); } @@ -503,7 +532,7 @@ void fpm_clipboard_set(fpm_clipboard *clipboard) { - static const GtkTargetEntry targets[] = { "STRING", 0, 1 }; + static const GtkTargetEntry targets[] = {{ "STRING", 0, 1 }}; gchar *selection = _("primary selection"); gchar *selection_type = _("user"); gchar *dia_str; @@ -549,8 +578,24 @@ void fpm_double_click(fpm_data* data) { - if (data != NULL) - fpm_jump(data); + switch(ini->dblclick_action) { + case ACTION_RUN_LAUNCHER: + if (data != NULL) + fpm_jump(data); + break; + case ACTION_COPY_USERNAME: + fpm_clipboard_init(data, ini->copy_target, FALSE, FALSE); + break; + case ACTION_COPY_PASSWORD: + fpm_clipboard_init(data, ini->copy_target, TRUE, FALSE); + break; + case ACTION_COPY_BOTH: + fpm_clipboard_init(data, ini->copy_target, FALSE, TRUE); + break; + case ACTION_EDIT_ENTRY: + fpm_edit_passitem(&gui->edit_window, data); + break; + } } void @@ -637,9 +682,9 @@ combo_box = GTK_COMBO_BOX(lookup_widget(gui->pass_window, "key_file_combo")); if(gtk_combo_box_get_active(combo_box)) { - gchar kf_hash[SHA256_DIGEST_LENGTH + 1] = {0}; + guchar kf_hash[SHA256_DIGEST_LENGTH + 1] = {0}; - if(sha256_file(gtk_combo_box_get_active_text(combo_box), kf_hash)) { + if(fpm_sha256_file(gtk_combo_box_get_active_text(combo_box), kf_hash)) { // fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); fpm_message(GTK_WINDOW(gui->pass_window), _("Cannot read key file!"), GTK_MESSAGE_ERROR); return; @@ -663,7 +708,8 @@ glb_need_decrypt = FALSE; gchar* vhash; vhash = g_malloc0(cipher->hash_len + 1); - sha256_fpm_data(vhash); + fpm_sha256_fpm_data(vhash); + fpm_decrypt_field(old_context, vstring_plain1, vstring, cipher->hash_len); if(strcmp(vstring_plain1, vhash) == 0) { strcpy(vstring_plain,"FIGARO"); @@ -703,7 +749,7 @@ // gtk_widget_hide(glb_win_misc); gtk_widget_destroy(glb_win_misc); - + passfile_load(glb_filename); fpm_crypt_init(password); fpm_decrypt_launchers(); @@ -723,10 +769,10 @@ fpm_clist_populate_cat_list(); gtk_window_resize (GTK_WINDOW(gui->main_window), ini->main_width, ini->main_height); - if ((ini->main_x != -1) && (ini->main_y != -1)) + if((ini->main_x != -1) && (ini->main_y != -1) && !ini->dont_remember_position) gtk_window_move(GTK_WINDOW(gui->main_window), ini->main_x, ini->main_y); - if (ini->enable_tray_icon) + if(ini->enable_tray_icon) fpm_tray_icon(); gtk_window_set_skip_taskbar_hint(GTK_WINDOW(gui->main_window), FALSE); @@ -739,6 +785,12 @@ state->locked = FALSE; state->minimized = FALSE; + + while (gtk_events_pending()) gtk_main_iteration(); + + if(ini->startup_search) + on_find_activate(NULL, NULL); + } @@ -768,9 +820,9 @@ combo_box = GTK_COMBO_BOX(lookup_widget(glb_win_misc, "key_file_combo")); if(gtk_combo_box_get_active(combo_box)) { - gchar kf_hash[SHA256_DIGEST_LENGTH + 1] = {0}, *prehash; + guchar kf_hash[SHA256_DIGEST_LENGTH + 1] = {0}; - if(sha256_file(gtk_combo_box_get_active_text(combo_box), kf_hash)) { + if(fpm_sha256_file(gtk_combo_box_get_active_text(combo_box), kf_hash)) { fpm_message(GTK_WINDOW(glb_win_misc), _("Cannot read key file!"), GTK_MESSAGE_ERROR); return; } @@ -784,9 +836,10 @@ state->category=g_strdup(FPM_ALL_CAT_MSG); fpm_crypt_init(pw1); - state->dirty = TRUE; -// gtk_widget_destroy(glb_win_misc); +// state->dirty = TRUE; + fpm_dirty(TRUE); gtk_widget_show(gui->main_window); + gtk_widget_set_sensitive(gui->main_window, TRUE); fpm_clist_populate_cat_list(); } @@ -932,8 +985,7 @@ GKeyFile *keyfile; GError *error = NULL; gsize count; - gint i; - gint *columns; + gint i, *columns; ini = g_malloc0(sizeof(fpm_ini)); @@ -977,6 +1029,10 @@ ini->copy_target = SELECTION_PRIMARY; ini->clear_target = TRUE; + ini->dont_remember_position = FALSE; + ini->dblclick_action = ACTION_RUN_LAUNCHER; + ini->startup_search = FALSE; + fpm_ini_save(); } else { ini->save_on_add = g_key_file_get_boolean (keyfile, "general", "save_on_add", NULL); @@ -1011,8 +1067,8 @@ error = NULL; columns = g_key_file_get_integer_list (keyfile, "general", "columns_width", &count, &error); - if (error != NULL || count != FPM_NUM_COL || columns == NULL) { - for (i=0; i< FPM_NUM_COL; i++) + if (error != NULL || count != FPM_NUM_COLS || columns == NULL) { + for (i = 0; i < FPM_NUM_COLS; i++) ini->columns_width[i] = 150; } else { memcpy(ini->columns_width, columns, sizeof(ini->columns_width)); @@ -1020,6 +1076,20 @@ } error = NULL; + columns = g_key_file_get_integer_list (keyfile, "general", "columns_order", &count, &error); + if (error != NULL || columns == NULL) { + columns_order = g_list_append (columns_order, GINT_TO_POINTER (FPM_TITLE)); + columns_order = g_list_append (columns_order, GINT_TO_POINTER (FPM_URL)); + columns_order = g_list_append (columns_order, GINT_TO_POINTER (FPM_USER)); + } else { + for (i = 0; i < count; i++) + columns_order = g_list_append (columns_order, GINT_TO_POINTER (columns[i])); + g_free(columns); + } + + ini->dont_remember_position = g_key_file_get_boolean (keyfile, "general", "dont_remember_position", NULL); + + error = NULL; ini->search_in_title = g_key_file_get_boolean (keyfile, "search", "search_in_title", &error); if (error != NULL) ini->search_in_title = TRUE; @@ -1089,6 +1159,13 @@ if (error != NULL) ini->after_unhide_set_startup_category = FALSE; + error = NULL; + ini->dblclick_action = g_key_file_get_integer(keyfile, "general", "dblclick_action", &error); + if (error != NULL) + ini->dblclick_action = ACTION_RUN_LAUNCHER; + + ini->startup_search = g_key_file_get_boolean (keyfile, "general", "startup_search", NULL); + g_free(fpm_ini_file); } @@ -1099,25 +1176,43 @@ void fpm_ini_save() { GKeyFile *keyfile; - GtkTreeViewColumn *column; gint x, y, width, height; - gint i; + gint i = 0; + GList *columns; + gint columns_order_tmp[FPM_NUM_COLS]; if (gui->main_window == NULL) { x = -1; y = -1; width = 500; height = 350; - for (i=0; i< FPM_NUM_COL; i++) + for (i = 0; i < FPM_NUM_COLS; i++) ini->columns_width[i] = 150; + + columns_order = g_list_append (columns_order, GINT_TO_POINTER (FPM_TITLE)); + columns_order = g_list_append (columns_order, GINT_TO_POINTER (FPM_URL)); + columns_order = g_list_append (columns_order, GINT_TO_POINTER (FPM_USER)); + } else { gtk_window_get_size (GTK_WINDOW(gui->main_window), &width, &height); gtk_window_get_position(GTK_WINDOW(gui->main_window), &x, &y); - for (i=0; i< FPM_NUM_COL; i++) { - column = gtk_tree_view_get_column (gui->main_clist, i); - ini->columns_width[i] = gtk_tree_view_column_get_width (column); + columns = gtk_tree_view_get_columns(gui->main_clist); + while (columns != NULL) { + ini->columns_width[i] = gtk_tree_view_column_get_width (columns->data); + columns = g_list_next(columns); + i++; } + g_list_free(columns); + + i = 0; + columns = g_list_first(columns_order); + while(columns != NULL) { + columns_order_tmp[i] = GPOINTER_TO_INT(columns->data); + columns = g_list_next(columns); + i++; + } + } gchar *fpm_ini_file = g_build_filename (g_get_home_dir(), FPM_DIR, "fpm.ini", NULL); @@ -1135,7 +1230,10 @@ g_key_file_set_integer (keyfile, "general", "main_y", y); g_key_file_set_integer (keyfile, "general", "main_width", width); g_key_file_set_integer (keyfile, "general", "main_height", height); - g_key_file_set_integer_list (keyfile, "general", "columns_width", ini->columns_width, 3); + g_key_file_set_integer_list (keyfile, "general", "columns_width", ini->columns_width, FPM_NUM_COLS); + g_key_file_set_integer_list (keyfile, "general", "columns_order", columns_order_tmp, i); + g_key_file_set_boolean (keyfile, "general", "dont_remember_position", ini->dont_remember_position); + g_key_file_set_integer (keyfile, "general", "dblclick_action", ini->dblclick_action); g_key_file_set_boolean (keyfile, "search", "search_in_title", ini->search_in_title); g_key_file_set_boolean (keyfile, "search", "search_in_url", ini->search_in_url); @@ -1161,12 +1259,14 @@ g_key_file_set_integer (keyfile, "general", "copy_target", ini->copy_target); g_key_file_set_boolean (keyfile, "general", "clear_target", ini->clear_target); + g_key_file_set_boolean (keyfile, "general", "startup_search", ini->startup_search); + gchar *save_data = g_key_file_to_data (keyfile, NULL, NULL); g_file_set_contents (fpm_ini_file, save_data, -1, NULL); - g_free(fpm_ini_file); - g_free(save_data); + g_free(fpm_ini_file); + g_free(save_data); g_key_file_free (keyfile); } @@ -1195,7 +1295,10 @@ if ((!strcmp(state->category, data->category) && ini->search_limit_category) || ((!strcmp(state->category, FPM_ALL_CAT_MSG) - || !ini->search_limit_category))) + || !ini->search_limit_category)) + || (!strcmp(state->category, FPM_NONE_CAT_MSG) && !strlen(data->category)) + || (!strcmp(state->category, FPM_DEFAULT_CAT_MSG) && data->default_list) + ) { if (!ini->search_match_case) { @@ -1213,12 +1316,7 @@ gtk_list_store_append (GTK_LIST_STORE(list_store), &iter); - gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, - FPM_COL_TITLE, data->title, - FPM_COL_URL, data->arg, - FPM_COL_USER, data->user, - FPM_COL_DATA_POINTER, data, - -1); + fpm_clist_set_data (data, list_store, iter); } } /* if (!ini->search_match_case) { @@ -1489,7 +1587,6 @@ void fpm_switch_view_category(gchar *category) { GList* list; gint i = 0; - gint index = 0; gchar *dia_str; list = g_list_first(glb_cat_string_list); @@ -1505,4 +1602,31 @@ dia_str = g_strdup_printf(_("Passwords in category: %d"), glb_num_row); fpm_statusbar_push(dia_str); g_free(dia_str); -} \ No newline at end of file +} + +void fpm_view_modify_column(gint type, gboolean active) { + + if(active) + columns_order = g_list_append (columns_order, GINT_TO_POINTER(type)); + else + columns_order = g_list_remove (columns_order, GINT_TO_POINTER(type)); +} + +void fpm_dirty(gboolean active) { + state->dirty = active; + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "button_save"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "save1"), active); +} + +void fpm_sensitive_menu(gboolean active) { + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "button_jump"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "button_edit"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "button_user"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "button_pass"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "copy_pass"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "copy_user"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "copy_both1"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "edit_item1"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "clone_item1"), active); + gtk_widget_set_sensitive (lookup_widget(gui->main_window, "item_delete"), active); +} diff -Nru fpm2-0.76.1/src/fpm_clist.c fpm2-0.78/src/fpm_clist.c --- fpm2-0.76.1/src/fpm_clist.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm_clist.c 2010-02-24 08:12:33.000000000 +0200 @@ -1,6 +1,6 @@ /* FIGARO'S PASSWORD MANAGER 2 (FPM2) * Copyright (C) 2000 John Conneely - * Copyright (C) 2008,2009 Aleš Koval + * Copyright (C) 2008-2010 Aleš Koval * * FPM is open source / free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -20,6 +20,7 @@ */ #include "fpm.h" +#include "fpm_crypt.h" #include "support.h" #include @@ -123,34 +124,53 @@ fpm_clist_init() { GtkListStore *main_list_store; - GtkCellRenderer* cellRenderer; - GtkTreeViewColumn* treeViewColumn; + GtkCellRenderer *cellRenderer; + GtkTreeViewColumn *treeViewColumn = NULL; +// GtkTreeModel *list_store; + GType types[FPM_NUM_COLS]; + gint i = 1, j; + + g_signal_handlers_block_by_func (gui->main_clist, G_CALLBACK (on_clist_main_columns_changed), NULL); + + GList *columns; + columns = gtk_tree_view_get_columns(gui->main_clist); + while (columns != NULL) { + gtk_tree_view_remove_column(gui->main_clist, GTK_TREE_VIEW_COLUMN(columns->data)); + columns = g_list_next(columns); + } + g_list_free(columns); - main_list_store = gtk_list_store_new (4, G_TYPE_STRING, G_TYPE_STRING, - G_TYPE_STRING, G_TYPE_POINTER); + cellRenderer = gtk_cell_renderer_text_new(); - gtk_tree_view_set_model (gui->main_clist, GTK_TREE_MODEL (main_list_store)); + columns = g_list_first(columns_order); + while(columns != NULL) { - cellRenderer = gtk_cell_renderer_text_new(); - treeViewColumn = gtk_tree_view_column_new_with_attributes (_("Title"), cellRenderer, "text", 0, NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW(gui->main_clist),treeViewColumn); - gtk_tree_view_column_set_resizable (treeViewColumn, 1); - gtk_tree_view_column_set_fixed_width (treeViewColumn, ini->columns_width[0]); - gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_sort_column_id (treeViewColumn, 0); - - treeViewColumn = gtk_tree_view_column_new_with_attributes (_("URL"),cellRenderer,"text",1,NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW(gui->main_clist),treeViewColumn); - gtk_tree_view_column_set_resizable (treeViewColumn, 2); - gtk_tree_view_column_set_fixed_width (treeViewColumn, ini->columns_width[1]); - gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_FIXED); - gtk_tree_view_column_set_sort_column_id (treeViewColumn, 1); - - treeViewColumn = gtk_tree_view_column_new_with_attributes (_("User"),cellRenderer,"text",2,NULL); - gtk_tree_view_append_column (GTK_TREE_VIEW(gui->main_clist),treeViewColumn); - gtk_tree_view_column_set_resizable (treeViewColumn, 3); - gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_AUTOSIZE); - gtk_tree_view_column_set_sort_column_id (treeViewColumn, 2); + j = GPOINTER_TO_INT(columns->data); + + types[i] = G_TYPE_STRING; + treeViewColumn = gtk_tree_view_column_new_with_attributes (gettext(columns_title[j]), cellRenderer, "text", i, NULL); + g_object_set_data(G_OBJECT(treeViewColumn), "index", GINT_TO_POINTER(j)); + gtk_tree_view_append_column (GTK_TREE_VIEW(gui->main_clist), treeViewColumn); + gtk_tree_view_column_set_resizable (treeViewColumn, TRUE); + gtk_tree_view_column_set_fixed_width (treeViewColumn, ini->columns_width[i-1]); + gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_FIXED); + gtk_tree_view_column_set_reorderable (treeViewColumn, TRUE); + gtk_tree_view_column_set_sort_column_id (treeViewColumn, i); + + i++; + columns = g_list_next(columns); + } + + if(treeViewColumn != NULL) + gtk_tree_view_column_set_sizing (treeViewColumn, GTK_TREE_VIEW_COLUMN_AUTOSIZE); + g_list_free(columns); + + types[0] = G_TYPE_POINTER; + + main_list_store = gtk_list_store_newv (i, types); + gtk_tree_view_set_model (gui->main_clist, GTK_TREE_MODEL (main_list_store)); + + g_signal_handlers_unblock_by_func (gui->main_clist, G_CALLBACK (on_clist_main_columns_changed), NULL); } @@ -159,7 +179,7 @@ fpm_clist_create_view(gchar *category) /* Create visible CList from abstract GList */ { - gint row; +// gint row,i,j; fpm_data *data; GList *list; @@ -167,17 +187,18 @@ GtkTreeModel *list_store; // GCompareFunc cmp_list; - glb_num_row=0; + glb_num_row = 0; /* Sort the list */ //glb_cmp = (GCompareFunc) fpm_cmp_title; glb_pass_list = g_list_sort(glb_pass_list, (GCompareFunc) fpm_cmp_title); list_store = gtk_tree_view_get_model (gui->main_clist); + gtk_list_store_clear(GTK_LIST_STORE(list_store)); /* Iterate over the list */ - list=g_list_first(glb_pass_list); + list = g_list_first(glb_pass_list); while (list!=NULL) { @@ -193,19 +214,70 @@ gtk_list_store_append (GTK_LIST_STORE(list_store), &iter); - gtk_list_store_set(GTK_LIST_STORE(list_store), &iter, - FPM_COL_TITLE, data->title, - FPM_COL_URL, data->arg, - FPM_COL_USER, data->user, - FPM_COL_DATA_POINTER, data, - -1); + fpm_clist_set_data (data, list_store, iter); - glb_num_row++; - row = glb_num_row - 1; + glb_num_row++; +// row = glb_num_row - 1; } - list=g_list_next(list); + list = g_list_next(list); + } +} + +void +fpm_clist_set_data(fpm_data *data, GtkTreeModel *list_store, GtkTreeIter iter) { + + GList *columns; + GValue value = {0}; + gchar cleartext[FPM_PASSWORD_LEN+1] = {0}; + gint i, j, ix; + + + i = 1; + columns = g_list_first(columns_order); + while (columns != NULL) { + g_value_init(&value, G_TYPE_STRING); + + j = GPOINTER_TO_INT(columns->data); + switch(j) { + case FPM_TITLE: + g_value_set_static_string(&value, data->title); + break; + case FPM_URL: + g_value_set_static_string(&value, data->arg); + break; + case FPM_USER: + g_value_set_static_string(&value, data->user); + break; + case FPM_PASSWORD: + ix = strlen(data->password) / 2; + fpm_decrypt_field(old_context, cleartext, data->password, ix); + g_value_set_string(&value, cleartext); + wipememory(cleartext, FPM_PASSWORD_LEN); + break; + case FPM_CATEGORY: + g_value_set_static_string(&value, data->category); + break; + case FPM_NOTES: + g_value_set_static_string(&value, data->notes); + break; + case FPM_LAUNCHER: + g_value_set_static_string(&value, data->launcher); + break; + } + + gtk_list_store_set_value(GTK_LIST_STORE (list_store), &iter, i, &value); + g_value_unset(&value); + i++; + columns = g_list_next(columns); } + + g_value_init(&value, G_TYPE_POINTER); + g_value_set_pointer(&value, data); + gtk_list_store_set_value(GTK_LIST_STORE (list_store), &iter, FPM_DATA_POINTER, &value); + g_value_unset(&value); + + g_list_free(columns); } diff -Nru fpm2-0.76.1/src/fpm_crypt.c fpm2-0.78/src/fpm_crypt.c --- fpm2-0.76.1/src/fpm_crypt.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm_crypt.c 2010-03-02 12:25:57.000000000 +0200 @@ -22,7 +22,6 @@ #include #include -#include #include "fpm_crypt.h" #include "fpm.h" @@ -76,24 +75,24 @@ } void fpm_crypt_init(gchar* password) { - gchar *prehash1, *prehash2; + gchar *prehash1 = "", *prehash2 = ""; byte *hash_1, *hash_2; old_context = g_malloc(cipher->contextsize); new_context = g_malloc(cipher->contextsize); - if(cipher_algo == AES256) { - hash_1 = g_malloc(cipher->hash_len); - hash_2 = g_malloc(cipher->hash_len); + hash_1 = g_malloc(cipher->hash_len); + hash_2 = g_malloc(cipher->hash_len); - pkcs5_pbkdf2(password, strlen(password), old_salt, cipher->salt_len, hash_1, cipher->hash_len, PBKDF2_ITERATIONS); - pkcs5_pbkdf2(password, strlen(password), new_salt, cipher->salt_len, hash_2, cipher->hash_len, PBKDF2_ITERATIONS); + if(cipher_algo == AES256) { + fpm_pkcs5_pbkdf2((guchar *)password, strlen(password), old_salt, cipher->salt_len, hash_1, cipher->hash_len, PBKDF2_ITERATIONS); + fpm_pkcs5_pbkdf2((guchar *)password, strlen(password), new_salt, cipher->salt_len, hash_2, cipher->hash_len, PBKDF2_ITERATIONS); } else { - prehash1=g_strdup_printf("%s%s", old_salt, password); - prehash2=g_strdup_printf("%s%s", new_salt, password); + prehash1 = g_strdup_printf("%s%s", old_salt, password); + prehash2 = g_strdup_printf("%s%s", new_salt, password); - hash_1=md5((byte *)prehash1, strlen(prehash1)); - hash_2=md5((byte *)prehash2, strlen(prehash2)); + md5(prehash1, hash_1); + md5(prehash2, hash_2); } fpm_setkey(old_context, hash_1, cipher->hash_len); @@ -114,17 +113,17 @@ } void fpm_crypt_set_password(gchar *password) { - gchar *prehash; + gchar *prehash = ""; byte *hash; new_salt = get_new_salt(cipher->salt_len); + hash = g_malloc(cipher->hash_len); if(cipher_algo == AES256) { - hash = g_malloc(cipher->hash_len); - pkcs5_pbkdf2(password, strlen(password), new_salt, cipher->salt_len, hash, cipher->hash_len, PBKDF2_ITERATIONS); + fpm_pkcs5_pbkdf2((guchar *)password, strlen(password), new_salt, cipher->salt_len, hash, cipher->hash_len, PBKDF2_ITERATIONS); } else { - prehash = (guchar *) g_strdup_printf("%s%s", new_salt, password); - hash = md5(prehash, strlen((gchar *) prehash)); + prehash = g_strdup_printf("%s%s", new_salt, password); + md5(prehash, hash); } fpm_setkey(new_context, hash, cipher->hash_len); @@ -415,3 +414,13 @@ list = g_list_next(list); } } + +void md5(gchar *prehash, guint8 *hash) { + GChecksum *checksum; + gsize size = cipher->hash_len; + + checksum = g_checksum_new(G_CHECKSUM_MD5); + g_checksum_update(checksum, (guchar *)prehash, strlen(prehash)); + g_checksum_get_digest(checksum, hash, &size); + g_checksum_free(checksum); +} diff -Nru fpm2-0.76.1/src/fpm_crypt.h fpm2-0.78/src/fpm_crypt.h --- fpm2-0.76.1/src/fpm_crypt.h 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm_crypt.h 2010-03-02 10:33:08.000000000 +0200 @@ -24,7 +24,7 @@ #define PBKDF2_ITERATIONS 8192 #define SHA256_DIGEST_LENGTH 32 -void fpm_crypt_init(gchar* password); +void fpm_crypt_init(gchar *password); int (*fpm_setkey) (void *c, const byte *key, unsigned keylen ); @@ -53,3 +53,16 @@ void fpm_decrypt_all(void); void fpm_cipher_init(char *cipher); + +void fpm_crypt_set_password(gchar *password); + +void fpm_decrypt_launchers(); + +void md5(gchar *prehash, guint8 *hash); + +void fpm_sha256_fpm_data(gchar *digest); + +gint fpm_sha256_file(gchar *filename, guchar *digest); + +gint fpm_pkcs5_pbkdf2(guchar *pass, gsize pass_len, const gchar *salt, gsize salt_len, guint8 *key, gsize key_len, guint rounds); + diff -Nru fpm2-0.76.1/src/fpm_file.c fpm2-0.78/src/fpm_file.c --- fpm2-0.76.1/src/fpm_file.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm_file.c 2010-03-02 09:40:12.000000000 +0200 @@ -1,6 +1,6 @@ /* FIGARO'S PASSWORD MANAGER 2 (FPM2) * Copyright (C) 2000 John Conneely - * Copyright (C) 2009 Aleš Koval + * Copyright (C) 2009,2010 Aleš Koval * * FPM is open source / free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -132,8 +132,8 @@ GList * list; gint i; gchar *dia_str; - gchar* vstring_cipher; - gchar* vstring_plain; + gchar *vstring_cipher = ""; + gchar *vstring_plain = ""; if (ini->create_backup) move_backup(file_name); @@ -161,7 +161,7 @@ } else if(cipher_algo == AES256) { vstring_cipher = g_malloc0(cipher->hash_len * 2 + 1); vstring_plain = g_malloc0(cipher->hash_len + 1); - sha256_fpm_data(vstring_plain); + fpm_sha256_fpm_data(vstring_plain); fpm_encrypt_field(new_context, vstring_cipher, vstring_plain, cipher->hash_len); } xmlSetProp(item, (xmlChar *)"vstring", (xmlChar *)vstring_cipher); @@ -174,7 +174,7 @@ while (list!=NULL) { launcher=list->data; - item=xmlNewChild(nodelist, NULL, (xmlChar *)"LauncerItem", NULL); + item=xmlNewChild(nodelist, NULL, (xmlChar *)"LauncherItem", NULL); if(cipher_algo == BLOWFISH) { new_leaf(doc, item, (xmlChar *)"title", (xmlChar *)launcher->title); new_leaf(doc, item, (xmlChar *)"cmdline", (xmlChar *)launcher->cmdline); @@ -184,13 +184,13 @@ tmp=g_strdup_printf("%d", launcher->copy_password); new_leaf(doc, item, (xmlChar *)"copy_password", (xmlChar *)tmp); } else { - new_leaf_encrypt(doc, item, (xmlChar *)"title", (xmlChar *)launcher->title); - new_leaf_encrypt(doc, item, (xmlChar *)"cmdline", (xmlChar *)launcher->cmdline); + new_leaf_encrypt(doc, item, (xmlChar *)"title", launcher->title); + new_leaf_encrypt(doc, item, (xmlChar *)"cmdline", launcher->cmdline); tmp=g_strdup_printf("%d", launcher->copy_user); - new_leaf_encrypt(doc, item, (xmlChar *)"copy_user", (xmlChar *)tmp); + new_leaf_encrypt(doc, item, (xmlChar *)"copy_user", tmp); g_free(tmp); tmp=g_strdup_printf("%d", launcher->copy_password); - new_leaf_encrypt(doc, item, (xmlChar *)"copy_password", (xmlChar *)tmp); + new_leaf_encrypt(doc, item, (xmlChar *)"copy_password", tmp); } g_free(tmp); list = g_list_next(list); @@ -233,9 +233,10 @@ fpm_statusbar_push(dia_str); // printf("Saved %d password(s).\n", i); - state->dirty = FALSE; +// state->dirty = FALSE; xmlFreeDoc(doc); xmlCleanupParser(); + fpm_dirty(FALSE); } void @@ -275,7 +276,7 @@ { launcher = list->data; if((export_launchers == 2) || ((export_launchers == 1) && fpm_is_launcher_in_category(launcher, export_category))) { - item = xmlNewChild(nodelist, NULL, (xmlChar *)"LauncerItem", NULL); + item = xmlNewChild(nodelist, NULL, (xmlChar *)"LauncherItem", NULL); new_leaf(doc, item, (xmlChar *)"title", (xmlChar *)launcher->title); new_leaf(doc, item, (xmlChar *)"cmdline", (xmlChar *)launcher->cmdline); tmp = g_strdup_printf("%d", launcher->copy_user); @@ -356,7 +357,8 @@ old_salt=get_new_salt(cipher->salt_len); new_salt=old_salt; glb_pass_list=NULL; - state->dirty=TRUE; +// state->dirty=TRUE; + fpm_dirty(TRUE); fpm_init_launchers(); return(-1); } @@ -536,10 +538,10 @@ // fpm_statusbar_push(dia_str); // g_free(dia_str); - state->dirty = FALSE; +// state->dirty = FALSE; + fpm_dirty(FALSE); return(0); - } static void new_leaf_encrypt_password @@ -709,10 +711,10 @@ if(!strcmp((char *)attr->name, "password")) { gchar *xmlplain; - - xmlplain = xmlNodeListGetString(doc, attr->xmlChildrenNode, 1); - if( xmlplain != NULL) { - strncpy(plaintext, xmlNodeListGetString(doc, attr->xmlChildrenNode, 1) , FPM_PASSWORD_LEN); + + xmlplain = (gchar *)xmlNodeListGetString(doc, attr->xmlChildrenNode, 1); + if(xmlplain != NULL) { + strncpy(plaintext, xmlplain , FPM_PASSWORD_LEN); } else { strcpy(plaintext,""); } @@ -733,7 +735,8 @@ xmlCleanupParser(); /* free(file_version); */ - state->dirty = TRUE; +// state->dirty = TRUE; + fpm_dirty(TRUE); *message = g_strdup_printf(_("Imported %d password(s)."), i); diff -Nru fpm2-0.76.1/src/fpm_gpw.c fpm2-0.78/src/fpm_gpw.c --- fpm2-0.76.1/src/fpm_gpw.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm_gpw.c 2010-02-24 08:12:33.000000000 +0200 @@ -70,16 +70,16 @@ gpw_no_amb=no_amb; strncpy(gpw_chars, "", GPW_CHAR_BUFFER); - if (gpw_use_lcase) strncat(gpw_chars, chars_lcase1, GPW_CHAR_BUFFER); - if (gpw_use_ucase) strncat(gpw_chars, chars_ucase1, GPW_CHAR_BUFFER); - if (gpw_use_num) strncat(gpw_chars, chars_num1, GPW_CHAR_BUFFER); - if (gpw_use_sym) strncat(gpw_chars, chars_sym1, GPW_CHAR_BUFFER); + if (gpw_use_lcase) strncat(gpw_chars, chars_lcase1, GPW_CHAR_BUFFER-1); + if (gpw_use_ucase) strncat(gpw_chars, chars_ucase1, GPW_CHAR_BUFFER-1); + if (gpw_use_num) strncat(gpw_chars, chars_num1, GPW_CHAR_BUFFER-1); + if (gpw_use_sym) strncat(gpw_chars, chars_sym1, GPW_CHAR_BUFFER-1); if (!no_amb) { - if (gpw_use_lcase) strncat(gpw_chars, chars_lcase2, GPW_CHAR_BUFFER); - if (gpw_use_ucase) strncat(gpw_chars, chars_ucase2, GPW_CHAR_BUFFER); - if (gpw_use_num) strncat(gpw_chars, chars_num2, GPW_CHAR_BUFFER); - if (gpw_use_sym) strncat(gpw_chars, chars_sym2, GPW_CHAR_BUFFER); + if (gpw_use_lcase) strncat(gpw_chars, chars_lcase2, GPW_CHAR_BUFFER-1); + if (gpw_use_ucase) strncat(gpw_chars, chars_ucase2, GPW_CHAR_BUFFER-1); + if (gpw_use_num) strncat(gpw_chars, chars_num2, GPW_CHAR_BUFFER-1); + if (gpw_use_sym) strncat(gpw_chars, chars_sym2, GPW_CHAR_BUFFER-1); } gpw_num_chars = strlen(gpw_chars); diff -Nru fpm2-0.76.1/src/fpm.h fpm2-0.78/src/fpm.h --- fpm2-0.76.1/src/fpm.h 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm.h 2010-03-02 10:20:57.000000000 +0200 @@ -1,6 +1,6 @@ /* FIGARO'S PASSWORD MANAGER 2 (FPM2) * Copyright (C) 2000 John Conneely - * Copyright (C) 2008,2009 Aleš Koval + * Copyright (C) 2008-2010 Aleš Koval * * FPM is open source / free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -32,11 +32,22 @@ #include /* CONSTANTS */ -#define FPM_NUM_COL 3 /* Number of columns in main CList */ -#define FPM_COL_TITLE 0 -#define FPM_COL_URL 1 -#define FPM_COL_USER 2 -#define FPM_COL_DATA_POINTER 3 +#define FPM_NUM_COLS 8 /* Number of all available columns */ +#define FPM_DATA_POINTER 0 +#define FPM_TITLE 1 +#define FPM_URL 2 +#define FPM_USER 3 +#define FPM_PASSWORD 4 +#define FPM_CATEGORY 5 +#define FPM_NOTES 6 +#define FPM_LAUNCHER 7 + +enum { ACTION_RUN_LAUNCHER, + ACTION_COPY_USERNAME, + ACTION_COPY_PASSWORD, + ACTION_COPY_BOTH, + ACTION_EDIT_ENTRY +}; #define FPM_MAX_DOUBLE_CLICK_TIME 0.8 /* In seconds */ @@ -85,6 +96,9 @@ gint copy_password; } fpm_launcher; +extern gchar *columns_title[FPM_NUM_COLS]; +extern GList *columns_order; + typedef struct fpm_ini_struct { gboolean save_on_quit; @@ -98,7 +112,7 @@ gint main_y; gint main_width; gint main_height; - gint columns_width[3]; + gint columns_width[FPM_NUM_COLS]; gboolean search_match_case; gboolean search_in_title; gboolean search_in_url; @@ -118,6 +132,9 @@ gint copy_target; gboolean clear_target; gboolean after_unhide_set_startup_category; + gboolean dont_remember_position; + gint dblclick_action; + gboolean startup_search; } fpm_ini; typedef struct fpm_state_struct @@ -228,12 +245,6 @@ void fpm_init(char* opt_file_name, int tray_on_startup); -/*void -fpm_select(gchar* text, gboolean use_clipboard); - -void -fpm_select_password(fpm_data* data, gboolean use_clipboard); -*/ void fpm_double_click(fpm_data* data); @@ -274,7 +285,7 @@ void fpm_debug(gchar* msg); -void lock_fpm_file1(gchar* glb_filename); +void lock_fpm_file(gchar* glb_filename); void unlock_fpm_file1(void); @@ -313,3 +324,40 @@ gboolean fpm_valid_edit_data(); gboolean fpm_is_launcher_in_category(fpm_launcher *launcher, gchar *category); + +void on_clist_main_columns_changed (GtkTreeView *treeview, + gpointer user_data); + +void fpm_view_modify_column(gint type, gboolean active); + +void fpm_clist_set_data(fpm_data *data, GtkTreeModel *list_store, GtkTreeIter iter); + +void fpm_middle_dblclick(fpm_data *data); + +void fpm_clipboard_init(fpm_data *data, gint selection, gboolean is_password, gboolean multi_select); + +void fpm_populate_combo_box(GtkComboBox *combo_box, gchar *active_item); + +void fpm_copy_target_combo(GtkComboBox *combo_box, gint selection); + +void fpm_unlock(); + +void fpm_switch_view_category(gchar *category); + +void fpm_launcher_add(); + +void fpm_launcher_remove(fpm_launcher *launcher); + +void fpm_launcher_remove_all(); + +void fpm_launcher_show(fpm_launcher *launcher); + +void fpm_launcher_populate_combo_box(gint launcher_idx); + +gboolean fpm_launcher_search(gchar *title); + +void unlock_fpm_file(void); + +void fpm_dirty(gboolean active); + +void fpm_sensitive_menu(gboolean active); diff -Nru fpm2-0.76.1/src/fpm_launcher.c fpm2-0.78/src/fpm_launcher.c --- fpm2-0.76.1/src/fpm_launcher.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/fpm_launcher.c 2010-03-02 08:52:54.000000000 +0200 @@ -35,7 +35,6 @@ void fpm_launcher_delete_from_items(fpm_launcher *launcher); void fpm_launcher_init() { - GtkWidget* widget; gtk_widget_set_sensitive(gui->main_window, FALSE); glb_win_misc = create_dialog_launcher(); @@ -108,7 +107,8 @@ gtk_widget_set_sensitive(lookup_widget(glb_win_misc, "hbox_radio_user"), TRUE); gtk_widget_set_sensitive(lookup_widget(glb_win_misc, "hbox_radio_pass"), TRUE); - state->dirty = TRUE; +// state->dirty = TRUE; + fpm_dirty(TRUE); } void fpm_launcher_remove(fpm_launcher *launcher) { @@ -134,7 +134,8 @@ } else { fpm_launcher_populate_combo_box(launcher_idx - 1); } - state->dirty = TRUE; +// state->dirty = TRUE; + fpm_dirty(TRUE); } /* After remove launcher, delete it from all password items */ @@ -199,7 +200,6 @@ void fpm_launcher_remove_all() { GList *list; - fpm_launcher *data; list = g_list_first(glb_launcher_list); while(list != NULL) { diff -Nru fpm2-0.76.1/src/gpg_trans.h fpm2-0.78/src/gpg_trans.h --- fpm2-0.76.1/src/gpg_trans.h 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/gpg_trans.h 2010-03-02 12:24:59.000000000 +0200 @@ -27,7 +27,7 @@ typedef guint32 u32; /* GPG used complex method to ensure 32 bit unsigned int. * Since this is a gnome app, we can take use guint32! */ -typedef unsigned char byte; +typedef guchar byte; /* From errors.h: */ #define G10ERR_SELFTEST_FAILED 50 @@ -54,5 +54,3 @@ void (**decryptf)(void *c, byte *outbuf, const byte *inbuf) ); -byte* md5(byte *buf, size_t nbytes); -byte* sha256(byte *buf, size_t nbytes); diff -Nru fpm2-0.76.1/src/interface.c fpm2-0.78/src/interface.c --- fpm2-0.76.1/src/interface.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/interface.c 2010-03-02 08:52:54.000000000 +0200 @@ -41,46 +41,55 @@ GtkWidget *save_as1; GtkWidget *odd__lova__5; GtkWidget *import_passwords1; - GtkWidget *image805; + GtkWidget *image973; GtkWidget *export1; - GtkWidget *image806; + GtkWidget *image974; GtkWidget *separatormenuitem1; GtkWidget *hide_to_tray; - GtkWidget *image807; + GtkWidget *image975; GtkWidget *exit1; GtkWidget *edit1; GtkWidget *edit1_menu; GtkWidget *copy_pass; - GtkWidget *image808; + GtkWidget *image976; GtkWidget *copy_user; - GtkWidget *image809; + GtkWidget *image977; GtkWidget *copy_both1; - GtkWidget *image810; + GtkWidget *image978; GtkWidget *odd__lova__1; GtkWidget *add_item1; - GtkWidget *image811; + GtkWidget *image979; GtkWidget *edit_item1; - GtkWidget *image812; + GtkWidget *image980; GtkWidget *clone_item1; - GtkWidget *image813; + GtkWidget *image981; GtkWidget *item_delete; - GtkWidget *image814; + GtkWidget *image982; GtkWidget *odd__lova__8; GtkWidget *find; + GtkWidget *view1; + GtkWidget *view1_menu; + GtkWidget *title1; + GtkWidget *url1; + GtkWidget *user1; + GtkWidget *password1; + GtkWidget *category1; + GtkWidget *notes1; + GtkWidget *launcher1; + GtkWidget *odd__lova__10; + GtkWidget *toolbar2; GtkWidget *settings1; GtkWidget *settings1_menu; GtkWidget *launcher_menu; - GtkWidget *image815; + GtkWidget *image983; GtkWidget *item_password; - GtkWidget *image816; - GtkWidget *odd__lova__7; - GtkWidget *toolbar2; - GtkWidget *odd__lova__6; + GtkWidget *image984; + GtkWidget *odd__lova__11; GtkWidget *preferences2; GtkWidget *help1; GtkWidget *help1_menu; GtkWidget *current_password_file1; - GtkWidget *image817; + GtkWidget *image985; GtkWidget *odd__lova__9; GtkWidget *about1; GtkWidget *toolbar1; @@ -153,6 +162,7 @@ save1 = gtk_image_menu_item_new_from_stock ("gtk-save", accel_group); gtk_widget_show (save1); gtk_container_add (GTK_CONTAINER (file1_menu), save1); + gtk_widget_set_sensitive (save1, FALSE); save_as1 = gtk_image_menu_item_new_from_stock ("gtk-save-as", accel_group); gtk_widget_show (save_as1); @@ -167,17 +177,17 @@ gtk_widget_show (import_passwords1); gtk_container_add (GTK_CONTAINER (file1_menu), import_passwords1); - image805 = gtk_image_new_from_stock ("gtk-convert", GTK_ICON_SIZE_MENU); - gtk_widget_show (image805); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_passwords1), image805); + image973 = gtk_image_new_from_stock ("gtk-convert", GTK_ICON_SIZE_MENU); + gtk_widget_show (image973); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (import_passwords1), image973); export1 = gtk_image_menu_item_new_with_mnemonic (_("_Export Passwords")); gtk_widget_show (export1); gtk_container_add (GTK_CONTAINER (file1_menu), export1); - image806 = gtk_image_new_from_stock ("gtk-harddisk", GTK_ICON_SIZE_MENU); - gtk_widget_show (image806); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (export1), image806); + image974 = gtk_image_new_from_stock ("gtk-harddisk", GTK_ICON_SIZE_MENU); + gtk_widget_show (image974); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (export1), image974); separatormenuitem1 = gtk_separator_menu_item_new (); gtk_widget_show (separatormenuitem1); @@ -191,9 +201,9 @@ GDK_w, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image807 = gtk_image_new_from_stock ("gtk-leave-fullscreen", GTK_ICON_SIZE_MENU); - gtk_widget_show (image807); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_to_tray), image807); + image975 = gtk_image_new_from_stock ("gtk-leave-fullscreen", GTK_ICON_SIZE_MENU); + gtk_widget_show (image975); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (hide_to_tray), image975); exit1 = gtk_image_menu_item_new_from_stock ("gtk-quit", accel_group); gtk_widget_show (exit1); @@ -209,35 +219,38 @@ copy_pass = gtk_image_menu_item_new_with_mnemonic (_("Copy _Password")); gtk_widget_show (copy_pass); gtk_container_add (GTK_CONTAINER (edit1_menu), copy_pass); + gtk_widget_set_sensitive (copy_pass, FALSE); gtk_widget_add_accelerator (copy_pass, "activate", accel_group, GDK_p, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image808 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image808); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_pass), image808); + image976 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image976); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_pass), image976); copy_user = gtk_image_menu_item_new_with_mnemonic (_("Copy _Username")); gtk_widget_show (copy_user); gtk_container_add (GTK_CONTAINER (edit1_menu), copy_user); + gtk_widget_set_sensitive (copy_user, FALSE); gtk_widget_add_accelerator (copy_user, "activate", accel_group, GDK_u, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image809 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image809); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_user), image809); + image977 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image977); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_user), image977); copy_both1 = gtk_image_menu_item_new_with_mnemonic (_("Copy _Both")); gtk_widget_show (copy_both1); gtk_container_add (GTK_CONTAINER (edit1_menu), copy_both1); + gtk_widget_set_sensitive (copy_both1, FALSE); gtk_widget_add_accelerator (copy_both1, "activate", accel_group, GDK_b, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image810 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image810); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_both1), image810); + image978 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image978); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (copy_both1), image978); odd__lova__1 = gtk_separator_menu_item_new (); gtk_widget_show (odd__lova__1); @@ -251,42 +264,45 @@ GDK_a, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image811 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); - gtk_widget_show (image811); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_item1), image811); + image979 = gtk_image_new_from_stock ("gtk-new", GTK_ICON_SIZE_MENU); + gtk_widget_show (image979); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (add_item1), image979); edit_item1 = gtk_image_menu_item_new_with_mnemonic (_("_Edit Item")); gtk_widget_show (edit_item1); gtk_container_add (GTK_CONTAINER (edit1_menu), edit_item1); + gtk_widget_set_sensitive (edit_item1, FALSE); gtk_widget_add_accelerator (edit_item1, "activate", accel_group, GDK_e, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image812 = gtk_image_new_from_stock ("gtk-edit", GTK_ICON_SIZE_MENU); - gtk_widget_show (image812); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (edit_item1), image812); + image980 = gtk_image_new_from_stock ("gtk-edit", GTK_ICON_SIZE_MENU); + gtk_widget_show (image980); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (edit_item1), image980); clone_item1 = gtk_image_menu_item_new_with_mnemonic (_("_Clone Item")); gtk_widget_show (clone_item1); gtk_container_add (GTK_CONTAINER (edit1_menu), clone_item1); + gtk_widget_set_sensitive (clone_item1, FALSE); gtk_widget_add_accelerator (clone_item1, "activate", accel_group, GDK_c, (GdkModifierType) GDK_CONTROL_MASK, GTK_ACCEL_VISIBLE); - image813 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); - gtk_widget_show (image813); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clone_item1), image813); + image981 = gtk_image_new_from_stock ("gtk-copy", GTK_ICON_SIZE_MENU); + gtk_widget_show (image981); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (clone_item1), image981); item_delete = gtk_image_menu_item_new_with_mnemonic (_("_Delete Item")); gtk_widget_show (item_delete); gtk_container_add (GTK_CONTAINER (edit1_menu), item_delete); + gtk_widget_set_sensitive (item_delete, FALSE); gtk_widget_add_accelerator (item_delete, "activate", accel_group, GDK_Delete, (GdkModifierType) 0, GTK_ACCEL_VISIBLE); - image814 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU); - gtk_widget_show (image814); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_delete), image814); + image982 = gtk_image_new_from_stock ("gtk-delete", GTK_ICON_SIZE_MENU); + gtk_widget_show (image982); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_delete), image982); odd__lova__8 = gtk_separator_menu_item_new (); gtk_widget_show (odd__lova__8); @@ -297,6 +313,51 @@ gtk_widget_show (find); gtk_container_add (GTK_CONTAINER (edit1_menu), find); + view1 = gtk_menu_item_new_with_mnemonic (_("_View")); + gtk_widget_show (view1); + gtk_container_add (GTK_CONTAINER (menubar1), view1); + + view1_menu = gtk_menu_new (); + gtk_menu_item_set_submenu (GTK_MENU_ITEM (view1), view1_menu); + + title1 = gtk_check_menu_item_new_with_mnemonic (_("_Title")); + gtk_widget_show (title1); + gtk_container_add (GTK_CONTAINER (view1_menu), title1); + + url1 = gtk_check_menu_item_new_with_mnemonic (_("U_RL")); + gtk_widget_show (url1); + gtk_container_add (GTK_CONTAINER (view1_menu), url1); + + user1 = gtk_check_menu_item_new_with_mnemonic (_("_User")); + gtk_widget_show (user1); + gtk_container_add (GTK_CONTAINER (view1_menu), user1); + + password1 = gtk_check_menu_item_new_with_mnemonic (_("_Password")); + gtk_widget_show (password1); + gtk_container_add (GTK_CONTAINER (view1_menu), password1); + + category1 = gtk_check_menu_item_new_with_mnemonic (_("_Category")); + gtk_widget_show (category1); + gtk_container_add (GTK_CONTAINER (view1_menu), category1); + + notes1 = gtk_check_menu_item_new_with_mnemonic (_("_Notes")); + gtk_widget_show (notes1); + gtk_container_add (GTK_CONTAINER (view1_menu), notes1); + + launcher1 = gtk_check_menu_item_new_with_mnemonic (_("_Launcher")); + gtk_widget_show (launcher1); + gtk_container_add (GTK_CONTAINER (view1_menu), launcher1); + + odd__lova__10 = gtk_separator_menu_item_new (); + gtk_widget_show (odd__lova__10); + gtk_container_add (GTK_CONTAINER (view1_menu), odd__lova__10); + gtk_widget_set_sensitive (odd__lova__10, FALSE); + + toolbar2 = gtk_check_menu_item_new_with_mnemonic (_("Tool_bar")); + gtk_widget_show (toolbar2); + gtk_container_add (GTK_CONTAINER (view1_menu), toolbar2); + gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolbar2), TRUE); + settings1 = gtk_menu_item_new_with_mnemonic (_("_Settings")); gtk_widget_show (settings1); gtk_container_add (GTK_CONTAINER (menubar1), settings1); @@ -308,32 +369,22 @@ gtk_widget_show (launcher_menu); gtk_container_add (GTK_CONTAINER (settings1_menu), launcher_menu); - image815 = gtk_image_new_from_stock ("gtk-execute", GTK_ICON_SIZE_MENU); - gtk_widget_show (image815); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (launcher_menu), image815); + image983 = gtk_image_new_from_stock ("gtk-execute", GTK_ICON_SIZE_MENU); + gtk_widget_show (image983); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (launcher_menu), image983); item_password = gtk_image_menu_item_new_with_mnemonic (_("Change _Password")); gtk_widget_show (item_password); gtk_container_add (GTK_CONTAINER (settings1_menu), item_password); - image816 = gtk_image_new_from_stock ("gtk-dialog-authentication", GTK_ICON_SIZE_MENU); - gtk_widget_show (image816); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_password), image816); - - odd__lova__7 = gtk_separator_menu_item_new (); - gtk_widget_show (odd__lova__7); - gtk_container_add (GTK_CONTAINER (settings1_menu), odd__lova__7); - gtk_widget_set_sensitive (odd__lova__7, FALSE); - - toolbar2 = gtk_check_menu_item_new_with_mnemonic (_("_Toolbar")); - gtk_widget_show (toolbar2); - gtk_container_add (GTK_CONTAINER (settings1_menu), toolbar2); - gtk_check_menu_item_set_active (GTK_CHECK_MENU_ITEM (toolbar2), TRUE); - - odd__lova__6 = gtk_separator_menu_item_new (); - gtk_widget_show (odd__lova__6); - gtk_container_add (GTK_CONTAINER (settings1_menu), odd__lova__6); - gtk_widget_set_sensitive (odd__lova__6, FALSE); + image984 = gtk_image_new_from_stock ("gtk-dialog-authentication", GTK_ICON_SIZE_MENU); + gtk_widget_show (image984); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (item_password), image984); + + odd__lova__11 = gtk_separator_menu_item_new (); + gtk_widget_show (odd__lova__11); + gtk_container_add (GTK_CONTAINER (settings1_menu), odd__lova__11); + gtk_widget_set_sensitive (odd__lova__11, FALSE); preferences2 = gtk_image_menu_item_new_from_stock ("gtk-preferences", accel_group); gtk_widget_show (preferences2); @@ -350,9 +401,9 @@ gtk_widget_show (current_password_file1); gtk_container_add (GTK_CONTAINER (help1_menu), current_password_file1); - image817 = gtk_image_new_from_stock ("gtk-info", GTK_ICON_SIZE_MENU); - gtk_widget_show (image817); - gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (current_password_file1), image817); + image985 = gtk_image_new_from_stock ("gtk-info", GTK_ICON_SIZE_MENU); + gtk_widget_show (image985); + gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (current_password_file1), image985); odd__lova__9 = gtk_separator_menu_item_new (); gtk_widget_show (odd__lova__9); @@ -372,6 +423,7 @@ button_save = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-save"); gtk_widget_show (button_save); gtk_container_add (GTK_CONTAINER (toolbar1), button_save); + gtk_widget_set_sensitive (button_save, FALSE); gtk_tool_item_set_tooltip (GTK_TOOL_ITEM (button_save), tooltips, _("Save password list"), NULL); separatortoolitem1 = (GtkWidget*) gtk_separator_tool_item_new (); @@ -387,6 +439,7 @@ button_edit = (GtkWidget*) gtk_tool_button_new_from_stock ("gtk-edit"); gtk_widget_show (button_edit); gtk_container_add (GTK_CONTAINER (toolbar1), button_edit); + gtk_widget_set_sensitive (button_edit, FALSE); separatortoolitem2 = (GtkWidget*) gtk_separator_tool_item_new (); gtk_widget_show (separatortoolitem2); @@ -397,18 +450,21 @@ button_jump = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Jump")); gtk_widget_show (button_jump); gtk_container_add (GTK_CONTAINER (toolbar1), button_jump); + gtk_widget_set_sensitive (button_jump, FALSE); tmp_image = gtk_image_new_from_stock ("gtk-copy", tmp_toolbar_icon_size); gtk_widget_show (tmp_image); button_user = (GtkWidget*) gtk_tool_button_new (tmp_image, _("User")); gtk_widget_show (button_user); gtk_container_add (GTK_CONTAINER (toolbar1), button_user); + gtk_widget_set_sensitive (button_user, FALSE); tmp_image = gtk_image_new_from_stock ("gtk-copy", tmp_toolbar_icon_size); gtk_widget_show (tmp_image); button_pass = (GtkWidget*) gtk_tool_button_new (tmp_image, _("Pass")); gtk_widget_show (button_pass); gtk_container_add (GTK_CONTAINER (toolbar1), button_pass); + gtk_widget_set_sensitive (button_pass, FALSE); toolitem1 = (GtkWidget*) gtk_tool_item_new (); gtk_widget_show (toolitem1); @@ -543,15 +599,36 @@ g_signal_connect ((gpointer) find, "activate", G_CALLBACK (on_find_activate), NULL); + g_signal_connect ((gpointer) title1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) url1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) user1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) password1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) category1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) notes1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) launcher1, "activate", + G_CALLBACK (on_view_menu_activate), + NULL); + g_signal_connect ((gpointer) toolbar2, "activate", + G_CALLBACK (on_toolbar2_activate), + NULL); g_signal_connect ((gpointer) launcher_menu, "activate", G_CALLBACK (on_launcher_menu_activate), NULL); g_signal_connect ((gpointer) item_password, "activate", G_CALLBACK (on_item_password_activate), NULL); - g_signal_connect ((gpointer) toolbar2, "activate", - G_CALLBACK (on_toolbar2_activate), - NULL); g_signal_connect ((gpointer) preferences2, "activate", G_CALLBACK (on_preferences2_activate), NULL); @@ -597,6 +674,9 @@ g_signal_connect ((gpointer) clist_main, "row_activated", G_CALLBACK (on_clist_main_row_activated), NULL); + g_signal_connect ((gpointer) clist_main, "columns_changed", + G_CALLBACK (on_clist_main_columns_changed), + NULL); g_signal_connect ((gpointer) find_close, "clicked", G_CALLBACK (on_find_close_clicked), NULL); @@ -625,46 +705,55 @@ GLADE_HOOKUP_OBJECT (app_safe, save_as1, "save_as1"); GLADE_HOOKUP_OBJECT (app_safe, odd__lova__5, "odd__lova__5"); GLADE_HOOKUP_OBJECT (app_safe, import_passwords1, "import_passwords1"); - GLADE_HOOKUP_OBJECT (app_safe, image805, "image805"); + GLADE_HOOKUP_OBJECT (app_safe, image973, "image973"); GLADE_HOOKUP_OBJECT (app_safe, export1, "export1"); - GLADE_HOOKUP_OBJECT (app_safe, image806, "image806"); + GLADE_HOOKUP_OBJECT (app_safe, image974, "image974"); GLADE_HOOKUP_OBJECT (app_safe, separatormenuitem1, "separatormenuitem1"); GLADE_HOOKUP_OBJECT (app_safe, hide_to_tray, "hide_to_tray"); - GLADE_HOOKUP_OBJECT (app_safe, image807, "image807"); + GLADE_HOOKUP_OBJECT (app_safe, image975, "image975"); GLADE_HOOKUP_OBJECT (app_safe, exit1, "exit1"); GLADE_HOOKUP_OBJECT (app_safe, edit1, "edit1"); GLADE_HOOKUP_OBJECT (app_safe, edit1_menu, "edit1_menu"); GLADE_HOOKUP_OBJECT (app_safe, copy_pass, "copy_pass"); - GLADE_HOOKUP_OBJECT (app_safe, image808, "image808"); + GLADE_HOOKUP_OBJECT (app_safe, image976, "image976"); GLADE_HOOKUP_OBJECT (app_safe, copy_user, "copy_user"); - GLADE_HOOKUP_OBJECT (app_safe, image809, "image809"); + GLADE_HOOKUP_OBJECT (app_safe, image977, "image977"); GLADE_HOOKUP_OBJECT (app_safe, copy_both1, "copy_both1"); - GLADE_HOOKUP_OBJECT (app_safe, image810, "image810"); + GLADE_HOOKUP_OBJECT (app_safe, image978, "image978"); GLADE_HOOKUP_OBJECT (app_safe, odd__lova__1, "odd__lova__1"); GLADE_HOOKUP_OBJECT (app_safe, add_item1, "add_item1"); - GLADE_HOOKUP_OBJECT (app_safe, image811, "image811"); + GLADE_HOOKUP_OBJECT (app_safe, image979, "image979"); GLADE_HOOKUP_OBJECT (app_safe, edit_item1, "edit_item1"); - GLADE_HOOKUP_OBJECT (app_safe, image812, "image812"); + GLADE_HOOKUP_OBJECT (app_safe, image980, "image980"); GLADE_HOOKUP_OBJECT (app_safe, clone_item1, "clone_item1"); - GLADE_HOOKUP_OBJECT (app_safe, image813, "image813"); + GLADE_HOOKUP_OBJECT (app_safe, image981, "image981"); GLADE_HOOKUP_OBJECT (app_safe, item_delete, "item_delete"); - GLADE_HOOKUP_OBJECT (app_safe, image814, "image814"); + GLADE_HOOKUP_OBJECT (app_safe, image982, "image982"); GLADE_HOOKUP_OBJECT (app_safe, odd__lova__8, "odd__lova__8"); GLADE_HOOKUP_OBJECT (app_safe, find, "find"); + GLADE_HOOKUP_OBJECT (app_safe, view1, "view1"); + GLADE_HOOKUP_OBJECT (app_safe, view1_menu, "view1_menu"); + GLADE_HOOKUP_OBJECT (app_safe, title1, "title1"); + GLADE_HOOKUP_OBJECT (app_safe, url1, "url1"); + GLADE_HOOKUP_OBJECT (app_safe, user1, "user1"); + GLADE_HOOKUP_OBJECT (app_safe, password1, "password1"); + GLADE_HOOKUP_OBJECT (app_safe, category1, "category1"); + GLADE_HOOKUP_OBJECT (app_safe, notes1, "notes1"); + GLADE_HOOKUP_OBJECT (app_safe, launcher1, "launcher1"); + GLADE_HOOKUP_OBJECT (app_safe, odd__lova__10, "odd__lova__10"); + GLADE_HOOKUP_OBJECT (app_safe, toolbar2, "toolbar2"); GLADE_HOOKUP_OBJECT (app_safe, settings1, "settings1"); GLADE_HOOKUP_OBJECT (app_safe, settings1_menu, "settings1_menu"); GLADE_HOOKUP_OBJECT (app_safe, launcher_menu, "launcher_menu"); - GLADE_HOOKUP_OBJECT (app_safe, image815, "image815"); + GLADE_HOOKUP_OBJECT (app_safe, image983, "image983"); GLADE_HOOKUP_OBJECT (app_safe, item_password, "item_password"); - GLADE_HOOKUP_OBJECT (app_safe, image816, "image816"); - GLADE_HOOKUP_OBJECT (app_safe, odd__lova__7, "odd__lova__7"); - GLADE_HOOKUP_OBJECT (app_safe, toolbar2, "toolbar2"); - GLADE_HOOKUP_OBJECT (app_safe, odd__lova__6, "odd__lova__6"); + GLADE_HOOKUP_OBJECT (app_safe, image984, "image984"); + GLADE_HOOKUP_OBJECT (app_safe, odd__lova__11, "odd__lova__11"); GLADE_HOOKUP_OBJECT (app_safe, preferences2, "preferences2"); GLADE_HOOKUP_OBJECT (app_safe, help1, "help1"); GLADE_HOOKUP_OBJECT (app_safe, help1_menu, "help1_menu"); GLADE_HOOKUP_OBJECT (app_safe, current_password_file1, "current_password_file1"); - GLADE_HOOKUP_OBJECT (app_safe, image817, "image817"); + GLADE_HOOKUP_OBJECT (app_safe, image985, "image985"); GLADE_HOOKUP_OBJECT (app_safe, odd__lova__9, "odd__lova__9"); GLADE_HOOKUP_OBJECT (app_safe, about1, "about1"); GLADE_HOOKUP_OBJECT (app_safe, toolbar1, "toolbar1"); @@ -1948,14 +2037,14 @@ NULL }; /* TRANSLATORS: Replace this string with your names, one name per line. */ - gchar *translators = "Basque - Ales Zabala Alava (Shagi)\nBulgarian - Yovko Yovkov\nCzech - Ale\305\241 Koval\nFrench - Christoph J. Thompson\nGerman - Mike Constabel\nHungarian - Peter Polonkai\nSpanish - Antonio Rguez. Capita"; + gchar *translators = "Basque - Ales Zabala Alava (Shagi)\nBulgarian - Yovko Yovkov\nCzech - Ale\305\241 Koval\nFrench - Christoph J. Thompson\nGerman - Mike Constabel\nHungarian - Peter Polonkai\nItalian - Nicola Jelmorini\nSpanish - Antonio Rguez. Capita\nRussian - Boorkov Sergey aka Leo"; GdkPixbuf *dialog_about_logo_pixbuf; dialog_about = gtk_about_dialog_new (); gtk_container_set_border_width (GTK_CONTAINER (dialog_about), 5); gtk_about_dialog_set_version (GTK_ABOUT_DIALOG (dialog_about), VERSION); gtk_about_dialog_set_name (GTK_ABOUT_DIALOG (dialog_about), _("FPM2")); - gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (dialog_about), _("(c) 2000-2003 John Conneely & other contributors\n(c) 2008-2009 Ale\305\241 Koval")); + gtk_about_dialog_set_copyright (GTK_ABOUT_DIALOG (dialog_about), _("(c) 2000-2003 John Conneely & other contributors\n(c) 2008-2010 Ale\305\241 Koval")); gtk_about_dialog_set_comments (GTK_ABOUT_DIALOG (dialog_about), _("Figaro's Password Manager\nRewriten for GTK2.")); gtk_about_dialog_set_license (GTK_ABOUT_DIALOG (dialog_about), _("This application is licensed under the GNU General Public License Version 2 or (at your option) any later version.\n")); gtk_about_dialog_set_wrap_license (GTK_ABOUT_DIALOG (dialog_about), TRUE); @@ -1980,7 +2069,6 @@ create_dialog_preferences (void) { GtkWidget *dialog_preferences; - AtkObject *atko; GdkPixbuf *dialog_preferences_icon_pixbuf; GtkWidget *dialog_vbox9; GtkWidget *notebook1; @@ -2051,7 +2139,12 @@ GtkWidget *startup_category; GtkWidget *alignment9; GtkWidget *startup_category_combo; + GtkWidget *startup_search; GtkWidget *label57; + GtkWidget *frame19; + GtkWidget *alignment17; + GtkWidget *dblclick_action_combo; + GtkWidget *label75; GtkWidget *frame18; GtkWidget *alignment14; GtkWidget *vbox24; @@ -2376,11 +2469,40 @@ gtk_container_add (GTK_CONTAINER (alignment9), startup_category_combo); gtk_widget_set_sensitive (startup_category_combo, FALSE); - label57 = gtk_label_new (_("On startup")); + startup_search = gtk_check_button_new_with_mnemonic (_("Open _search dialog")); + gtk_widget_show (startup_search); + gtk_box_pack_start (GTK_BOX (vbox20), startup_search, FALSE, FALSE, 0); + + label57 = gtk_label_new (_("On Startup")); gtk_widget_show (label57); gtk_frame_set_label_widget (GTK_FRAME (frame15), label57); gtk_label_set_use_markup (GTK_LABEL (label57), TRUE); + frame19 = gtk_frame_new (NULL); + gtk_widget_show (frame19); + gtk_box_pack_start (GTK_BOX (vbox19), frame19, FALSE, FALSE, 0); + gtk_container_set_border_width (GTK_CONTAINER (frame19), 10); + gtk_frame_set_shadow_type (GTK_FRAME (frame19), GTK_SHADOW_NONE); + + alignment17 = gtk_alignment_new (0.5, 0.5, 1, 1); + gtk_widget_show (alignment17); + gtk_container_add (GTK_CONTAINER (frame19), alignment17); + gtk_alignment_set_padding (GTK_ALIGNMENT (alignment17), 3, 0, 12, 10); + + dblclick_action_combo = gtk_combo_box_new_text (); + gtk_widget_show (dblclick_action_combo); + gtk_container_add (GTK_CONTAINER (alignment17), dblclick_action_combo); + gtk_combo_box_append_text (GTK_COMBO_BOX (dblclick_action_combo), _("Call Launcher")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dblclick_action_combo), _("Copy Username")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dblclick_action_combo), _("Copy Password")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dblclick_action_combo), _("Copy Both")); + gtk_combo_box_append_text (GTK_COMBO_BOX (dblclick_action_combo), _("Open Edit Window")); + + label75 = gtk_label_new (_("When Activated Entry")); + gtk_widget_show (label75); + gtk_frame_set_label_widget (GTK_FRAME (frame19), label75); + gtk_label_set_use_markup (GTK_LABEL (label75), TRUE); + frame18 = gtk_frame_new (NULL); gtk_widget_show (frame18); gtk_box_pack_start (GTK_BOX (vbox19), frame18, FALSE, FALSE, 0); @@ -2409,7 +2531,7 @@ gtk_widget_show (clear_target); gtk_box_pack_start (GTK_BOX (vbox24), clear_target, FALSE, FALSE, 0); - label72 = gtk_label_new (_("Copy target")); + label72 = gtk_label_new (_("Copy Target")); gtk_widget_show (label72); gtk_frame_set_label_widget (GTK_FRAME (frame18), label72); gtk_label_set_use_markup (GTK_LABEL (label72), TRUE); @@ -2450,17 +2572,16 @@ g_signal_connect ((gpointer) startup_category_combo, "changed", G_CALLBACK (on_startup_category_combo_changed), NULL); + g_signal_connect ((gpointer) startup_search, "toggled", + G_CALLBACK (on_startup_search_toggled), + NULL); + g_signal_connect ((gpointer) dblclick_action_combo, "changed", + G_CALLBACK (on_dblclick_action_combo_changed), + NULL); g_signal_connect ((gpointer) copy_target_combo, "changed", G_CALLBACK (on_copy_target_combo_changed), NULL); - atko = gtk_widget_get_accessible (dialog_preferences); - atk_object_set_name (atko, _("_Preferences")); - - atko = gtk_widget_get_accessible (label46); - atk_object_set_name (atko, _("Search Conditions")); - - /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (dialog_preferences, dialog_preferences, "dialog_preferences"); GLADE_HOOKUP_OBJECT_NO_REF (dialog_preferences, dialog_vbox9, "dialog_vbox9"); @@ -2529,7 +2650,12 @@ GLADE_HOOKUP_OBJECT (dialog_preferences, startup_category, "startup_category"); GLADE_HOOKUP_OBJECT (dialog_preferences, alignment9, "alignment9"); GLADE_HOOKUP_OBJECT (dialog_preferences, startup_category_combo, "startup_category_combo"); + GLADE_HOOKUP_OBJECT (dialog_preferences, startup_search, "startup_search"); GLADE_HOOKUP_OBJECT (dialog_preferences, label57, "label57"); + GLADE_HOOKUP_OBJECT (dialog_preferences, frame19, "frame19"); + GLADE_HOOKUP_OBJECT (dialog_preferences, alignment17, "alignment17"); + GLADE_HOOKUP_OBJECT (dialog_preferences, dblclick_action_combo, "dblclick_action_combo"); + GLADE_HOOKUP_OBJECT (dialog_preferences, label75, "label75"); GLADE_HOOKUP_OBJECT (dialog_preferences, frame18, "frame18"); GLADE_HOOKUP_OBJECT (dialog_preferences, alignment14, "alignment14"); GLADE_HOOKUP_OBJECT (dialog_preferences, vbox24, "vbox24"); @@ -2675,7 +2801,6 @@ create_window_entropy (void) { GtkWidget *window_entropy; - AtkObject *atko; GtkWidget *frame_entropy; GtkWidget *label47; @@ -2701,10 +2826,6 @@ gtk_container_add (GTK_CONTAINER (frame_entropy), label47); gtk_label_set_use_markup (GTK_LABEL (label47), TRUE); - atko = gtk_widget_get_accessible (window_entropy); - atk_object_set_name (atko, _("Generate Entropy")); - - /* Store pointers to all widgets, for use by lookup_widget(). */ GLADE_HOOKUP_OBJECT_NO_REF (window_entropy, window_entropy, "window_entropy"); GLADE_HOOKUP_OBJECT (window_entropy, frame_entropy, "frame_entropy"); diff -Nru fpm2-0.76.1/src/Makefile.am fpm2-0.78/src/Makefile.am --- fpm2-0.76.1/src/Makefile.am 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/Makefile.am 2010-03-02 08:52:54.000000000 +0200 @@ -17,7 +17,7 @@ blowfish.c gpg_trans.h \ fpm_crypt.c fpm_crypt.h \ fpm_gpw.c fpm_gpw.h \ - md5.c fpm_clist.c \ + fpm_clist.c \ bithelp.h fpm_launcher.c \ rijndael.c sha256.c diff -Nru fpm2-0.76.1/src/Makefile.in fpm2-0.78/src/Makefile.in --- fpm2-0.76.1/src/Makefile.in 2009-11-09 09:18:45.000000000 +0200 +++ fpm2-0.78/src/Makefile.in 2010-03-03 13:52:22.000000000 +0200 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11 from Makefile.am. +# Makefile.in generated by automake 1.11.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, @@ -48,8 +48,8 @@ am_fpm2_OBJECTS = main.$(OBJEXT) fpm.$(OBJEXT) support.$(OBJEXT) \ interface.$(OBJEXT) fpm_file.$(OBJEXT) callbacks.$(OBJEXT) \ blowfish.$(OBJEXT) fpm_crypt.$(OBJEXT) fpm_gpw.$(OBJEXT) \ - md5.$(OBJEXT) fpm_clist.$(OBJEXT) fpm_launcher.$(OBJEXT) \ - rijndael.$(OBJEXT) sha256.$(OBJEXT) + fpm_clist.$(OBJEXT) fpm_launcher.$(OBJEXT) rijndael.$(OBJEXT) \ + sha256.$(OBJEXT) fpm2_OBJECTS = $(am_fpm2_OBJECTS) am__DEPENDENCIES_1 = fpm2_DEPENDENCIES = $(am__DEPENDENCIES_1) @@ -188,7 +188,7 @@ blowfish.c gpg_trans.h \ fpm_crypt.c fpm_crypt.h \ fpm_gpw.c fpm_gpw.h \ - md5.c fpm_clist.c \ + fpm_clist.c \ bithelp.h fpm_launcher.c \ rijndael.c sha256.c @@ -284,7 +284,6 @@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/fpm_launcher.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/interface.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/main.Po@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/md5.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/rijndael.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/sha256.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/support.Po@am__quote@ diff -Nru fpm2-0.76.1/src/md5.c fpm2-0.78/src/md5.c --- fpm2-0.76.1/src/md5.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/md5.c 1970-01-01 02:00:00.000000000 +0200 @@ -1,372 +0,0 @@ -/* FIGARO'S PASSWORD MANAGER (FPM) - * Copyright (C) 2000 John Conneely except where taken from GnuPG. - * - * FPM is open source / free 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. - * - * FPM is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * This file should be the same as the file that ships with GnuPG, - * except for minor changes needed to get it to compile with FPM. - * - * md5.c - MD5 Message-Digest Algorithm - * - * - * Copyright (C) 1995, 1996, 1998, 1999 Free Software Foundation, Inc. - * - * according to the definition of MD5 in RFC 1321 from April 1992. - * NOTE: This is *not* the same file as the one from glibc. - * - * 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, or (at your option) any - * later version. - * - * This program is distributed in the hope that 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. - */ -/* Written by Ulrich Drepper , 1995. */ -/* heavily modified for GnuPG by */ - -/* Test values: - * "" D4 1D 8C D9 8F 00 B2 04 E9 80 09 98 EC F8 42 7E - * "a" 0C C1 75 B9 C0 F1 B6 A8 31 C3 99 E2 69 77 26 61 - * "abc 90 01 50 98 3C D2 4F B0 D6 96 3F 7D 28 E1 7F 72 - * "message digest" F9 6B 69 7D 7C B7 93 8D 52 5A 2F 31 AA F1 61 D0 - */ - -#include -#include -#include -#include -#include - -#include "gpg_trans.h" -/* -#include "util.h" -#include "memory.h" -#include "dynload.h" - */ - -#include "bithelp.h" - - -typedef struct { - u32 A,B,C,D; /* chaining variables */ - u32 nblocks; - byte buf[64]; - int count; -} MD5_CONTEXT; - - -static void -md5_init( MD5_CONTEXT *ctx ) -{ - ctx->A = 0x67452301; - ctx->B = 0xefcdab89; - ctx->C = 0x98badcfe; - ctx->D = 0x10325476; - - ctx->nblocks = 0; - ctx->count = 0; -} - - - - -/* These are the four functions used in the four steps of the MD5 algorithm - and defined in the RFC 1321. The first function is a little bit optimized - (as found in Colin Plumbs public domain implementation). */ -/* #define FF(b, c, d) ((b & c) | (~b & d)) */ -#define FF(b, c, d) (d ^ (b & (c ^ d))) -#define FG(b, c, d) FF (d, b, c) -#define FH(b, c, d) (b ^ c ^ d) -#define FI(b, c, d) (c ^ (b | ~d)) - - -/**************** - * transform n*64 bytes - */ -static void -/*transform( MD5_CONTEXT *ctx, const void *buffer, size_t len )*/ -transform( MD5_CONTEXT *ctx, byte *data ) -{ - u32 correct_words[16]; - u32 A = ctx->A; - u32 B = ctx->B; - u32 C = ctx->C; - u32 D = ctx->D; - u32 *cwp = correct_words; - - #ifdef BIG_ENDIAN_HOST - { int i; - byte *p2, *p1; - for(i=0, p1=data, p2=(byte*)correct_words; i < 16; i++, p2 += 4 ) { - p2[3] = *p1++; - p2[2] = *p1++; - p2[1] = *p1++; - p2[0] = *p1++; - } - } - #else - memcpy( correct_words, data, 64 ); - #endif - - -#define OP(a, b, c, d, s, T) \ - do \ - { \ - a += FF (b, c, d) + (*cwp++) + T; \ - a = rol(a, s); \ - a += b; \ - } \ - while (0) - - /* Before we start, one word about the strange constants. - They are defined in RFC 1321 as - - T[i] = (int) (4294967296.0 * fabs (sin (i))), i=1..64 - */ - - /* Round 1. */ - OP (A, B, C, D, 7, 0xd76aa478); - OP (D, A, B, C, 12, 0xe8c7b756); - OP (C, D, A, B, 17, 0x242070db); - OP (B, C, D, A, 22, 0xc1bdceee); - OP (A, B, C, D, 7, 0xf57c0faf); - OP (D, A, B, C, 12, 0x4787c62a); - OP (C, D, A, B, 17, 0xa8304613); - OP (B, C, D, A, 22, 0xfd469501); - OP (A, B, C, D, 7, 0x698098d8); - OP (D, A, B, C, 12, 0x8b44f7af); - OP (C, D, A, B, 17, 0xffff5bb1); - OP (B, C, D, A, 22, 0x895cd7be); - OP (A, B, C, D, 7, 0x6b901122); - OP (D, A, B, C, 12, 0xfd987193); - OP (C, D, A, B, 17, 0xa679438e); - OP (B, C, D, A, 22, 0x49b40821); - -#undef OP -#define OP(f, a, b, c, d, k, s, T) \ - do \ - { \ - a += f (b, c, d) + correct_words[k] + T; \ - a = rol(a, s); \ - a += b; \ - } \ - while (0) - - /* Round 2. */ - OP (FG, A, B, C, D, 1, 5, 0xf61e2562); - OP (FG, D, A, B, C, 6, 9, 0xc040b340); - OP (FG, C, D, A, B, 11, 14, 0x265e5a51); - OP (FG, B, C, D, A, 0, 20, 0xe9b6c7aa); - OP (FG, A, B, C, D, 5, 5, 0xd62f105d); - OP (FG, D, A, B, C, 10, 9, 0x02441453); - OP (FG, C, D, A, B, 15, 14, 0xd8a1e681); - OP (FG, B, C, D, A, 4, 20, 0xe7d3fbc8); - OP (FG, A, B, C, D, 9, 5, 0x21e1cde6); - OP (FG, D, A, B, C, 14, 9, 0xc33707d6); - OP (FG, C, D, A, B, 3, 14, 0xf4d50d87); - OP (FG, B, C, D, A, 8, 20, 0x455a14ed); - OP (FG, A, B, C, D, 13, 5, 0xa9e3e905); - OP (FG, D, A, B, C, 2, 9, 0xfcefa3f8); - OP (FG, C, D, A, B, 7, 14, 0x676f02d9); - OP (FG, B, C, D, A, 12, 20, 0x8d2a4c8a); - - /* Round 3. */ - OP (FH, A, B, C, D, 5, 4, 0xfffa3942); - OP (FH, D, A, B, C, 8, 11, 0x8771f681); - OP (FH, C, D, A, B, 11, 16, 0x6d9d6122); - OP (FH, B, C, D, A, 14, 23, 0xfde5380c); - OP (FH, A, B, C, D, 1, 4, 0xa4beea44); - OP (FH, D, A, B, C, 4, 11, 0x4bdecfa9); - OP (FH, C, D, A, B, 7, 16, 0xf6bb4b60); - OP (FH, B, C, D, A, 10, 23, 0xbebfbc70); - OP (FH, A, B, C, D, 13, 4, 0x289b7ec6); - OP (FH, D, A, B, C, 0, 11, 0xeaa127fa); - OP (FH, C, D, A, B, 3, 16, 0xd4ef3085); - OP (FH, B, C, D, A, 6, 23, 0x04881d05); - OP (FH, A, B, C, D, 9, 4, 0xd9d4d039); - OP (FH, D, A, B, C, 12, 11, 0xe6db99e5); - OP (FH, C, D, A, B, 15, 16, 0x1fa27cf8); - OP (FH, B, C, D, A, 2, 23, 0xc4ac5665); - - /* Round 4. */ - OP (FI, A, B, C, D, 0, 6, 0xf4292244); - OP (FI, D, A, B, C, 7, 10, 0x432aff97); - OP (FI, C, D, A, B, 14, 15, 0xab9423a7); - OP (FI, B, C, D, A, 5, 21, 0xfc93a039); - OP (FI, A, B, C, D, 12, 6, 0x655b59c3); - OP (FI, D, A, B, C, 3, 10, 0x8f0ccc92); - OP (FI, C, D, A, B, 10, 15, 0xffeff47d); - OP (FI, B, C, D, A, 1, 21, 0x85845dd1); - OP (FI, A, B, C, D, 8, 6, 0x6fa87e4f); - OP (FI, D, A, B, C, 15, 10, 0xfe2ce6e0); - OP (FI, C, D, A, B, 6, 15, 0xa3014314); - OP (FI, B, C, D, A, 13, 21, 0x4e0811a1); - OP (FI, A, B, C, D, 4, 6, 0xf7537e82); - OP (FI, D, A, B, C, 11, 10, 0xbd3af235); - OP (FI, C, D, A, B, 2, 15, 0x2ad7d2bb); - OP (FI, B, C, D, A, 9, 21, 0xeb86d391); - - /* Put checksum in context given as argument. */ - ctx->A += A; - ctx->B += B; - ctx->C += C; - ctx->D += D; -} - - - -/* The routine updates the message-digest context to - * account for the presence of each of the characters inBuf[0..inLen-1] - * in the message whose digest is being computed. - */ -static void -md5_write( MD5_CONTEXT *hd, byte *inbuf, size_t inlen) -{ - if( hd->count == 64 ) { /* flush the buffer */ - transform( hd, hd->buf ); - hd->count = 0; - hd->nblocks++; - } - if( !inbuf ) - return; - if( hd->count ) { - for( ; inlen && hd->count < 64; inlen-- ) - hd->buf[hd->count++] = *inbuf++; - md5_write( hd, NULL, 0 ); - if( !inlen ) - return; - } - - while( inlen >= 64 ) { - transform( hd, inbuf ); - hd->count = 0; - hd->nblocks++; - inlen -= 64; - inbuf += 64; - } - for( ; inlen && hd->count < 64; inlen-- ) - hd->buf[hd->count++] = *inbuf++; - -} - - - -/* The routine final terminates the message-digest computation and - * ends with the desired message digest in mdContext->digest[0...15]. - * The handle is prepared for a new MD5 cycle. - * Returns 16 bytes representing the digest. - */ - -static void -md5_final( MD5_CONTEXT *hd ) -{ - u32 t, msb, lsb; - byte *p; - - md5_write(hd, NULL, 0); /* flush */; - - msb = 0; - t = hd->nblocks; - if( (lsb = t << 6) < t ) /* multiply by 64 to make a byte count */ - msb++; - msb += t >> 26; - t = lsb; - if( (lsb = t + hd->count) < t ) /* add the count */ - msb++; - t = lsb; - if( (lsb = t << 3) < t ) /* multiply by 8 to make a bit count */ - msb++; - msb += t >> 29; - - if( hd->count < 56 ) { /* enough room */ - hd->buf[hd->count++] = 0x80; /* pad */ - while( hd->count < 56 ) - hd->buf[hd->count++] = 0; /* pad */ - } - else { /* need one extra block */ - hd->buf[hd->count++] = 0x80; /* pad character */ - while( hd->count < 64 ) - hd->buf[hd->count++] = 0; - md5_write(hd, NULL, 0); /* flush */; - memset(hd->buf, 0, 56 ); /* fill next block with zeroes */ - } - /* append the 64 bit count */ - hd->buf[56] = lsb ; - hd->buf[57] = lsb >> 8; - hd->buf[58] = lsb >> 16; - hd->buf[59] = lsb >> 24; - hd->buf[60] = msb ; - hd->buf[61] = msb >> 8; - hd->buf[62] = msb >> 16; - hd->buf[63] = msb >> 24; - transform( hd, hd->buf ); - - p = hd->buf; - #ifdef BIG_ENDIAN_HOST - /* - #define X(a) do { *p++ = hd->##a ; *p++ = hd->##a >> 8; \ - *p++ = hd->##a >> 16; *p++ = hd->##a >> 24; } while(0) - * Newer gcc doesn't like the above construct, let's treat it like - * Unixware - */ - #define X(a) do { *p++ = (*hd).a ; *p++ = (*hd).a >> 8; \ - *p++ = (*hd).a >> 16; *p++ = (*hd).a >> 24; } while(0) - #else /* little endian */ - /*#define X(a) do { *(u32*)p = hd->##a ; p += 4; } while(0)*/ - /* Unixware's cpp doesn't like the above construct so we do it his way: - * (reported by Allan Clark) */ - #define X(a) do { *(u32*)p = (*hd).a ; p += 4; } while(0) - #endif - X(A); - X(B); - X(C); - X(D); - #undef X - -} - -static byte * -md5_read( MD5_CONTEXT *hd ) -{ - return hd->buf; -} - -/**************** - * FPM: At this point I diverge from GnuPG's implementation to write my - * own wrapper function. I'll use this to hash the passphrase. - */ - -byte* md5(byte *buf, size_t nbytes) -{ - byte* ret_val; - MD5_CONTEXT c; - md5_init(&c); - md5_write(&c, buf, nbytes); - md5_final(&c); - - ret_val = g_malloc0(16); - memcpy(ret_val, md5_read(&c), 16); - - return (ret_val); -} - -/* end of file */ diff -Nru fpm2-0.76.1/src/sha256.c fpm2-0.78/src/sha256.c --- fpm2-0.76.1/src/sha256.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/sha256.c 2010-03-02 12:24:38.000000000 +0200 @@ -1,24 +1,20 @@ -/* sha256.c - SHA224 and SHA256 hash functions - * Copyright (C) 2003, 2006 Free Software Foundation, Inc. +/* FIGARO'S PASSWORD MANAGER 2 (FPM2) + * Copyright (C) 2009-2010 Aleš Koval * - * Please see below for more legal information! - * - * This file is part of GnuPG. - * - * GnuPG is free software; you can redistribute it and/or modify + * FPM is open source / free 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. * - * GnuPG is distributed in the hope that it will be useful, + * FPM is distributed in the hope that 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., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, - * USA. + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA + * */ /* pkcs5_pbkdf2 function is taken from bioctl package @@ -59,323 +55,62 @@ * CDC76E5C 9914FB92 81A1C7E2 84D73E67 F1809A48 A497200E 046D39CC C7112CD0 */ - -#include -#include -#include -#include - -#include "gpg_trans.h" #include "fpm.h" - -#define SHA256_DIGEST_LENGTH 32 - -typedef struct { - u32 h0,h1,h2,h3,h4,h5,h6,h7; - u32 nblocks; - byte buf[64]; - int count; -} SHA256_CONTEXT; +#include "fpm_crypt.h" typedef struct { - SHA256_CONTEXT outer, inner; -} hmacsha256; - -static void -burn_stack (int bytes) -{ - char buf[128]; - - wipememory(buf,sizeof buf); - bytes -= sizeof buf; - if (bytes > 0) - burn_stack (bytes); -} - - -void -sha256_init( SHA256_CONTEXT *hd ) -{ - hd->h0 = 0x6a09e667; - hd->h1 = 0xbb67ae85; - hd->h2 = 0x3c6ef372; - hd->h3 = 0xa54ff53a; - hd->h4 = 0x510e527f; - hd->h5 = 0x9b05688c; - hd->h6 = 0x1f83d9ab; - hd->h7 = 0x5be0cd19; - - hd->nblocks = 0; - hd->count = 0; -} - -/**************** - * Transform the message w which consists of 16 32-bit words - */ -static void -transform( SHA256_CONTEXT *hd, byte *data ) -{ - u32 a,b,c,d,e,f,g,h; - u32 w[64]; - int t; - static const u32 k[]= - { - 0x428a2f98, 0x71374491, 0xb5c0fbcf, 0xe9b5dba5, 0x3956c25b, 0x59f111f1, - 0x923f82a4, 0xab1c5ed5, 0xd807aa98, 0x12835b01, 0x243185be, 0x550c7dc3, - 0x72be5d74, 0x80deb1fe, 0x9bdc06a7, 0xc19bf174, 0xe49b69c1, 0xefbe4786, - 0x0fc19dc6, 0x240ca1cc, 0x2de92c6f, 0x4a7484aa, 0x5cb0a9dc, 0x76f988da, - 0x983e5152, 0xa831c66d, 0xb00327c8, 0xbf597fc7, 0xc6e00bf3, 0xd5a79147, - 0x06ca6351, 0x14292967, 0x27b70a85, 0x2e1b2138, 0x4d2c6dfc, 0x53380d13, - 0x650a7354, 0x766a0abb, 0x81c2c92e, 0x92722c85, 0xa2bfe8a1, 0xa81a664b, - 0xc24b8b70, 0xc76c51a3, 0xd192e819, 0xd6990624, 0xf40e3585, 0x106aa070, - 0x19a4c116, 0x1e376c08, 0x2748774c, 0x34b0bcb5, 0x391c0cb3, 0x4ed8aa4a, - 0x5b9cca4f, 0x682e6ff3, 0x748f82ee, 0x78a5636f, 0x84c87814, 0x8cc70208, - 0x90befffa, 0xa4506ceb, 0xbef9a3f7, 0xc67178f2 - }; - - /* get values from the chaining vars */ - a = hd->h0; - b = hd->h1; - c = hd->h2; - d = hd->h3; - e = hd->h4; - f = hd->h5; - g = hd->h6; - h = hd->h7; - -#ifdef BIG_ENDIAN_HOST - memcpy( w, data, 64 ); -#else - { - int i; - byte *p2; - - for(i=0, p2=(byte*)w; i < 16; i++, p2 += 4 ) - { - p2[3] = *data++; - p2[2] = *data++; - p2[1] = *data++; - p2[0] = *data++; - } - } -#endif - -#define ROTR(x,n) (((x)>>(n)) | ((x)<<(32-(n)))) -#define Ch(x,y,z) (((x) & (y)) ^ ((~(x)) & (z))) -#define Maj(x,y,z) (((x) & (y)) ^ ((x) & (z)) ^ ((y) & (z))) -#define Sum0(x) (ROTR((x),2) ^ ROTR((x),13) ^ ROTR((x),22)) -#define Sum1(x) (ROTR((x),6) ^ ROTR((x),11) ^ ROTR((x),25)) -#define S0(x) (ROTR((x),7) ^ ROTR((x),18) ^ ((x)>>3)) -#define S1(x) (ROTR((x),17) ^ ROTR((x),19) ^ ((x)>>10)) - - for(t=16;t<64;t++) - w[t] = S1(w[t-2]) + w[t-7] + S0(w[t-15]) + w[t-16]; - - for(t=0;t<64;t++) - { - u32 t1,t2; - - t1=h+Sum1(e)+Ch(e,f,g)+k[t]+w[t]; - t2=Sum0(a)+Maj(a,b,c); - h=g; - g=f; - f=e; - e=d+t1; - d=c; - c=b; - b=a; - a=t1+t2; - /* printf("t=%d a=%08lX b=%08lX c=%08lX d=%08lX e=%08lX f=%08lX g=%08lX h=%08lX\n",t,a,b,c,d,e,f,g,h); */ - } - - /* update chaining vars */ - hd->h0 += a; - hd->h1 += b; - hd->h2 += c; - hd->h3 += d; - hd->h4 += e; - hd->h5 += f; - hd->h6 += g; - hd->h7 += h; -} + GChecksum *outer, *inner; +} fpm_hmacsha256; - -/* Update the message digest with the contents - * of INBUF with length INLEN. - */ -static void -sha256_write( SHA256_CONTEXT *hd, byte *inbuf, size_t inlen) -{ - if( hd->count == 64 ) { /* flush the buffer */ - transform( hd, hd->buf ); - burn_stack (328); - hd->count = 0; - hd->nblocks++; - } - if( !inbuf ) - return; - if( hd->count ) { - for( ; inlen && hd->count < 64; inlen-- ) - hd->buf[hd->count++] = *inbuf++; - sha256_write( hd, NULL, 0 ); - if( !inlen ) - return; - } - - while( inlen >= 64 ) { - transform( hd, inbuf ); - hd->count = 0; - hd->nblocks++; - inlen -= 64; - inbuf += 64; - } - burn_stack (328); - for( ; inlen && hd->count < 64; inlen-- ) - hd->buf[hd->count++] = *inbuf++; -} - - -/* The routine final terminates the computation and - * returns the digest. - * The handle is prepared for a new cycle, but adding bytes to the - * handle will the destroy the returned buffer. - * Returns: 32 bytes representing the digest. When used for sha224, - * we take the leftmost 28 of those bytes. - */ - -static void -sha256_final(SHA256_CONTEXT *hd) -{ - u32 t, msb, lsb; - byte *p; - - sha256_write(hd, NULL, 0); /* flush */; - - t = hd->nblocks; - /* multiply by 64 to make a byte count */ - lsb = t << 6; - msb = t >> 26; - /* add the count */ - t = lsb; - if( (lsb += hd->count) < t ) - msb++; - /* multiply by 8 to make a bit count */ - t = lsb; - lsb <<= 3; - msb <<= 3; - msb |= t >> 29; - - if( hd->count < 56 ) { /* enough room */ - hd->buf[hd->count++] = 0x80; /* pad */ - while( hd->count < 56 ) - hd->buf[hd->count++] = 0; /* pad */ - } - else { /* need one extra block */ - hd->buf[hd->count++] = 0x80; /* pad character */ - while( hd->count < 64 ) - hd->buf[hd->count++] = 0; - sha256_write(hd, NULL, 0); /* flush */; - memset(hd->buf, 0, 56 ); /* fill next block with zeroes */ - } - /* append the 64 bit count */ - hd->buf[56] = msb >> 24; - hd->buf[57] = msb >> 16; - hd->buf[58] = msb >> 8; - hd->buf[59] = msb ; - hd->buf[60] = lsb >> 24; - hd->buf[61] = lsb >> 16; - hd->buf[62] = lsb >> 8; - hd->buf[63] = lsb ; - transform( hd, hd->buf ); - burn_stack (328); - - p = hd->buf; -#ifdef BIG_ENDIAN_HOST -#define X(a) do { *(u32*)p = hd->h##a ; p += 4; } while(0) -#else /* little endian */ -#define X(a) do { *p++ = hd->h##a >> 24; *p++ = hd->h##a >> 16; \ - *p++ = hd->h##a >> 8; *p++ = hd->h##a; } while(0) -#endif - X(0); - X(1); - X(2); - X(3); - X(4); - X(5); - X(6); - /* Note that this last chunk is included even for SHA224. We just - ignore it. */ - X(7); -#undef X -} - -static byte * -sha256_read( SHA256_CONTEXT *hd ) -{ - return hd->buf; -} - -byte* sha256(byte *buf, size_t nbytes) -{ - byte* ret_val; - SHA256_CONTEXT c; - sha256_init(&c); - sha256_write(&c, buf, nbytes); - sha256_final(&c); - - ret_val = g_malloc0(32); - memcpy(ret_val, sha256_read(&c), 32); - - return (ret_val); -} - -static void hmacsha256_init(hmacsha256 *c, unsigned char *key, int keylen) { - unsigned char realkey[64], outerkey[64], innerkey[64]; - SHA256_CONTEXT keyc; - int i; +static void fpm_hmacsha256_init(fpm_hmacsha256 *c, guchar *key, gint keylen) { + guchar realkey[64], outerkey[64], innerkey[64]; + GChecksum *keyc; + gsize size = SHA256_DIGEST_LENGTH; + gint i; memset(realkey, 0, sizeof(realkey)); if(keylen > 64) { - sha256_init(&keyc); - sha256_write(&keyc, key, keylen); - sha256_final(&keyc); - memcpy(realkey, sha256_read(&keyc), 32); + keyc = g_checksum_new(G_CHECKSUM_SHA256); + g_checksum_update(keyc, key, keylen); + g_checksum_get_digest(keyc, realkey, &size); + g_checksum_free(keyc); keylen = 32; } else { memcpy(realkey, key, keylen); } /* abusing the cache here, if we do sha256 in between that'll erase it */ - for(i=0;i<64;i++) { + for(i = 0; i<64 ; i++) { int r = realkey[i]; innerkey[i] = r ^ 0x36; outerkey[i] = r ^ 0x5c; } - sha256_init(&c->outer); - sha256_init(&c->inner); - sha256_write(&c->outer, outerkey, 64); - sha256_write(&c->inner, innerkey, 64); + c->outer = g_checksum_new(G_CHECKSUM_SHA256); + c->inner = g_checksum_new(G_CHECKSUM_SHA256); + g_checksum_update(c->outer, outerkey, 64); + g_checksum_update(c->inner, innerkey, 64); } -static void hmacsha256_write(hmacsha256 *c, unsigned char *message, int messagelen) { - sha256_write(&c->inner, message, messagelen); +static void fpm_hmacsha256_write(fpm_hmacsha256 *c, guchar *message, gint messagelen) { + g_checksum_update(c->inner, message, messagelen); } -static void hmacsha256_final(hmacsha256 *c, unsigned char *digest) { - sha256_final(&c->inner); - memcpy(digest, sha256_read(&c->inner), 32); - sha256_write(&c->outer, digest, 32); - sha256_final(&c->outer); - memcpy(digest, sha256_read(&c->outer), 32); +static void fpm_hmacsha256_final(fpm_hmacsha256 *c, guchar *digest) { + gsize size = SHA256_DIGEST_LENGTH; + g_checksum_get_digest(c->inner, digest, &size); + g_checksum_free(c->inner); + g_checksum_update(c->outer, digest, SHA256_DIGEST_LENGTH); + g_checksum_get_digest(c->outer, digest, &size); + g_checksum_free(c->outer); } -void hmac_sha256(unsigned char *key, int key_len, unsigned char *data, int data_len, unsigned char *mac) { - hmacsha256 hmac; - unsigned char digest[SHA256_DIGEST_LENGTH]; - - hmacsha256_init(&hmac, key, key_len); - hmacsha256_write(&hmac, data, data_len); - hmacsha256_final(&hmac, digest); +void fpm_hmac_sha256(guchar *key, gint key_len, guchar *data, gint data_len, guchar *mac) { + fpm_hmacsha256 hmac; + guchar digest[SHA256_DIGEST_LENGTH]; + + fpm_hmacsha256_init(&hmac, key, key_len); + fpm_hmacsha256_write(&hmac, data, data_len); + fpm_hmacsha256_final(&hmac, digest); memcpy(mac, digest, SHA256_DIGEST_LENGTH); wipememory(digest, sizeof(digest)); @@ -386,20 +121,20 @@ * Code based on IEEE Std 802.11-2007, Annex H.4.2. */ -int pkcs5_pbkdf2(unsigned char *pass, size_t pass_len, const char *salt, size_t salt_len, - u_int8_t *key, size_t key_len, u_int rounds) +gint fpm_pkcs5_pbkdf2(guchar *pass, gsize pass_len, const gchar *salt, gsize salt_len, + guint8 *key, gsize key_len, guint rounds) { - u_int8_t *asalt, obuf[SHA256_DIGEST_LENGTH]; - u_int8_t d1[SHA256_DIGEST_LENGTH], d2[SHA256_DIGEST_LENGTH]; - u_int i, j; - u_int count; - size_t r; + guint8 *asalt, obuf[SHA256_DIGEST_LENGTH]; + guint8 d1[SHA256_DIGEST_LENGTH], d2[SHA256_DIGEST_LENGTH]; + guint i, j; + guint count; + gsize r; if (rounds < 1 || key_len == 0) return -1; if (salt_len == 0 || salt_len > 256 - 1) return -1; - if ((asalt = malloc(salt_len + 4)) == NULL) + if ((asalt = g_malloc(salt_len + 4)) == NULL) return -1; memcpy(asalt, salt, salt_len); @@ -409,11 +144,10 @@ asalt[salt_len + 1] = (count >> 16) & 0xff; asalt[salt_len + 2] = (count >> 8) & 0xff; asalt[salt_len + 3] = count & 0xff; - hmac_sha256(pass, pass_len, asalt, salt_len + 4, d1); + fpm_hmac_sha256(pass, pass_len, asalt, salt_len + 4, d1); memcpy(obuf, d1, sizeof(obuf)); - for (i = 1; i < rounds; i++) { - hmac_sha256(pass, pass_len, d1, sizeof(d1), d2); + fpm_hmac_sha256(pass, pass_len, d1, sizeof(d1), d2); memcpy(d1, d2, sizeof(d1)); for (j = 0; j < sizeof(obuf); j++) obuf[j] ^= d1[j]; @@ -425,7 +159,7 @@ key_len -= r; }; wipememory(asalt, salt_len + 4); - free(asalt); + g_free(asalt); wipememory(d1, sizeof(d1)); wipememory(d2, sizeof(d2)); wipememory(obuf, sizeof(obuf)); @@ -434,21 +168,23 @@ } /* Calculate sha256 hash of file, return 0 for success */ -int sha256_file(gchar *filename, unsigned char *digest) { +gint fpm_sha256_file(gchar *filename, guchar *digest) { FILE *fp; - SHA256_CONTEXT ctx; - unsigned char buf[1024]; - unsigned long br; - int ret_val = -1; + GChecksum *checksum; + gsize size = SHA256_DIGEST_LENGTH; + guchar buf[1024]; + gulong br; + gint ret_val = -1; + + checksum = g_checksum_new(G_CHECKSUM_SHA256); if((fp = fopen(filename, "r")) != NULL) { - sha256_init(&ctx); - while ((br = fread (buf, sizeof (unsigned char), 1024, fp)) > 0) { - sha256_write(&ctx, buf, br); + while ((br = fread (buf, sizeof (guchar), 1024, fp)) > 0) { + g_checksum_update(checksum, buf, br); } if(!ferror(fp)) { - sha256_final(&ctx); - memcpy(digest, sha256_read(&ctx), SHA256_DIGEST_LENGTH); + g_checksum_get_digest(checksum, digest, &size); + g_checksum_free(checksum); ret_val = 0; } fclose(fp); @@ -458,23 +194,24 @@ } /* Calculate sha256 hash from all fpm_data entries except passwords */ -void sha256_fpm_data(unsigned char *digest) { - SHA256_CONTEXT ctx; +void fpm_sha256_fpm_data(gchar *digest) { + GChecksum *checksum; + gsize size = SHA256_DIGEST_LENGTH; GList *list; fpm_data *data; gchar *buf; - sha256_init(&ctx); + checksum = g_checksum_new(G_CHECKSUM_SHA256); list = g_list_first(glb_pass_list); while(list != NULL) { data = list->data; buf = g_strdup_printf("%s%s%s%s%s%s", data->title, data->arg, data->user, data->notes, data->category, data->launcher); - sha256_write(&ctx, buf, strlen(buf)); + g_checksum_update(checksum, (guchar *)buf, strlen(buf)); list = g_list_next(list); g_free(buf); } - sha256_final(&ctx); - memcpy(digest, sha256_read(&ctx), SHA256_DIGEST_LENGTH); + g_checksum_get_digest(checksum, (guchar *)digest, &size); + g_checksum_free(checksum); } diff -Nru fpm2-0.76.1/src/support.c fpm2-0.78/src/support.c --- fpm2-0.76.1/src/support.c 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/support.c 2010-02-24 08:12:33.000000000 +0200 @@ -126,19 +126,3 @@ return pixbuf; } -/* This is used to set ATK action descriptions. */ -void -glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description) -{ - gint n_actions, i; - - n_actions = atk_action_get_n_actions (action); - for (i = 0; i < n_actions; i++) - { - if (!strcmp (atk_action_get_name (action, i), action_name)) - atk_action_set_description (action, i, description); - } -} - diff -Nru fpm2-0.76.1/src/support.h fpm2-0.78/src/support.h --- fpm2-0.76.1/src/support.h 2009-11-09 09:13:59.000000000 +0200 +++ fpm2-0.78/src/support.h 2010-02-24 08:12:33.000000000 +0200 @@ -40,8 +40,3 @@ /* This is used to create the pixbufs used in the interface. */ GdkPixbuf* create_pixbuf (const gchar *filename); -/* This is used to set ATK action descriptions. */ -void glade_set_atk_action_description (AtkAction *action, - const gchar *action_name, - const gchar *description); -