diff -Nru grsync-1.2.5/aclocal.m4 grsync-1.2.6/aclocal.m4 --- grsync-1.2.5/aclocal.m4 2014-04-28 12:26:57.000000000 +0000 +++ grsync-1.2.6/aclocal.m4 2016-03-15 13:08:31.000000000 +0000 @@ -1,6 +1,6 @@ -# generated automatically by aclocal 1.14.1 -*- Autoconf -*- +# generated automatically by aclocal 1.15 -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -590,31 +590,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile AC_SUBST(ALL_LINGUAS) -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - AC_LINK_IFELSE( - [AC_LANG_PROGRAM([[]], - [[extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr]])], - [DATADIRNAME=share], - [case $host in - *-*-solaris*) - dnl On Solaris, if bind_textdomain_codeset is in libc, - dnl GNU format message catalog is always supported, - dnl since both are added to the libc all together. - dnl Hence, we'd like to go with DATADIRNAME=share - dnl in this case. - AC_CHECK_FUNC(bind_textdomain_codeset, - [DATADIRNAME=share], [DATADIRNAME=lib]) - ;; - *) - [DATADIRNAME=lib] - ;; - esac]) -fi -AC_SUBST(DATADIRNAME) - IT_PO_SUBDIR([po]) ]) @@ -672,7 +647,7 @@ # nls.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008-2013 Free Software Foundation, +dnl Copyright (C) 1995-2003, 2005-2006, 2008-2014 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -864,7 +839,62 @@ fi[]dnl ])# PKG_CHECK_MODULES -# Copyright (C) 2002-2013 Free Software Foundation, Inc. + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -876,10 +906,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.14' +[am__api_version='1.15' 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.14.1], [], +m4_if([$1], [1.15], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -895,14 +925,14 @@ # 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.14.1])dnl +[AM_AUTOMAKE_VERSION([1.15])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) # AM_AUX_DIR_EXPAND -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -947,15 +977,14 @@ # configured tree to be moved without reconfiguration. AC_DEFUN([AM_AUX_DIR_EXPAND], -[dnl Rely on autoconf to set up CDPATH properly. -AC_PREREQ([2.50])dnl -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` ]) # AM_CONDITIONAL -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -986,7 +1015,7 @@ Usually this means the macro was only invoked conditionally.]]) fi])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1177,7 +1206,7 @@ # Generate code to set up dependency tracking. -*- Autoconf -*- -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1253,7 +1282,7 @@ # Do all the work for Automake. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1343,8 +1372,8 @@ # # AC_SUBST([mkdir_p], ['$(MKDIR_P)']) -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. AC_REQUIRE([AC_PROG_AWK])dnl AC_REQUIRE([AC_PROG_MAKE_SET])dnl AC_REQUIRE([AM_SET_LEADING_DOT])dnl @@ -1417,7 +1446,11 @@ END AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) fi -fi]) +fi +dnl The trailing newline in this macro's definition is deliberate, for +dnl backward compatibility and to allow trailing 'dnl'-style comments +dnl after the AM_INIT_AUTOMAKE invocation. See automake bug#16841. +]) dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further @@ -1446,7 +1479,7 @@ done echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1457,7 +1490,7 @@ # Define $install_sh. AC_DEFUN([AM_PROG_INSTALL_SH], [AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -1467,7 +1500,7 @@ fi AC_SUBST([install_sh])]) -# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# Copyright (C) 2003-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1489,7 +1522,7 @@ # Add --enable-maintainer-mode option to configure. -*- Autoconf -*- # From Jim Meyering -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1524,7 +1557,7 @@ # Check to see how 'make' treats includes. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1574,7 +1607,7 @@ # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- -# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# Copyright (C) 1997-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1615,7 +1648,7 @@ # Obsolete and "removed" macros, that must however still report explicit # error messages when used, to smooth transition. # -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1642,7 +1675,7 @@ # Helper functions for option handling. -*- Autoconf -*- -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1671,7 +1704,7 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1718,7 +1751,7 @@ # For backward compatibility. AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1737,7 +1770,7 @@ # Check to make sure that the build environment is sane. -*- Autoconf -*- -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1818,7 +1851,7 @@ rm -f conftest.file ]) -# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# Copyright (C) 2009-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1878,7 +1911,7 @@ _AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl ]) -# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# Copyright (C) 2001-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1906,7 +1939,7 @@ INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" AC_SUBST([INSTALL_STRIP_PROGRAM])]) -# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# Copyright (C) 2006-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -1925,7 +1958,7 @@ # Check how to create a tarball. -*- Autoconf -*- -# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# Copyright (C) 2004-2014 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, diff -Nru grsync-1.2.5/compile grsync-1.2.6/compile --- grsync-1.2.5/compile 2014-04-28 12:26:58.000000000 +0000 +++ grsync-1.2.6/compile 2016-03-15 13:08:34.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey . # # This program is free software; you can redistribute it and/or modify diff -Nru grsync-1.2.5/configure grsync-1.2.6/configure --- grsync-1.2.5/configure 2014-04-28 12:26:57.000000000 +0000 +++ grsync-1.2.6/configure 2016-03-15 13:08:32.000000000 +0000 @@ -631,11 +631,11 @@ INTLLIBS INSTOBJEXT GMOFILES +DATADIRNAME CATOBJEXT CATALOGS MSGFMT_OPTS GETTEXT_PACKAGE -DATADIRNAME ALL_LINGUAS INTLTOOL_PERL GMSGFMT @@ -2230,7 +2230,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu -am__api_version='1.14' +am__api_version='1.15' ac_aux_dir= for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do @@ -2431,8 +2431,8 @@ ac_script='s/[\\$]/&&/g;s/;s,x,x,$//' program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"` -# expand $ac_aux_dir to an absolute path -am_aux_dir=`cd $ac_aux_dir && pwd` +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` if test x"${MISSING+set}" != xset; then case $am_aux_dir in @@ -2451,7 +2451,7 @@ $as_echo "$as_me: WARNING: 'missing' script is too old or missing" >&2;} fi -if test x"${install_sh}" != xset; then +if test x"${install_sh+set}" != xset; then case $am_aux_dir in *\ * | *\ *) install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; @@ -2746,7 +2746,7 @@ # Define the identity of the package. PACKAGE=grsync - VERSION=1.2.5 + VERSION=1.2.6 cat >>confdefs.h <<_ACEOF @@ -2780,8 +2780,8 @@ # mkdir_p='$(MKDIR_P)' -# We need awk for the "check" target. The system "awk" is bad on -# some platforms. +# We need awk for the "check" target (and possibly the TAP driver). The +# system "awk" is bad on some platforms. # Always define AMTAR for backward compatibility. Yes, it's still used # in the wild :-( We should find a proper way to deprecate it ... AMTAR='$${TAR-tar}' @@ -2838,6 +2838,7 @@ as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 fi fi + ac_config_headers="$ac_config_headers config.h" @@ -6954,44 +6955,6 @@ # Substitute ALL_LINGUAS so we can use it in po/Makefile -# Set DATADIRNAME correctly if it is not set yet -# (copied from glib-gettext.m4) -if test -z "$DATADIRNAME"; then - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ -extern int _nl_msg_cat_cntr; - return _nl_msg_cat_cntr - ; - return 0; -} -_ACEOF -if ac_fn_c_try_link "$LINENO"; then : - DATADIRNAME=share -else - case $host in - *-*-solaris*) - ac_fn_c_check_func "$LINENO" "bind_textdomain_codeset" "ac_cv_func_bind_textdomain_codeset" -if test "x$ac_cv_func_bind_textdomain_codeset" = xyes; then : - DATADIRNAME=share -else - DATADIRNAME=lib -fi - - ;; - *) - DATADIRNAME=lib - ;; - esac -fi -rm -f core conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi - - diff -Nru grsync-1.2.5/configure.in grsync-1.2.6/configure.in --- grsync-1.2.5/configure.in 2013-12-09 12:54:48.000000000 +0000 +++ grsync-1.2.6/configure.in 2016-03-15 13:08:19.000000000 +0000 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(configure.in) -AM_INIT_AUTOMAKE(grsync, 1.2.5) +AM_INIT_AUTOMAKE(grsync, 1.2.6) AM_CONFIG_HEADER(config.h) AM_MAINTAINER_MODE diff -Nru grsync-1.2.5/debian/changelog grsync-1.2.6/debian/changelog --- grsync-1.2.5/debian/changelog 2014-10-10 20:09:14.000000000 +0000 +++ grsync-1.2.6/debian/changelog 2016-05-17 18:02:10.000000000 +0000 @@ -1,3 +1,12 @@ +grsync (1.2.6-1) unstable; urgency=medium + + * New upstream release + * Update Standards-Version to 3.9.8 + - remove grsync.menu. + * Adjust dependency + + -- Martijn van Brummelen Tue, 17 May 2016 19:48:45 +0200 + grsync (1.2.5-1) unstable; urgency=medium * New upstream release (Closes: #722071). diff -Nru grsync-1.2.5/debian/control grsync-1.2.6/debian/control --- grsync-1.2.5/debian/control 2014-10-10 20:12:31.000000000 +0000 +++ grsync-1.2.6/debian/control 2016-05-17 17:56:40.000000000 +0000 @@ -4,7 +4,7 @@ Maintainer: Martijn van Brummelen Build-Depends: debhelper (>= 9), autotools-dev, intltool, libgtk2.0-dev, libxml-parser-perl, dpkg-dev (>= 1.16.1~) -Standards-Version: 3.9.6 +Standards-Version: 3.9.8 Homepage: http://www.opbyte.it/grsync/ Package: grsync diff -Nru grsync-1.2.5/debian/grsync.menu grsync-1.2.6/debian/grsync.menu --- grsync-1.2.5/debian/grsync.menu 2010-03-31 14:08:18.000000000 +0000 +++ grsync-1.2.6/debian/grsync.menu 1970-01-01 00:00:00.000000000 +0000 @@ -1,4 +0,0 @@ -?package(grsync):needs="X11" section="Applications/Network/File Transfer"\ - title="Grsync" longtitle="GTK+ frontend for rsync"\ - description="Grsync is a simple graphical interface using GTK2 for the rsync command line program. It currently supports only a limited set of the most important rsync features, but can be used effectively for local directory synchronization."\ - command="/usr/bin/grsync" icon="/usr/share/pixmaps/grsync.xpm" diff -Nru grsync-1.2.5/depcomp grsync-1.2.6/depcomp --- grsync-1.2.5/depcomp 2014-04-28 12:26:58.000000000 +0000 +++ grsync-1.2.6/depcomp 2016-03-15 13:08:34.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-05-30.07; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by diff -Nru grsync-1.2.5/grsync.desktop.in grsync-1.2.6/grsync.desktop.in --- grsync-1.2.5/grsync.desktop.in 2013-04-30 11:48:54.000000000 +0000 +++ grsync-1.2.6/grsync.desktop.in 2015-09-11 11:21:28.000000000 +0000 @@ -5,12 +5,63 @@ Type=Application MimeType=application/x-grsync-session; Categories=Application;System; -Comment=Synchronize files with rsync -Comment[fr]=Interface GTK pour rsync -Comment[it]=Sincronizza file con rsync -Comment[nb]=Et GTK-grensesnitt for rsync -Comment[ru]=GTK интерфейс для rsync -Comment[tr]=Rsync için bir GTK grafik arayüzü -Comment[hr]=Sinkronizacija datoteka pomoću rsync-a +GenericName=Synchronize files with rsync +GenericName[fr]=Interface GTK pour rsync +GenericName[it]=Sincronizza file con rsync +GenericName[nb]=Et GTK-grensesnitt for rsync +GenericName[ru]=GTK интерфейс для rsync +GenericName[tr]=Rsync için bir GTK grafik arayüzü +GenericName[hr]=Sinkronizacija datoteka pomoću rsync-a +GenericName[af]=Sinkroniseer lêers met rsync +GenericName[sq]=Sinkronizo skdedarët me rsync +GenericName[ast]=Sincroniza ficheros con rsync +GenericName[be]=Сынхранізацыя файлаў пры дапамозе rsync +GenericName[bn]=rsync দ্বারা ফাইল সমকালীন করুন +GenericName[bs]=Uskladite datoteke pomoću rsync +GenericName[pt_BR]=Sincronize arquivos com rsync +GenericName[bg]=Синхронизиране на файлове с rsync +GenericName[ca]=Sincronitzeu fitxers amb rsync +GenericName[ca@valencia]=Sincronitzeu fitxers amb rsync +GenericName[zh_HK]=以 rsync 同步檔案 +GenericName[zh_CN]=用 rsync 同步文件 +GenericName[zh_TW]=以 rsync 同步檔案 +GenericName[crh]=rsync ile dosyaları eşleştir +GenericName[cs]=Synchronizace souborů pomocí rsync +GenericName[da]=Synkronisér filer med rsync +GenericName[nl]=Bestanden synchroniseren met rsync +GenericName[fi]=Synkronisoi tiedostoja rsyncillä +GenericName[gl]=Sincronice ficheiros con rsync +GenericName[de]=Dateien mit rsync synchronisieren +GenericName[el]=Συγχρονισμός αρχείων μέσω rsync +GenericName[hu]=Fájlok szinkronizálása rsync használatával +GenericName[is]=Samræma vélar með rsync +GenericName[ja]=rsync でファイルを同期します +GenericName[ky]=rsync тин жардамы менен файлдарды синхрондоштуруу +GenericName[ko]=알싱크로 파일을 동기화합니다 +GenericName[ms]=Segerakkan fail dengan rsync +GenericName[oc]=Sincronizar de fichièrs amb rsync +GenericName[pl]=Interfejs synchronizacji plików programu rsync +GenericName[pt]=Sincronizar ficheiros com rsync +GenericName[ro]=Sincronizați fișiere cu rsync +GenericName[sr]=Синхронизујте датотеке са rsync-ом +GenericName[sl]=Uskladite datoteke z rsync +GenericName[es]=Sincronice archivos con rsync +GenericName[sv]=Synkronisera filer med rsync +GenericName[uk]=Синхронізація файлів з rsync +GenericName[vi]=Đồng bộ hoá tập tin với rsync +Comment=Synchronize files and folders (a GTK GUI for rsync) +Comment[cs]=Synchronizace souborů a složek (rozhraní pro rsync napsané pod Gtk+) +Comment[de]=Dateien und Ordner abgleichen (eine grafische rsync-Benutzeroberfläche basierend auf GTK) +Comment[es]=Sincronizar archivos y carpetas (un IGU GTK+ para rsync) +Comment[fr]=Synchronise les fichiers et dossiers (une interface graphique GTK pour rsync) +Comment[hr]=Sinkornizacija datoteka i mapa (GTK GUI za rsync) +Comment[hu]=Fájlok és mappák szinkronizálása (GTK felület az rsynchez) +Comment[id]=Sinkronisasi berkas dan folder (GTK GUI untuk rsync) +Comment[it]=Sincronizza file e cartelle (una GUI GTK di rsync) +Comment[nb]=Synkroniser filer og mapper (GTK-grensesnitt for rsync) +Comment[nl]=Bestanden en mappen synchroniseren (een GTK GUI voor rsync) +Comment[pt_BR]=Sincronizar arquivos e pastas (Um GTK GUI para o rsync) +Comment[ru]=Синхронизирует файлы и директории (GTK GUI для rsync) +Comment[zh_TW]=同步檔案與資料夾 (rsync 的 GTK 圖形使用者介面) Exec=@prefix@/bin/@PACKAGE@ -i %f @OTHER_DESKTOP_ENTRIES@ diff -Nru grsync-1.2.5/grsync.glade grsync-1.2.6/grsync.glade --- grsync-1.2.5/grsync.glade 2014-07-08 13:17:19.000000000 +0000 +++ grsync-1.2.6/grsync.glade 2015-12-23 15:43:26.000000000 +0000 @@ -1571,7 +1571,23 @@ - + + Overwrite logs + True + True + False + Whether to overwrite the logs when running a session. This will make you save space, but you'll loose the logs of the previous runs + True + True + + + 1 + 2 + 5 + 6 + GTK_FILL + + diff -Nru grsync-1.2.5/install-sh grsync-1.2.6/install-sh --- grsync-1.2.5/install-sh 2014-04-28 12:26:58.000000000 +0000 +++ grsync-1.2.6/install-sh 2016-03-15 13:08:34.000000000 +0000 @@ -1,7 +1,7 @@ #!/bin/sh # install - install a program, script, or datafile -scriptversion=2011-11-20.07; # UTC +scriptversion=2013-12-25.23; # UTC # This originates from X11R5 (mit/util/scripts/install.sh), which was # later released in X11R6 (xc/config/util/install.sh) with the @@ -41,19 +41,15 @@ # This script is compatible with the BSD install script, but was written # from scratch. +tab=' ' nl=' ' -IFS=" "" $nl" +IFS=" $tab$nl" -# set DOITPROG to echo to test this script +# Set DOITPROG to "echo" to test this script. -# Don't use :- since 4.3BSD and earlier shells don't like it. doit=${DOITPROG-} -if test -z "$doit"; then - doit_exec=exec -else - doit_exec=$doit -fi +doit_exec=${doit:-exec} # Put in absolute file names if you don't have them in your path; # or use environment vars. @@ -68,17 +64,6 @@ rmprog=${RMPROG-rm} stripprog=${STRIPPROG-strip} -posix_glob='?' -initialize_posix_glob=' - test "$posix_glob" != "?" || { - if (set -f) 2>/dev/null; then - posix_glob= - else - posix_glob=: - fi - } -' - posix_mkdir= # Desired mode of installed file. @@ -97,7 +82,7 @@ dst_arg= copy_on_change=false -no_target_directory= +is_target_a_directory=possibly usage="\ Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE @@ -137,46 +122,57 @@ -d) dir_arg=true;; -g) chgrpcmd="$chgrpprog $2" - shift;; + shift;; --help) echo "$usage"; exit $?;; -m) mode=$2 - case $mode in - *' '* | *' '* | *' -'* | *'*'* | *'?'* | *'['*) - echo "$0: invalid mode: $mode" >&2 - exit 1;; - esac - shift;; + case $mode in + *' '* | *"$tab"* | *"$nl"* | *'*'* | *'?'* | *'['*) + echo "$0: invalid mode: $mode" >&2 + exit 1;; + esac + shift;; -o) chowncmd="$chownprog $2" - shift;; + shift;; -s) stripcmd=$stripprog;; - -t) dst_arg=$2 - # Protect names problematic for 'test' and other utilities. - case $dst_arg in - -* | [=\(\)!]) dst_arg=./$dst_arg;; - esac - shift;; + -t) + is_target_a_directory=always + dst_arg=$2 + # Protect names problematic for 'test' and other utilities. + case $dst_arg in + -* | [=\(\)!]) dst_arg=./$dst_arg;; + esac + shift;; - -T) no_target_directory=true;; + -T) is_target_a_directory=never;; --version) echo "$0 $scriptversion"; exit $?;; - --) shift - break;; + --) shift + break;; - -*) echo "$0: invalid option: $1" >&2 - exit 1;; + -*) echo "$0: invalid option: $1" >&2 + exit 1;; *) break;; esac shift done +# We allow the use of options -d and -T together, by making -d +# take the precedence; this is for compatibility with GNU install. + +if test -n "$dir_arg"; then + if test -n "$dst_arg"; then + echo "$0: target directory not allowed when installing a directory." >&2 + exit 1 + fi +fi + if test $# -ne 0 && test -z "$dir_arg$dst_arg"; then # When -d is used, all remaining arguments are directories to create. # When -t is used, the destination is already specified. @@ -208,6 +204,15 @@ fi if test -z "$dir_arg"; then + if test $# -gt 1 || test "$is_target_a_directory" = always; then + if test ! -d "$dst_arg"; then + echo "$0: $dst_arg: Is not a directory." >&2 + exit 1 + fi + fi +fi + +if test -z "$dir_arg"; then do_exit='(exit $ret); exit $ret' trap "ret=129; $do_exit" 1 trap "ret=130; $do_exit" 2 @@ -223,16 +228,16 @@ *[0-7]) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw='% 200' + u_plus_rw='% 200' fi cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;; *) if test -z "$stripcmd"; then - u_plus_rw= + u_plus_rw= else - u_plus_rw=,u+rw + u_plus_rw=,u+rw fi cp_umask=$mode$u_plus_rw;; esac @@ -269,41 +274,15 @@ # If destination is a directory, append the input filename; won't work # if double slashes aren't ignored. if test -d "$dst"; then - if test -n "$no_target_directory"; then - echo "$0: $dst_arg: Is a directory" >&2 - exit 1 + if test "$is_target_a_directory" = never; then + echo "$0: $dst_arg: Is a directory" >&2 + exit 1 fi dstdir=$dst dst=$dstdir/`basename "$src"` dstdir_status=0 else - # Prefer dirname, but fall back on a substitute if dirname fails. - dstdir=` - (dirname "$dst") 2>/dev/null || - expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ - X"$dst" : 'X\(//\)[^/]' \| \ - X"$dst" : 'X\(//\)$' \| \ - X"$dst" : 'X\(/\)' \| . 2>/dev/null || - echo X"$dst" | - sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ - s//\1/ - q - } - /^X\(\/\/\)[^/].*/{ - s//\1/ - q - } - /^X\(\/\/\)$/{ - s//\1/ - q - } - /^X\(\/\).*/{ - s//\1/ - q - } - s/.*/./; q' - ` - + dstdir=`dirname "$dst"` test -d "$dstdir" dstdir_status=$? fi @@ -314,74 +293,74 @@ if test $dstdir_status != 0; then case $posix_mkdir in '') - # Create intermediate dirs using mode 755 as modified by the umask. - # This is like FreeBSD 'install' as of 1997-10-28. - umask=`umask` - case $stripcmd.$umask in - # Optimize common cases. - *[2367][2367]) mkdir_umask=$umask;; - .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; - - *[0-7]) - mkdir_umask=`expr $umask + 22 \ - - $umask % 100 % 40 + $umask % 20 \ - - $umask % 10 % 4 + $umask % 2 - `;; - *) mkdir_umask=$umask,go-w;; - esac - - # With -d, create the new directory with the user-specified mode. - # Otherwise, rely on $mkdir_umask. - if test -n "$dir_arg"; then - mkdir_mode=-m$mode - else - mkdir_mode= - fi - - posix_mkdir=false - case $umask in - *[123567][0-7][0-7]) - # POSIX mkdir -p sets u+wx bits regardless of umask, which - # is incompatible with FreeBSD 'install' when (umask & 300) != 0. - ;; - *) - tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ - trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 - - if (umask $mkdir_umask && - exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 - then - if test -z "$dir_arg" || { - # Check for POSIX incompatibilities with -m. - # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or - # other-writable bit of parent directory when it shouldn't. - # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. - ls_ld_tmpdir=`ls -ld "$tmpdir"` - case $ls_ld_tmpdir in - d????-?r-*) different_mode=700;; - d????-?--*) different_mode=755;; - *) false;; - esac && - $mkdirprog -m$different_mode -p -- "$tmpdir" && { - ls_ld_tmpdir_1=`ls -ld "$tmpdir"` - test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" - } - } - then posix_mkdir=: - fi - rmdir "$tmpdir/d" "$tmpdir" - else - # Remove any dirs left behind by ancient mkdir implementations. - rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null - fi - trap '' 0;; - esac;; + # Create intermediate dirs using mode 755 as modified by the umask. + # This is like FreeBSD 'install' as of 1997-10-28. + umask=`umask` + case $stripcmd.$umask in + # Optimize common cases. + *[2367][2367]) mkdir_umask=$umask;; + .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;; + + *[0-7]) + mkdir_umask=`expr $umask + 22 \ + - $umask % 100 % 40 + $umask % 20 \ + - $umask % 10 % 4 + $umask % 2 + `;; + *) mkdir_umask=$umask,go-w;; + esac + + # With -d, create the new directory with the user-specified mode. + # Otherwise, rely on $mkdir_umask. + if test -n "$dir_arg"; then + mkdir_mode=-m$mode + else + mkdir_mode= + fi + + posix_mkdir=false + case $umask in + *[123567][0-7][0-7]) + # POSIX mkdir -p sets u+wx bits regardless of umask, which + # is incompatible with FreeBSD 'install' when (umask & 300) != 0. + ;; + *) + tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$ + trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0 + + if (umask $mkdir_umask && + exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1 + then + if test -z "$dir_arg" || { + # Check for POSIX incompatibilities with -m. + # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or + # other-writable bit of parent directory when it shouldn't. + # FreeBSD 6.1 mkdir -m -p sets mode of existing directory. + ls_ld_tmpdir=`ls -ld "$tmpdir"` + case $ls_ld_tmpdir in + d????-?r-*) different_mode=700;; + d????-?--*) different_mode=755;; + *) false;; + esac && + $mkdirprog -m$different_mode -p -- "$tmpdir" && { + ls_ld_tmpdir_1=`ls -ld "$tmpdir"` + test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1" + } + } + then posix_mkdir=: + fi + rmdir "$tmpdir/d" "$tmpdir" + else + # Remove any dirs left behind by ancient mkdir implementations. + rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null + fi + trap '' 0;; + esac;; esac if $posix_mkdir && ( - umask $mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" + umask $mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir" ) then : else @@ -391,53 +370,51 @@ # directory the slow way, step by step, checking for races as we go. case $dstdir in - /*) prefix='/';; - [-=\(\)!]*) prefix='./';; - *) prefix='';; + /*) prefix='/';; + [-=\(\)!]*) prefix='./';; + *) prefix='';; esac - eval "$initialize_posix_glob" - oIFS=$IFS IFS=/ - $posix_glob set -f + set -f set fnord $dstdir shift - $posix_glob set +f + set +f IFS=$oIFS prefixes= for d do - test X"$d" = X && continue + test X"$d" = X && continue - prefix=$prefix$d - if test -d "$prefix"; then - prefixes= - else - if $posix_mkdir; then - (umask=$mkdir_umask && - $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break - # Don't fail if two instances are running concurrently. - test -d "$prefix" || exit 1 - else - case $prefix in - *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; - *) qprefix=$prefix;; - esac - prefixes="$prefixes '$qprefix'" - fi - fi - prefix=$prefix/ + prefix=$prefix$d + if test -d "$prefix"; then + prefixes= + else + if $posix_mkdir; then + (umask=$mkdir_umask && + $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break + # Don't fail if two instances are running concurrently. + test -d "$prefix" || exit 1 + else + case $prefix in + *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;; + *) qprefix=$prefix;; + esac + prefixes="$prefixes '$qprefix'" + fi + fi + prefix=$prefix/ done if test -n "$prefixes"; then - # Don't fail if two instances are running concurrently. - (umask $mkdir_umask && - eval "\$doit_exec \$mkdirprog $prefixes") || - test -d "$dstdir" || exit 1 - obsolete_mkdir_used=true + # Don't fail if two instances are running concurrently. + (umask $mkdir_umask && + eval "\$doit_exec \$mkdirprog $prefixes") || + test -d "$dstdir" || exit 1 + obsolete_mkdir_used=true fi fi fi @@ -472,15 +449,12 @@ # If -C, don't bother to copy if it wouldn't change the file. if $copy_on_change && - old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && - new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && - - eval "$initialize_posix_glob" && - $posix_glob set -f && + old=`LC_ALL=C ls -dlL "$dst" 2>/dev/null` && + new=`LC_ALL=C ls -dlL "$dsttmp" 2>/dev/null` && + set -f && set X $old && old=:$2:$4:$5:$6 && set X $new && new=:$2:$4:$5:$6 && - $posix_glob set +f && - + set +f && test "$old" = "$new" && $cmpprog "$dst" "$dsttmp" >/dev/null 2>&1 then @@ -493,24 +467,24 @@ # to itself, or perhaps because mv is so ancient that it does not # support -f. { - # Now remove or move aside any old file at destination location. - # We try this two ways since rm can't unlink itself on some - # systems and the destination file might be busy for other - # reasons. In this case, the final cleanup might fail but the new - # file should still install successfully. - { - test ! -f "$dst" || - $doit $rmcmd -f "$dst" 2>/dev/null || - { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && - { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } - } || - { echo "$0: cannot unlink or rename $dst" >&2 - (exit 1); exit 1 - } - } && + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + test ! -f "$dst" || + $doit $rmcmd -f "$dst" 2>/dev/null || + { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null && + { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; } + } || + { echo "$0: cannot unlink or rename $dst" >&2 + (exit 1); exit 1 + } + } && - # Now rename the file to the real destination. - $doit $mvcmd "$dsttmp" "$dst" + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dst" } fi || exit 1 diff -Nru grsync-1.2.5/Makefile.in grsync-1.2.6/Makefile.in --- grsync-1.2.5/Makefile.in 2014-04-28 12:26:58.000000000 +0000 +++ grsync-1.2.6/Makefile.in 2016-03-15 13:08:34.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -15,7 +15,17 @@ @SET_MAKE@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -77,18 +87,13 @@ PRE_UNINSTALL = : POST_UNINSTALL = : subdir = . -DIST_COMMON = INSTALL NEWS README AUTHORS ChangeLog \ - $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/configure $(am__configure_deps) \ - $(srcdir)/config.h.in mkinstalldirs $(srcdir)/grsync.spec.in \ - $(srcdir)/grsync.desktop.in $(srcdir)/grsync.xml.in \ - $(srcdir)/it.opbyte.grsync.service.in \ - $(dist_mimepackages_DATA) COPYING compile depcomp install-sh \ - missing ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(top_srcdir)/configure \ + $(am__configure_deps) $(dist_mimepackages_DATA) \ + $(am__DIST_COMMON) am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \ configure.lineno config.status.lineno mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs @@ -196,6 +201,11 @@ CTAGS = ctags CSCOPE = cscope DIST_SUBDIRS = $(SUBDIRS) +am__DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/config.h.in \ + $(srcdir)/grsync.desktop.in $(srcdir)/grsync.spec.in \ + $(srcdir)/grsync.xml.in $(srcdir)/it.opbyte.grsync.service.in \ + AUTHORS COPYING ChangeLog INSTALL NEWS README compile depcomp \ + install-sh missing mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) @@ -438,7 +448,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -984,15 +993,15 @@ $(am__post_remove_distdir) dist-tarZ: distdir - @echo WARNING: "Support for shar distribution archives is" \ - "deprecated." >&2 + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir - @echo WARNING: "Support for distribution archives compressed with" \ - "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -1028,17 +1037,17 @@ esac chmod -R a-w $(distdir) chmod u+w $(distdir) - mkdir $(distdir)/_build $(distdir)/_inst + mkdir $(distdir)/_build $(distdir)/_build/sub $(distdir)/_inst chmod a-w $(distdir) test -d $(distdir)/_build || exit 0; \ dc_install_base=`$(am__cd) $(distdir)/_inst && pwd | sed -e 's,^[^:\\/]:[\\/],/,'` \ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ - && $(am__cd) $(distdir)/_build \ - && ../configure \ + && $(am__cd) $(distdir)/_build/sub \ + && ../../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ - --srcdir=.. --prefix="$$dc_install_base" \ + --srcdir=../.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ @@ -1242,6 +1251,8 @@ uninstall-man uninstall-man1 uninstall-mimeiconDATA \ uninstall-pixmapDATA uninstall-pixmapbusyDATA +.PRECIOUS: Makefile + distclean-local: rm -rf *.cache *~ diff -Nru grsync-1.2.5/missing grsync-1.2.6/missing --- grsync-1.2.5/missing 2014-04-28 12:26:58.000000000 +0000 +++ grsync-1.2.6/missing 2016-03-15 13:08:34.000000000 +0000 @@ -3,7 +3,7 @@ scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard , 1996. # This program is free software; you can redistribute it and/or modify diff -Nru grsync-1.2.5/NEWS grsync-1.2.6/NEWS --- grsync-1.2.5/NEWS 2014-08-19 15:46:20.000000000 +0000 +++ grsync-1.2.6/NEWS 2015-12-23 15:45:09.000000000 +0000 @@ -1,5 +1,17 @@ Grsync Release history: +Version 1.2.6 + Don't save "default" session to ini file when "remember last used session" is off + Better "before command" error notification + Added "overwrite logs" preferences option + Updated Norwegian translation (thanks Åka) + Updated Russian translation (thanks Alex) + Updated German translation (thanks Andre) + Updated Swedish translation (thanks Påvel) + Updated Simplified Chinese translation (thanks Tommy) + Enhanced and translated desktop file + Updated README file + Version 1.2.5 Fixed an uninitialized variable warning Fixed current session type change on new session creation diff -Nru grsync-1.2.5/po/ca_ES.po grsync-1.2.6/po/ca_ES.po --- grsync-1.2.5/po/ca_ES.po 2014-08-20 11:36:04.000000000 +0000 +++ grsync-1.2.6/po/ca_ES.po 2015-12-23 15:45:20.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2008-09-06 14:22+0100\n" "Last-Translator: Josep Sanchez Mesegue \n" "MIME-Version: 1.0\n" @@ -516,30 +516,40 @@ msgstr "" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Llista d'errors" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Llista d'errors de la última execució de rsync" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Inactiu" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Progrés de la transferència del fitxer actual" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Progrés global" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -549,27 +559,27 @@ "superior, d'rsync i pot donar valors erronis depenent de l'abilitat d'rsync " "per a estimar amb antelació els fitxers a copiar" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Sortida d'rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Feu clic en aquest botó per a mostrar la llista d'errors" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pausa/continua l'execució d'rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Atura rsync i tanca la finestra" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -596,31 +606,31 @@ "(ERROR) No es pot obrir el fitxer de configuració! potser és el primer cop " "que s'executa el programa?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tNo es pot desar la configuració!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Navega" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li passat, %li:%02li remanent)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulació en curs" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "La sessió que heu especificat a l'intérpret d'ordres no existeix" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -632,141 +642,141 @@ "disponible al CAMÍ predeterminat. Veieu Fitxer/Preferències per a canviar el " "camí predeterminat a l'executable de l'ordre rsync" -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 #, fuzzy msgid "** Launching AFTER command:\n" msgstr "*** Executant l'ordre DESPRÉS:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Ha finalitzat amb errors!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Ha finalitzat correctament!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 #, fuzzy msgid "** Launching BEFORE command:\n" msgstr "*** Executando l'ordre ABANS:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 #, fuzzy msgid "** Launching RSYNC command (simulation mode):\n" msgstr "*** Executant l'ordre RSYNC (en mode simulat):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 #, fuzzy msgid "** Launching RSYNC command:\n" msgstr "*** Executant l'ordre RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "No ha estat possible executar rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Aquest nom de sessió està reservat. No es pot emprar." -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Ja existeix una sessió amb aquest nom" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "No es pot esborrar la sessió predeterminada" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Esteu segur de voler esborrar la sessió '%s'?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "" -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "" -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "" -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "" -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "" -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "" -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "" -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "" -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "" -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "" -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "" -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "" -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "" -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "" -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 #, fuzzy msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" @@ -775,11 +785,11 @@ "(C) Piero Orsoni i altres. Distribuit sota GPL.\n" "Vegeu AUTHORS i COPYING per a més detalls." -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sessió importada" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sessió exportada" diff -Nru grsync-1.2.5/po/cs_CZ.po grsync-1.2.6/po/cs_CZ.po --- grsync-1.2.5/po/cs_CZ.po 2014-08-20 11:36:11.000000000 +0000 +++ grsync-1.2.6/po/cs_CZ.po 2015-12-23 15:45:20.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: cs_CZ\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2014-05-28 20:41+0100\n" "Last-Translator: Petr Šimáček \n" "Language-Team: Czech \n" @@ -514,30 +514,40 @@ "Ubuntu >= 11.4)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Seznam chyb" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Seznam Chyb posledního provedeného příkazu rsync:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Nečinný" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Průběh přenosu tohoto souboru" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Celkový průběh" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -547,27 +557,27 @@ "chybné hodnoty v závislosti na schopnostech rsync odhadnout zbývající část " "přenosu souborů" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Výstup Rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Klepněte na toto tlačítko, pokud chcete zobrazit Seznam chyb" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pozastavit / Pokračovat" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Zastaví rsync a zavře okno" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "O lomítku na konci" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -603,31 +613,31 @@ msgstr "" "(CHYBA) Nelze otevřít soubor s konfigurací! Nejedná se o první spuštění?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tNelze zapsat nastavení!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Procházet" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li uplynulo, %li:%02li zbývá)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Probíhá Simulace" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "Sezení zadané z příkazové řádky neexistuje" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -639,142 +649,142 @@ "výchozího příkazu rsync lze provést v okně dostupném pod nabídkou Soubor > " "Nastavení." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** Spuštění příkaz po:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Dokončeno s chybami!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Dokončeno úspěšně!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Stav ukončení Rsync procesu:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** Spuštění příkaz před:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** Spuštění příkazu RSYNC (mód simulace):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** Spuštění příkazu RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Nelze spustit rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Tento název sezení je rezervován, zkuste nějaký jiný" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Sezení s tímto názvem již existuje" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Nelze smazat výchozí sezení" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Opravdu chcete smazat sezení „%s“?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Ikony aplikace vytvořil Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Napsal Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "" "Kompatibilitu s platformou Maemo provedl Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "Dodatečné opravy chyb provedl Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Holandský překlad vytvořil Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "" "Překlad do zjednodušené Čínštiny vytvořil Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Francouzský překlad vytvořil xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Švédský překlad vytvořil Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Turecký překlad vytvořil Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Ruský překlad vytvořil Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Německý překlad vytvořil Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Španělský překlad vytvořil Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "" "Český překlad vytvořili Martin Balajka a Lucas Lommer " "" -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Překlad do Galicijštiny vytvořil Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Katalánský překlad vytvořil Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Brazilsko Portugalský překlad od Fábia Nogueiry " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Indonéský překlad od Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "Chorvatský překlad od Bojana Vondry " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Synchronizace souborů a složek (rozhraní pro rsync napsané pod Gtk+)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -782,11 +792,11 @@ "(C) Piero Orsoni a další. Publikováno pod GPL.\n" "Více informací obsahuje soubor COPYING" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sezení bylo importováno" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sezení bylo exportováno" diff -Nru grsync-1.2.5/po/de_DE.po grsync-1.2.6/po/de_DE.po --- grsync-1.2.5/po/de_DE.po 2014-08-20 11:36:17.000000000 +0000 +++ grsync-1.2.6/po/de_DE.po 2015-12-23 15:45:20.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: de_DE\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" -"PO-Revision-Date: 2012-04-09 20:11+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" +"PO-Revision-Date: 2015-08-01 18:13+0100\n" "Last-Translator: Dennis Baudys \n" "Language-Team: Ubuntu German Translators\n" @@ -18,7 +18,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Virtaal 0.7.0\n" +"X-Generator: Poedit 1.7.5\n" #: ../grsync.glade.h:1 msgid "Grsync" @@ -37,9 +37,8 @@ msgstr "_Zielverzeichnis auswählen …" #: ../grsync.glade.h:5 -#, fuzzy msgid "Switch source with destination" -msgstr "Quellen und Ziele vertauschen" +msgstr "Ziel und Quelle vertauschen" #: ../grsync.glade.h:6 msgid "_Simulation" @@ -533,30 +532,40 @@ "U. in Unity-Arbeitsumgebungen nicht, wie Ubuntu >= 11.04)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Fehlerprotokoll" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Fehlerprotokoll des letzten rsync-Durchlaufs:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Leerlauf" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Fortschritt der aktuellen Datei" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Gesamtfortschritt" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -566,27 +575,27 @@ "und kann eventuell falsche Werte anzeigen, dies liegt an der Methode, mit " "der rsync die zu kopierenden Dateien bestimmt" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Rsync-Ausgabe:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Auf diesen Knopf klicken, um das Fehlerprotokoll anzuzeigen" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Rsync-Ausführung anhalten/fortsetzen" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Rsync anhalten und Fenster schließen" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "Informationen zu angehängten Schrägstrichen" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -624,31 +633,31 @@ "(FEHLER) Die Konfigurationsdatei kann nicht geöffnet werden! Eventuell wird " "das Programm zum ersten mal gestartet?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tDie Einstellungen konnten nicht gespeichert werden!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Auswählen …" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li vergangen, %li:%02li verbleibend)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulation wird durchgeführt" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "Die Sitzung, die auf der Befehlszeile angegeben wurde, existiert nicht" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -660,144 +669,144 @@ "installiert oder rsync im Standard-Suchpfad (PATH) verfügbar gemacht werden. " "Siehe »Datei → Einstellungen« zum Ändern des rsync-Befehls." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** NACHHER-Befehl wird ausgeführt:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Mit Fehlern abgeschlossen!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Erfolgreich abgeschlossen!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Exit-Status des rsync-Prozesses:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** VORHER-Befehl wird ausgeführt:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** RSYNC-Befehl wird ausgeführt (Simulationsmodus):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** RSYNC-Befehl wird ausgeführt:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Rsync kann nicht ausgeführt werden" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Dieser Sitzungsname ist reserviert und kann nicht verwendet werden" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Dieser Sitzungsname ist bereits vergeben" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Die Standard-Sitzung kann nicht gelöscht werden" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Soll die Sitzung »%s« wirklich gelöscht werden?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Anwendungssymbole von Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Entwickelt von Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Maemo-Unterstützung von Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" "Zusätzliche Fehlerbehebung von Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Holländische Übersetzung von Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "" "Vereinfachte chinesische Übersetzung von Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Französische Übersetzung von xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Schwedische Übersetzung von Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Türkische Übersetzung von Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Russische Übersetzung von Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Deutsche Übersetzung von Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Spanische Übersetzung von Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Tschechische Übersetzung von Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Galicische Übersetzung von Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Katalanische Übersetzung von Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Brasilianisch-portugiesische Übersetzung von Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Indonesische Übersetzung von Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " -msgstr "" +msgstr "Kroatische Übersetzung von Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "" "Dateien und Ordner abgleichen (eine grafische rsync-Benutzeroberfläche " "basierend auf GTK)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -805,11 +814,11 @@ "© Piero Orsoni und andere. Unter der GPL veröffentlicht.\n" "Für weitere Informationen siehe COPYING." -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sitzung wurde importiert" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sitzung wurde exportiert" diff -Nru grsync-1.2.5/po/es_ES.po grsync-1.2.6/po/es_ES.po --- grsync-1.2.5/po/es_ES.po 2014-08-20 11:36:21.000000000 +0000 +++ grsync-1.2.6/po/es_ES.po 2015-12-23 15:45:20.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: rsync.master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2011-04-28 22:53+0200\n" "Last-Translator: Jorge González \n" "Language-Team: Español \n" @@ -533,30 +533,40 @@ "en la bandeja del sistema, en lugar de en la barra de aplicaciones" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Lista de errores" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Lista de errores de la última ejecución de rsync:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Inactivo" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Progreso de la transferencia del archivo actual" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Progreso global" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -566,27 +576,27 @@ "ofrecer valores erróneos y dependiendo de la capacidad de rsync para hacer " "una estimación de los archivos que faltan por copiar" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Salida de rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Pulsar este botón para mostrar la lista de errores" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pausar/continuar la ejecución de rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Parar rsync y cerrar la ventana" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "Acerca de las barras sobrantes" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 #, fuzzy msgid "" "A trailing slash on the source directory avoids creating an additional " @@ -624,31 +634,31 @@ "(ERROR) No se puede abrir el archivo de configuración. ¿Es esta la primera " "vez que se ejecuta el programa?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tNo se pudo guardar la configuración.\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Examinar" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li transcurrido, quedan %li:%02li)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulación en curso" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "La sesión que ha especificado en la línea de comando no existe" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -660,144 +670,144 @@ "disponible en la RUTA predeterminada correspondiente. Ver Archivo/" "Preferencias para cambiar la ruta predeterminada al comando ejecutable rsync." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 #, fuzzy msgid "** Launching AFTER command:\n" msgstr "*** Ejecutando comando POSTERIOR:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Completado con errores." -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Completado correctamente." -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Estado del proceso de salida de rsync: " -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 #, fuzzy msgid "** Launching BEFORE command:\n" msgstr "*** Ejecutando comando ANTERIOR:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 #, fuzzy msgid "** Launching RSYNC command (simulation mode):\n" msgstr "*** Ejecutando comando RSYNC (modo simulado):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 #, fuzzy msgid "** Launching RSYNC command:\n" msgstr "*** Ejecutando comando RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "No se pudo ejecutar rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "No puede usar este nombre, está reservado" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Ya existe una sesión con este nombre" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "No puede eliminar la sesión predeterminada" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "¿Está seguro de que quiere eliminar la sesión «%s»?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Iconos de la aplicación por Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Escrito por " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Compatibilidad con Maemo por Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" "Correcciones de errores adicionales por Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Traducción al neerlandés por Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Traducción al chino simplificado por Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Traducción al francés por Xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Traducción al sueco por Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Traducción al turco por Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Traducción al ruso por Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Traducción al alemán por Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Traducción al español por Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Traducción al checo por Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Traducción al gallego por Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Traducción al catalán por Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "" -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Sincronizar archivos y carpetas (un IGU GTK+ para rsync)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -805,11 +815,11 @@ "(C) Piero Orsoni y otros. Distribuido bajo GPL.\n" "Para obtener más detalles, consultar los archivos AUTHORS y COPYING." -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sesión importada" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sesión exportada" diff -Nru grsync-1.2.5/po/fr_FR.po grsync-1.2.6/po/fr_FR.po --- grsync-1.2.5/po/fr_FR.po 2014-08-20 11:36:27.000000000 +0000 +++ grsync-1.2.6/po/fr_FR.po 2015-12-23 15:45:20.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2011-06-08 00:35+0100\n" "Last-Translator: Philippe Corbes \n" "Language-Team: French \n" @@ -526,30 +526,40 @@ "d'état système au lieu de la barre d'application" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Liste des erreurs" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Liste des erreurs du dernier rsync :" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Repos" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Progression du transfert du fichier en cours" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Progression globale" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -559,27 +569,27 @@ "rsync 2.6.1 ou supérieure, et peut retourner une fausse valeur en fonction " "de l'habilité de rsync à estimer les fichiers à copier en avance" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Sortie de rsync : " -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Cliquer sur ce boutton pour montrer la liste d'erreurs" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pause/reprise de rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Arrêter rsync et fermer la fenêtre" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "A propos des slash en fin de ligne" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -615,31 +625,31 @@ "(ERREUR) Impossible d'ouvrir le fichier de configuration ! Est-ce la " "première utilisation du logiciel ?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tImpossible de sauvegarder les réglages !\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Parcourir" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li écoulé, %li:%02li restant)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulation en cours" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "La session spécifiée dans la ligne de commande n'existe pas" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -650,149 +660,149 @@ "l'exécution de Grsync. Le programme rsync doit être installé ou son chemin " "défini dans la variable PATH." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 #, fuzzy msgid "** Launching AFTER command:\n" msgstr "Lancement de la commande APRÈS rsync :\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Complété avec erreurs !" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Terminé avec succès !" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Code d'erreur retourné par rsync:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 #, fuzzy msgid "** Launching BEFORE command:\n" msgstr "Lancement de la commande AVANT rsync :\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 #, fuzzy msgid "** Launching RSYNC command (simulation mode):\n" msgstr "*** Lancement de la commande RSYNC (simulation) :\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 #, fuzzy msgid "** Launching RSYNC command:\n" msgstr "*** Lancement de la commande RSYNC :\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Ne peut exécuter rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Ce nom de session est réservé, vous ne pouvez pas l'appeler ainsi" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Une session du même nom existe déjà" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Vous ne pouvez pas effacer la session initiale" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Êtes vous sûr de vouloir supprimer la session '%s' ?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Icônes de l'application par Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Écrit par Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Compatibilité Maemo par Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" "Résolution de bogues supplémentaires par Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Traduction en Néerlandais par Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Traduction en Chinois simplifié par Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 #, fuzzy msgid "French translation by xavier " msgstr "" "Traduction en Français par Xavier et Philippe Corbes " "" -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Traduction en Suédois par Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Traduction en Turc par Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Traduction en Russe par Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Traduction en Allemand par Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Traduction en Espagnole par Castilla Ibon Varela" -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Traduction en Tchèque par Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Traduction en Galicien par Daniel espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Traduction en Catalan par Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Traduction en Portugais brésilien par Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Traduction en Indonésien par Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "" "Synchronise les fichiers et dossiers (une interface graphique GTK pour " "rsync)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -800,11 +810,11 @@ "(c) Piero Orsoni et autres. Placé sous licence GPL\n" "Voir COPYING pour plus de détails" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Session importée" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Session sauvegardée" diff -Nru grsync-1.2.5/po/gl_ES.po grsync-1.2.6/po/gl_ES.po --- grsync-1.2.5/po/gl_ES.po 2014-08-20 11:36:36.000000000 +0000 +++ grsync-1.2.6/po/gl_ES.po 2015-12-23 15:45:20.000000000 +0000 @@ -3,7 +3,7 @@ msgstr "" "Project-Id-Version: 0.1.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2008-08-29 19:28+0200\n" "Last-Translator: Daniel Espinheira \n" "Language-Team: Galician\n" @@ -504,30 +504,40 @@ msgstr "" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Listaxe de erros" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Listaxe de erros da última execución de rsync:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Inactivo" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Progreso da transferencia do ficheiro actual" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Progreso global" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -537,27 +547,27 @@ "novas de rsync, e pode reportar valores errados dependendo da habilidade de " "rsync para estimar os ficheiros que restan por copiar" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Saída de rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pausar/continuar a execución de rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Detén rsync e pecha a ventá" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -584,31 +594,31 @@ "(ERRO) Non se pode abrir o ficheiro de configuración! Pode que sexa a " "primeira vez que executa o programa?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tFoi imposíbel gardar as configuracións!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Explorar" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li transcorrido, %li:%02li restante)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulación en curso" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "A sesión que especificou na liña de comando non existe" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -621,139 +631,139 @@ "(PATH). Consulte Ficheiro/Preferencias para cambiar o comando predeterminado " "para a execución de rsync." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 #, fuzzy msgid "** Launching AFTER command:\n" msgstr "*** Lanzando comando DESPOIS:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Completado con erros!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Completado con éxito!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 #, fuzzy msgid "** Launching BEFORE command:\n" msgstr "*** Lanzando comando ANTES:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 #, fuzzy msgid "** Launching RSYNC command (simulation mode):\n" msgstr "*** Lanzando comando RSYNC (modo Simulación):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 #, fuzzy msgid "** Launching RSYNC command:\n" msgstr "*** Lanzando comando RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Non se pode executar rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "O nome da sesión está reservado, non se pode chamar deste xeito" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Xa existe unha sesión có mesmo nome" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Non pode eliminar a sesión predeterminada" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Está seguro/a de que quere borrar a sesión '%s' ?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "" -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "" -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "" -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "" -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "" -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "" -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "" -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "" -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "" -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "" -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "" -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "" -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "" -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "" -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 #, fuzzy msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" @@ -762,11 +772,11 @@ "(c) Piero Orsoni e outros. Liberado baixo a GPL\n" "Ver AUTHORS e COPYING para máis detalles" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sesión importada" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sesión exportada" diff -Nru grsync-1.2.5/po/hr_HR.po grsync-1.2.6/po/hr_HR.po --- grsync-1.2.5/po/hr_HR.po 2014-08-20 11:35:12.000000000 +0000 +++ grsync-1.2.6/po/hr_HR.po 2015-12-23 15:45:21.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2012-03-20 11:05+0100\n" "Last-Translator: Bojan Vondra \n" "Language-Team: Italian \n" @@ -520,30 +520,40 @@ "površini (možda neće raditi na okruženju Unity, kao Ubuntu >= 11.4)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Popis grešaka" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Popis grešaka prilikom zadnjeg pokretanja rsync-a:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "U mirovanju" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Progres prijenosa trenutne datoteke" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Globalni napredak" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -553,27 +563,27 @@ "i može prijaviti pogrešnu vrijednost ovisno o mogućnosti procjene rsync-a o " "broju datoteka koje treba unaprijed kopirati" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "rsync izlaz:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Kliknite ovo dugme za prikaz popisa grešaka" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pauziraj/pokreni izvršenje rsync-a" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Zaustavlja rsync i zatvara prozor" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "O posljednjim kosim crtama" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -608,31 +618,31 @@ "(ERRORE) Ne mogu otvoriti konfiguracijsku datoteku! Možda je ovo prvo " "pokretanje?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tNe mogu spremiti postavke!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Navigacija" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li proteklo, %li:%02li preostalo)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulacija u progresu" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "Sjednica koju ste specificirali u naredbenoj liniji ne postoji" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -644,135 +654,135 @@ "izvršnih datoteka. Pogledati Datoteka/Postavke za početnu izvršnu naredbu " "rsync-a." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** Pokretanje naredbe POSLIJE:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Završeno s greškama!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Uspješno završeno!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Status izlaza rsync procesa: " -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** Pokretanje naredbe PRIJE:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** Pokretanje naredbe RSYNC (simulacijski mod):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** Pokretanje naredbe RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Ne mogu pokrenuti rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Ime ove sjednice je već rezervirano, ne možete je tako nazvati" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Sjednica ovog imena već postoji" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Ne možete obrisati početnu sjednicu" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Jeste li sigurni da želite obrisati sjednicu '%s'?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Ikone aplikacije Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Napisao Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Kompatibilnost s Maemo-m Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "Dodatne ispravke greški Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Nizozemski prievod Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Pojednostavnjeni kineski prijevod Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Francuski prijedvod xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Švedski prijevod Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Turski prijevod Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Ruski prijevod Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Njemački prijevod Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Španjolski prijevod Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Češki prijevod Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "Galicijski prijevod Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Katalonski prijevod Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "Portugalski prijevod Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Indonezijski prijevod Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "Hrvatski prijevod Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Sinkornizacija datoteka i mapa (GTK GUI za rsync)" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -780,11 +790,11 @@ "(C) Piero Orsoni i drugi. Objavljeno pod GPL.\n" "Pogledati datoteku COPYING za detalje" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Uvezena sjednica" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Izvezena sjednica" diff -Nru grsync-1.2.5/po/hu_HU.po grsync-1.2.6/po/hu_HU.po --- grsync-1.2.5/po/hu_HU.po 2014-08-20 11:36:47.000000000 +0000 +++ grsync-1.2.6/po/hu_HU.po 2015-12-23 15:45:21.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grsync 1.2.4\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2013-12-06 18:49+0100\n" "Last-Translator: Gabor Kelemen \n" "Language-Team: Hungarian \n" @@ -520,30 +520,40 @@ "újabb rendszereken)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Hibalista" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Az utolsó rsync futás hibalistája:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Üresjárat" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Aktuális fájl átvitelének haladása" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Globális haladás" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -553,27 +563,27 @@ "működik, és hibás értékeket adhat attól függően, hogy az rsync hogyan tudja " "előre felbecsülni a másolandó fájlokat" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Rsync kimenet:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "A hibalista megjelenítése" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Az rsync futásának felfüggesztése/folytatása" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Leállítja az rsyncet és bezárja az ablakot" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "A záró osztásjelekről" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -608,31 +618,31 @@ msgid "(ERROR) Can't open config file! Maybe this is the first run?\n" msgstr "(HIBA) Nem nyitható meg a beállítófájl! Talán ez az első futás?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tNem menthetők a beállítások!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Tallózás" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li eltelt, %li:%02li van hátra)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Szimulálás folyamatban" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "A parancssorban megadott munkamenet nem létezik" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -644,136 +654,136 @@ "alapértelmezett keresési útvonalon (PATH változó). A Fájl/Beállítások alatt " "megváltoztathatja az alapértelmezett rsync végrehajtható parancsot." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** Az UTÁNA parancs indítása:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Hibákkal fejeződött be!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Sikeresen befejeződött" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Az rsync folyamat kilépési állapota:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** Az ELŐTTE parancs indítása:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** Az RSYNC parancs indítása (szimulálás mód):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** Az RSYNC parancs indítása:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Az rsync nem hajtható végre" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Ez a munkamenetnév fenntartott, nem használhatja" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Már létezik ilyen nevű munkamenet" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Nem törölheti az alapértelmezett munkamenetet" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Valóban törölni akarja a munkamenetet („%s”)?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Alkalmazásikonok: Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Írta: Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Maemo kompatibilitás: Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "További hibajavítás: Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Holland fordítás: Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Egyszerűsített kínai fordítás: Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Francia fordítás: xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Svéd fordítás: Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Török fordítás: Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Orosz fordítás: Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Német fordítás: Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Spanyol fordítás: Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Cseh fordítás: Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "Galíciai fordítás: Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Katalán fordítás: Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "Brazíliai portugál fordítás: Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Indonéz fordítás: Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "Horvát fordítás: Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Fájlok és mappák szinkronizálása (GTK felület az rsynchez)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -781,10 +791,10 @@ "(C) Piero Orsoni és mások. Kiadva a GPL alatt.\n" "Részletekért lásd a COPYING fájlt." -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Munkamenet importálva" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Munkamenet exportálva" diff -Nru grsync-1.2.5/po/id_ID.po grsync-1.2.6/po/id_ID.po --- grsync-1.2.5/po/id_ID.po 2014-08-20 11:36:50.000000000 +0000 +++ grsync-1.2.6/po/id_ID.po 2015-12-23 15:45:21.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grsync 1.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2010-07-02 15:55+0730\n" "Last-Translator: Waluyo Adi Siswanto \n" "Language-Team: Indonesian \n" @@ -519,30 +519,40 @@ "kotak aplikasi" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Daftar kesalahan" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Daftar kesalahan rsync terakhir:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Tidak Jalan" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Prekembangan pengiriman berkas yang sekarang" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Perkembangan global" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -552,27 +562,27 @@ "yang terbaru, dan dapat melaporkan angka yang tergantung dari kemampuan " "rsync untuk mempertimbangkan berkas yang disalin terlebih dahulu" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Keluaran rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Klik tombol ini untuk menampilkan daftar kesalahan" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Berhenti/teruskan rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Hentikan rsync dan menutup jendela" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "Tentang garis miring dibelakang" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 #, fuzzy msgid "" "A trailing slash on the source directory avoids creating an additional " @@ -611,31 +621,31 @@ "(KESALAHAN) Tidak bisa membuka berkas konfigurasi! Mungkin pertama kali " "menjalankan?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tTidak bisa menyimpan pengaturan!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Cari" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li berlalu, tinggal %li:%02li)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulasi sedang berjalan" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "Sesi yang anda masksudkan dalam perintah baris tidak ditemukan" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -647,143 +657,143 @@ "PATH yang bisa dijalankan. Lihat berkas/preferensi untuk merubah perintah " "bawaan rsync yang bisa dijalankan." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 #, fuzzy msgid "** Launching AFTER command:\n" msgstr "*** Dilaksanakan SETELAH perintah:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Selesai tapi ada kesalahan!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Selesai dengan sukses!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Status proses rsync saat keluar:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 #, fuzzy msgid "** Launching BEFORE command:\n" msgstr "*** Dilaksanakan SEBELUM perintah:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 #, fuzzy msgid "** Launching RSYNC command (simulation mode):\n" msgstr "*** Menjalankan perintah RSYNC (mode simulasi):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 #, fuzzy msgid "** Launching RSYNC command:\n" msgstr "*** Menjalankan perintah RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Tidak bisa menjalankan rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "" "Nama sesi ini tidak boleh digunakan, anda tidak bisa menamakan seperti ini" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Sesi dengan nama ini sudah ada" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Anda tidak diijinkan menghapus sesi bawaan" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Apakah anda yakin akan menghapus sesi '%s' ?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Ikon aplikasi oleh Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Dibuat Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Kompatibilitas Maemo oleh Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "Tambahan perbaikan kutu oleh Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Alih bahasa Belanda oleh Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Alih bahasa Cina oleh Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Alih bahasa Perancis oleh xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Alih bahasa Swedia oleh Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Alih bahasa Turki oleh Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Alih bahasa Rusia oleh Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Alih bahasa Jerman oleh Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Alih bahasa Spanyol oleh Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Alih bahasa Ceko oleh Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Alih bahasa Galisia oleh Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Alih bahasa Katalan oleh Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Alih bahasa Portugis Brasil oleh Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Alih bahasa Indonesia oleh Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Sinkronisasi berkas dan folder (GTK GUI untuk rsync)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -791,10 +801,10 @@ "(C) Piero Orsoni dan kawan. Rilis dalam GPL.\n" "Lihat PENGGANDAAN untuk informasi terperinci" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sesi diimpor" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sesi diekspor" diff -Nru grsync-1.2.5/po/it_IT.po grsync-1.2.6/po/it_IT.po --- grsync-1.2.5/po/it_IT.po 2014-08-20 11:38:04.000000000 +0000 +++ grsync-1.2.6/po/it_IT.po 2015-12-23 15:48:12.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 1.0.0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2010-07-01 16:39+0200\n" "Last-Translator: Piero Orsoni \n" "Language-Team: Italian \n" @@ -519,30 +519,44 @@ "ambiente Unity, come Ubuntu >= 11.4)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "Sovrascrivi i log" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" +"Attiva la sovrascrittura dei log (file di registro). Quando attivo, ogni " +"volta che si lancia una sessione, il relativo log viene riscritto, con il " +"vantaggio di risparmiare spazio su dico, ma perdendo il log delle sessioni " +"precedenti" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Lista errori" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Lista errori dell'ultima esecuzione:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Attesa" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Stato trasferimento del file corrente" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Stato globale" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -552,27 +566,27 @@ "successivi, e puo' mostrare valori sbagliati a seconda della capacita' di " "rsync di stimare i file da copiare in anticipo" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Risultato di rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Clicca qui per vedere la lista degli errori" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Metti in pausa/riparti" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Interrompe rsync e chiude la finestra" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "Circa le barre finali" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -610,31 +624,31 @@ "(ERRORE) Impossibile aprire il file di configurazione! Forse e' la prima " "esecuzione?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tImpossibile salvare le impostazioni!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Sfoglia" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li passati, %li:%02li rimanenti)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulazione in corso" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "La sessione che hai specificato da riga di comando non esiste" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -646,140 +660,140 @@ "PATH (percorso) predefinito per i programmi. Vedi file/preferenze per " "cambiare il comando rsync da usare" -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** Avvio del comando PRIMA:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Completato con errori!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Completato con successo!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Stato di uscita del processo rsync: " -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** Avvio del comando DOPO:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** Avvio del comando RSYNC (modalita' simulazione):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** Avvio del comando RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Impossibile eseguire rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Questo nome di sessione e' riservato, non lo si puo' usare" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Esiste gia' una sessione con questo nome" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Non puoi cancellare la sessione di default" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Sei sicuro di voler cancellare la sessione '%s'?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Icona applicazione di Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Scritto da Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Compatibilita' con Maemo di Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" "Correzione errori aggiuntiva di Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Traduzione in Olandese di Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Traduzione in Cinese semplificato di Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Traduzione in Francese di xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Traduzione in Svedese di Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Traduzione in Turco di Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Traduzione in Russo di Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Traduzione in Tedesco di Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Traduzione in Spagnolo di Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Traduzione in Ceco di Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Traduzione in Galiziano di Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Traduzione in Catalano di Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Traduzione in Portoghese Brasiliano di Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Traduzione in Indonesiano di Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "Traduzione in Croato di Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Sincronizza file e cartelle (una GUI GTK di rsync)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -787,11 +801,11 @@ "(C) Piero Orsoni ed altri. Distribuito con GPL.\n" "Leggi COPYING per dettagli" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sessione importata" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sessione esportata" diff -Nru grsync-1.2.5/po/nb_NO.po grsync-1.2.6/po/nb_NO.po --- grsync-1.2.5/po/nb_NO.po 2014-08-20 11:36:58.000000000 +0000 +++ grsync-1.2.6/po/nb_NO.po 2015-12-23 15:45:20.000000000 +0000 @@ -1,22 +1,24 @@ -# translation of grsync.po to -# translation of nb.po to -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. +# Norwegian bokmål translation of grsync +# Copyright (C) 2014 Piero Orsoni +# This file is distributed under the same license as the grsync package. # # Alexander Nicolaysen Sørnes , 2006. +# Åka Sikrom , 2015. msgid "" msgstr "" "Project-Id-Version: grsync\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" -"PO-Revision-Date: 2006-07-10 01:40+0200\n" -"Last-Translator: Alexander Nicolaysen Sørnes \n" -"Language-Team: \n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" +"PO-Revision-Date: 2015-03-19 11:22+0100\n" +"Last-Translator: Åka Sikrom \n" +"Language-Team: Norwegian bokmål \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: KBabel 1.11.2\n" +"X-Generator: poedit\n" +"X-Poedit-Language: nb_NO\n" +"X-Poedit-Country: NORWAY\n" #: ../grsync.glade.h:1 msgid "Grsync" @@ -35,31 +37,28 @@ msgstr "Finn _mål" #: ../grsync.glade.h:5 -#, fuzzy msgid "Switch source with destination" -msgstr "Bytt kilde med mål" +msgstr "Bytt om kilde og mål" #: ../grsync.glade.h:6 msgid "_Simulation" -msgstr "_Simuler" +msgstr "_Simulering" #: ../grsync.glade.h:7 -#, fuzzy msgid "_Rsync command line" -msgstr "_Rsync-info" +msgstr "_Rsync-kommandoilinje" #: ../grsync.glade.h:8 -#, fuzzy msgid "S_essions" msgstr "_Økter" #: ../grsync.glade.h:9 msgid "_Import" -msgstr "" +msgstr "_Importer" #: ../grsync.glade.h:10 msgid "_Export" -msgstr "" +msgstr "_Eksporter" #: ../grsync.glade.h:11 msgid "_Help" @@ -71,7 +70,7 @@ #: ../grsync.glade.h:13 msgid "_Contribute" -msgstr "" +msgstr "_Bidra" #: ../grsync.glade.h:14 msgid "Click to add a new session" @@ -79,18 +78,17 @@ #: ../grsync.glade.h:15 msgid "Click to delete the current session" -msgstr "Trykk for å slette denne økten" +msgstr "Trykk for å slette gjeldende økt" #: ../grsync.glade.h:16 msgid "" "Show what would have been done, but actually do nothing (\"dry-run\" in " "rsync language)" msgstr "" -"Vis hva som ville ha blitt gjort, men gjør ingenting («tørrkjøring» på rsync-" -"språket)" +"Vis hva som ville blitt gjort, men ikke gjør noe (kjent som «dry-run» på " +"rsync-språk)" #: ../grsync.glade.h:17 -#, fuzzy msgid "_Simulate" msgstr "_Simuler" @@ -120,19 +118,19 @@ #: ../grsync.glade.h:24 msgid "Do not cross filesystem boundaries" -msgstr "Ikke gå over filsystemgrenser" +msgstr "Ikke kryss filsystemgrenser" #: ../grsync.glade.h:25 msgid "Delete on destination" -msgstr "Slett i mål" +msgstr "Slett filer i mål" #: ../grsync.glade.h:26 msgid "Delete files in destination which are not present in the source" -msgstr "Slett filer i målet som ikke er i kilden" +msgstr "Slett filer i målet som ikke finnes i kilden" #: ../grsync.glade.h:27 msgid "Verbose" -msgstr "Utdypet" +msgstr "Detaljert" #: ../grsync.glade.h:28 msgid "Show more information" @@ -140,67 +138,63 @@ #: ../grsync.glade.h:29 msgid "Show transfer progress" -msgstr "Vis framgangslinje" +msgstr "Vis framdrift" #: ../grsync.glade.h:30 -#, fuzzy msgid "Ignore existing" -msgstr "Hopp over eksisterende" +msgstr "Ignorer eksisterende" #: ../grsync.glade.h:31 msgid "Ignore files which already exist in the destination" -msgstr "Overse filer som allerede finnes i målet" +msgstr "Ignorer filer som finnes i målet allerede" #: ../grsync.glade.h:32 -#, fuzzy msgid "Size only" -msgstr "Kun størrelse" +msgstr "Bare størrelse" #: ../grsync.glade.h:33 msgid "Check size only, ignore time and checksum" -msgstr "Kun kontroller størrelse; overse tid og kontrollsum" +msgstr "Bare kontroller størrelse, og ignorer tid og kontrollsum" #: ../grsync.glade.h:34 msgid "Skip newer" -msgstr "" +msgstr "Hopp over nyere fil" #: ../grsync.glade.h:35 -#, fuzzy msgid "Do not update newer files" -msgstr "Oppdater kun eksisterende filer" +msgstr "Ikke oppdater nyere filer" #: ../grsync.glade.h:36 msgid "Windows compatibility" -msgstr "" +msgstr "Windows-kompatiblitet" #: ../grsync.glade.h:37 msgid "Provides workaround for a windows FAT filesystem limitation" -msgstr "" +msgstr "Jobber rundt begrensninger som påløper ved bruk av FAT-filsystemer" #: ../grsync.glade.h:38 msgid "Click to open the file browser" -msgstr "Trykk for å åpne bla-vinduet" +msgstr "Trykk for å åpne filutforsker" #: ../grsync.glade.h:39 msgid "Source directory" -msgstr "Kildekatalog" +msgstr "Kildemappe" #: ../grsync.glade.h:40 msgid "Destination directory" -msgstr "Målkatalog" +msgstr "Målmappe" #: ../grsync.glade.h:41 msgid "Click here to switch the source with the destination directory" -msgstr "Trykk her for å bytte kildekatalogen med målkatalogen" +msgstr "Trykk her for å bytte kildemappe med målmappe" #: ../grsync.glade.h:42 -#, fuzzy msgid "Source and Destination:" -msgstr "Finn _mål" +msgstr "Kilde og mål:" #: ../grsync.glade.h:43 msgid "Basic options" -msgstr "Basisoppsett" +msgstr "Generelle valg" #: ../grsync.glade.h:44 msgid "Always checksum" @@ -208,7 +202,7 @@ #: ../grsync.glade.h:45 msgid "Always compare file contents (by checksum)" -msgstr "Alltid kontroller filinnhold (med kontrollsum)" +msgstr "Kontroller filinnhold med kontrollsum" #: ../grsync.glade.h:46 msgid "Preserve devices" @@ -216,7 +210,7 @@ #: ../grsync.glade.h:47 msgid "Only update existing files" -msgstr "Oppdater kun eksisterende filer" +msgstr "Bare oppdater filer som finnes allerede" #: ../grsync.glade.h:48 msgid "Keep partially transferred files" @@ -224,37 +218,37 @@ #: ../grsync.glade.h:49 msgid "Don't map uid/gid values" -msgstr "Ikke slå opp uid-/gid-verdier" +msgstr "Ikke tildel uid-/gid-verdier" #: ../grsync.glade.h:50 msgid "Keep numeric uid/gid instead of mapping user names and group names" msgstr "" -"Behold numeriske uid-/gid-verdier i stedet for å slå opp bruker- og " +"Behold numeriske uid-/gid-verdier, i stedet for å slå opp bruker- og " "gruppenavn" #: ../grsync.glade.h:51 -#, fuzzy msgid "Additional options:" -msgstr "Avansert oppsett" +msgstr "Tilleggsvalg:" #: ../grsync.glade.h:52 msgid "Compress file data" -msgstr "Komprimer fildata" +msgstr "Komprimer data" #: ../grsync.glade.h:53 -#, fuzzy msgid "" "Compress file data when transferring (useful only if at least one side is " "remote)" -msgstr "Komprimer fildata under overføring" +msgstr "" +"Komprimer filinnhold under overføring (nyttig hvis kilde og/eller mål er " +"eksternt plassert)" #: ../grsync.glade.h:54 msgid "Copy symlinks as symlinks" -msgstr "Behold symbolkse koblinger" +msgstr "Behold symbolske lenker" #: ../grsync.glade.h:55 msgid "Symbolic links are copied as such, do not copy link target file" -msgstr "Symbolske koblinger kopieres, ikke filene de peker til" +msgstr "Symbolske lenker kopieres som lenker, i stedet for filene de peker på" #: ../grsync.glade.h:56 msgid "Make backups" @@ -262,56 +256,58 @@ #: ../grsync.glade.h:57 msgid "Make backups of existing files on the destination" -msgstr "Lag sikkerhetskopier av eksisterende filer i målet" +msgstr "" +"Ta sikkerhetskopier av filer i målet som blir overskrevet eller slettet" #: ../grsync.glade.h:58 -#, fuzzy msgid "Copy hardlinks as hardlinks" -msgstr "Behold symbolkse koblinger" +msgstr "Kopier harde lenker som harde lenker" #: ../grsync.glade.h:59 -#, fuzzy msgid "Hard links are copied as such, do not copy link target file" -msgstr "Symbolske koblinger kopieres, ikke filene de peker til" +msgstr "Harde lenker kopieres som de er, i stedet for at lenkemålet kopieres" #: ../grsync.glade.h:60 msgid "Show itemized changes list" -msgstr "" +msgstr "Vis endringsliste" #: ../grsync.glade.h:61 msgid "Show additional information on every changed file" -msgstr "" +msgstr "Vis ekstra informasjon om hver endrede fil" #: ../grsync.glade.h:62 msgid "Disable recursion" -msgstr "" +msgstr "Slå av rekursjon" #: ../grsync.glade.h:63 msgid "If checked the subdirectories of the source folder will be ignored" msgstr "" +"Hvis dette er valgt, blir eventuelle undermapper av kildemappa ignorert" #: ../grsync.glade.h:64 msgid "Additional command line options to pass to the rsync program" -msgstr "" -"Ytterligere innstillinger som skal gis til rsync-programmet på kommandolinjen" +msgstr "Flere kommandolinjevalg som skal sendes videre til rsync" #: ../grsync.glade.h:65 msgid "Protect remote args" -msgstr "" +msgstr "Beskytt eksterne argumenter" #: ../grsync.glade.h:66 msgid "" "Protect remote arguments from shell expansion, Avoids the need to manually " "escape remote folders and other options which use file names like --exclude" msgstr "" +"Beskytt eksterne argumenter fra skall-utvidelse. Dette fjerner behovet for å " +"bruke skiftetegn på mapper og andre valg som bruker filnavn som f.eks. «--" +"exclude»" #: ../grsync.glade.h:67 msgid "Advanced options" -msgstr "Avansert oppsett" +msgstr "Avanserte valg" #: ../grsync.glade.h:68 msgid "Execute this command before rsync:" -msgstr "" +msgstr "Kjør denne kommandoen før rsync:" #: ../grsync.glade.h:69 msgid "" @@ -319,10 +315,13 @@ "useful, for instance, to mount a filesystem before starting or to do some " "cleanup." msgstr "" +"Trykk på dette elementet hvis du vil kjøre en kommando før synkronisering " +"begynner. Dette kan f.eks. brukes til å montere et filsystem eller kjøre et " +"ryddeskript." #: ../grsync.glade.h:70 msgid "Execute this command after rsync:" -msgstr "" +msgstr "Kjør denne kommandoen etter rsync:" #: ../grsync.glade.h:71 msgid "" @@ -330,30 +329,35 @@ "useful, for instance, to unmount a filesystem at the end or to do some " "cleanup." msgstr "" +"Trykk på dette elementet hvis du vil kjøre en kommando når synkronisering er " +"fullført. Dette kan f.eks. brukes til å avmontere et filsystem eller kjøre " +"et ryddeskript." #: ../grsync.glade.h:72 msgid "Browse files instead of folders" -msgstr "" +msgstr "Bla gjennom filer i stedet for mapper" #: ../grsync.glade.h:73 msgid "" "By setting this switch, the browse source and destination buttons will open " "a dialog for selecting files instead of folders" msgstr "" +"Hvis du velger dette, brukes knappene «Finn kilde» og «Finn mål» til å finne " +"filer i stedet for mapper" #: ../grsync.glade.h:74 msgid "Halt on failure" -msgstr "" +msgstr "Stopp ved programfeil" #: ../grsync.glade.h:75 msgid "" "When running the \"before\" command, if it fails for some reason, don't run " "rsync and halt" -msgstr "" +msgstr "Ikke kjør rsync hvis en kommando som kjøres først blir mislykket" #: ../grsync.glade.h:76 msgid "On rsync error only" -msgstr "" +msgstr "Bare ved rsync-feil" #: ../grsync.glade.h:77 msgid "" @@ -362,66 +366,65 @@ "trouble.\n" "Try a command like \"mail -s 'rsync error' you@domain.com\"." msgstr "" +"Bare kjør en kommando etter synkronisering hvis synkronisering ble utført " +"med feilmeldinger.\n" +"Dette kan f.eks. brukes til å sende en e-postmelding.\n" +"Prøv «mail -s 'rsync error' navn@domene.com» eller liknende." #: ../grsync.glade.h:80 msgid "Notes:" -msgstr "" +msgstr "Notater:" #: ../grsync.glade.h:81 -#, fuzzy msgid "Free text notes on the current session" -msgstr "Trykk for å slette denne økten" +msgstr "Notater om gjeldende økt (fritekst)" #: ../grsync.glade.h:82 msgid "Run as superuser" -msgstr "" +msgstr "Kjør som superbruker" #: ../grsync.glade.h:83 msgid "" "Run rsync with superuser (root, administrator) privileges. Use this if you " "need to access system files, for example when doing a full system backup." msgstr "" +"Kjør rsync som superbruker. BRuk dette hvis du skal synkronisere systemfiler." #: ../grsync.glade.h:84 -#, fuzzy msgid "Extra options" -msgstr "Basisoppsett" +msgstr "Ekstravalg" #: ../grsync.glade.h:85 msgid "Include these sessions:" -msgstr "" +msgstr "Ta med disse øktene:" #: ../grsync.glade.h:86 -#, fuzzy msgid "Set options" -msgstr "Basisoppsett" +msgstr "Bruk innstillinger" #: ../grsync.glade.h:87 -#, fuzzy msgid "Add session" -msgstr "_Økter" +msgstr "Legg til økt" #: ../grsync.glade.h:88 -#, fuzzy msgid "Enter session name you want to create:" -msgstr "Skriv inn navnet på den nye økten som skal opprettes" +msgstr "Skriv inn navn på økta du vil opprette:" #: ../grsync.glade.h:89 msgid "Enter the name of the new session to create" -msgstr "Skriv inn navnet på den nye økten som skal opprettes" +msgstr "Skriv inn navn på ny økt som skal opprettes" #: ../grsync.glade.h:90 -#, fuzzy msgid "Add as session set" -msgstr "_Økter" +msgstr "Legg til som kombinasjon av økter" #: ../grsync.glade.h:91 msgid "Create a new session set instead of a normal session" -msgstr "" +msgstr "Lag en ny kombinasjon av økter i stedet for en vanlig økt" #: ../grsync.glade.h:92 msgid "Grsync preferences" -msgstr "Oppsett av Grsync" +msgstr "Grsync-innstillinger" #: ../grsync.glade.h:93 msgid "Show rsync output by default" @@ -432,8 +435,8 @@ "Wether to show rsync output by default or hide it (show graphical " "information only)" msgstr "" -"Hvorvidt utdata fra rsync vises som standard eller skjules (vis kun grafisk " -"informasjon)" +"Om utdata fra rsync skal vises eller skjules (bare vis grafisk informasjon) " +"som standard" #: ../grsync.glade.h:95 msgid "Remember last used session" @@ -441,21 +444,20 @@ #: ../grsync.glade.h:96 msgid "Whether to load the last used session at startup or use the default one" -msgstr "" -"Hvorvidt den sist brukte økten eller standardøkten skal lastes ved oppstart" +msgstr "Om sist brukte økt eller standardøkt skal lastes inn ved oppstart" #: ../grsync.glade.h:97 msgid "Show error list when finished" -msgstr "Vis feilliste ved fullføring" +msgstr "Vis feilliste når synkronisering er ferdig" #: ../grsync.glade.h:98 msgid "" "When rsync has finished, show all the errors encountered in a separate window" -msgstr "" +msgstr "Vis alle oppståtte feil i eget vindu når rsync har kjørt ferdig" #: ../grsync.glade.h:99 msgid "Enable logging" -msgstr "" +msgstr "Slå på loggføring" #: ../grsync.glade.h:100 msgid "" @@ -463,11 +465,13 @@ "will be located in the grsync directory (usually \".grsync\" into your user " "home)" msgstr "" +"Om rsync-udata skal lagres i en loggfil med øktnavnet. Loggen blir i så fall " +"plassert i grsync-mappa (typisk ~/.grsync)" #: ../grsync.glade.h:101 msgid "Enter the rsync command to use, eventually including its full path" msgstr "" -"Skriv inn rsync-kommandoen som skal brukes, du kan også inkludere hele banen" +"Skriv inn rsync-kommando som skal brukes (evt. i form av fullstendig filsti)" #: ../grsync.glade.h:102 msgid "Rsync executable:" @@ -475,27 +479,31 @@ #: ../grsync.glade.h:103 msgid "Fast rsync output scrolling" -msgstr "" +msgstr "Rask rulling av rsync-utdata" #: ../grsync.glade.h:104 msgid "" "Select this if you want rsync output to scroll many lines at a time, in " "order to be faster" msgstr "" +"Velg dette hvis du vil rulle gjennom mange rsync-utdatalinjer på én gang, " +"slik at rulling går raskere" #: ../grsync.glade.h:105 msgid "Enable switch button" -msgstr "" +msgstr "Slå på bytteknapp" #: ../grsync.glade.h:106 msgid "" "Select this if you want an additional \"switch source with destination\" " "button in the basic options tab" msgstr "" +"Velg dette hvis du vil ha en «Bytt om kilde og mål»-knapp i «Generelle valg»-" +"fanen" #: ../grsync.glade.h:107 msgid "Use tray icon" -msgstr "" +msgstr "Bruk kurvikon" #: ../grsync.glade.h:108 msgid "" @@ -503,62 +511,75 @@ "of the application bar (may not work on Unity environments, like Ubuntu >= " "11.4)" msgstr "" +"Velg dette for å vise et programikon i systemkurven i stedet for en vanlig " +"oppføring på programmenyen. Dette virker kanskje ikke med nyere Ubuntu-" +"versjoner (Unity) enn Ubuntu 11.04" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Feilliste" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" -msgstr "Feilliste fra siste rsync-kjøring:" +msgstr "Feilliste fra forrige rsync-kjøring:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Ledig" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" -msgstr "Framgang for overføring av gjeldende fil" +msgstr "Framdrift for overføring av gjeldende fil" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" -msgstr "Global framgang" +msgstr "Generell framdrift" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " "files to be copied in advance" msgstr "" -"Global overføringsframgang, virker bare med rsync versjon 2.6.1 eller nyere, " -"og kan gi gale verdier avhengig av rsyncs evne til å beregne antall filer " -"som skal kopieres på forhånd" +"Total overføringsframdrift. Dette fungerer bare med rsync-versjon 2.6.1 " +"eller nyere, og nøyaktigheten avhenger av rsyncs evne til å beregne antall " +"og hvor store filer som skal kopieres på forhånd" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" -msgstr "Utdata fra rsyhnc:" +msgstr "Rsync-utdata:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" -msgstr "" +msgstr "Trykk på denne knappen for å vise feilliste" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" -msgstr "Pause/Fortsett rsync-kjøring" +msgstr "Pause/fortsett rsync-kjøring" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Stopper rsync og lukker vinduet" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" -msgstr "" +msgstr "Om avsluttende skåstrektegn" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -572,204 +593,211 @@ "\t\t\t rsync -a /src/foo /dest\n" "\t\t\t rsync -a /src/foo/ /dest/foo\n" msgstr "" +"Bruk avsluttende skråstrektegn på kildemappa for å unngå å lage et nytt " +"mappenivå i målmappa.\n" +"Dette kan betraktes som «kopier innholdet i denne mappa» i stedet for " +"«kopier denne mappa og innholdet i den».\n" +"\n" +"Følgende kommandoer kopierer altså filer på samme måte:\n" +"\n" +"\t\t\t rsync -a /kilde/foo /mål\n" +"\t\t\t rsync -a /kilde/foo/ /mål/foo\n" #: ../src/main.c:58 #, c-format msgid "Error: conflicting arguments\n" -msgstr "" +msgstr "Feil: motstridende argumenter\n" #: ../src/callbacks.c:138 #, c-format msgid "(ERROR) Can't open config file! Maybe this is the first run?\n" msgstr "" -"(FEIL) Klarte ikke åpne oppsettsfil; kanskje dette er første kjøring?\n" +"(FEIL) Klarte ikke åpne oppsettsfil. Er dette første gang du kjører " +"programmet?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" -msgstr "\tKlarte ikke lagre innstillinger.\n" +msgstr "\tKlarte ikke å lagre innstillinger.\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" -msgstr "Bla" +msgstr "Bla gjennom" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" -msgstr "%.f%% (%li:%02li brukt, %li:%02li igjen)" +msgstr "%.f%% (%li:%02li medgått, %li:%02li gjenstår)" -#: ../src/callbacks.c:703 -#, fuzzy +#: ../src/callbacks.c:705 msgid "Simulation in progress" -msgstr "_Simuler" +msgstr "Simulering pågår" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" -msgstr "Økten du oppgav på kommandolinjen finnes ikke" +msgstr "Økta du valgte på kommandolinja finnes ikke" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " "default executable search PATH. See file/preferences to change the default " "rsync executable command." msgstr "" -"Klarte ikke kjøre rsync-kommandoen, som trengs av dette programmet. Du må " -"kanskje installere rsync-pakken, eller gjøre den tilgjengelig i " -"søkevariablen «PATH». Bruk «Fil» -> «Brukervalg» for å endre rsync-" -"kommandoen." +"Klarte ikke å kjøre rsync-kommandoen. Dette programmet må kunne kjøre rsync " +"for å fungere. Du må kanskje installere rsync, eller gjøre den tilgjengelig " +"i søkevariablen «PATH». Bruk «Fil» -> «Innstillinger» for å endre standard " +"rsync-filsti." -#: ../src/callbacks.c:898 -#, fuzzy +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" -msgstr "Kjører rsync-kommando:\n" +msgstr "** Kjører AFTER-kommando:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Fullførte med feil." -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" -"Fullførte vellykket." +"Fullførte uten problemer." -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " -msgstr "" +msgstr "Rsync-avslutningsstatus:" -#: ../src/callbacks.c:1110 -#, fuzzy +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" -msgstr "Kjører rsync-kommando:\n" +msgstr "** Kjører BEFORE-kommando:\n" -#: ../src/callbacks.c:1120 -#, fuzzy +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" -msgstr "Kjører rsync-kommando:\n" +msgstr "** Kjører RSYNC-kommando (simuleringsmodus):\n" -#: ../src/callbacks.c:1121 -#, fuzzy +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" -msgstr "Kjører rsync-kommando:\n" +msgstr "** Kjører RSYNC-kommando:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" -msgstr "Klarte ikke kjøre rsync" +msgstr "Klarte ikke å kjøre rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" -msgstr "Dette øktnavnet er resevert, du må velge et annet" +msgstr "Dette øktnavnet er resevert. Du kan ikke bruke det på denne måten" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" -msgstr "En økt med dette navnet finnes allerede" +msgstr "Det finnes allerede en økt med dette navnet" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" -msgstr "Du kan ikke slette standardøkten" +msgstr "Du kan ikke slette standardøkta" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" -msgstr "Virkelig slette økten «%s»?" +msgstr "Er du sikker på at du vil slette økta «%s»?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " -msgstr "" +msgstr "Programikoner av Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " -msgstr "" +msgstr "Skrevet av Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " -msgstr "" +msgstr "Maemo-kompatiblitet av Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " -msgstr "" +msgstr "Øvrig feilretting av Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " -msgstr "" +msgstr "Nederlandsk oversettelse av Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " -msgstr "" +msgstr "Forenklet kinesisk oversettelse av Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " -msgstr "" +msgstr "Fransk oversettelse av xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " -msgstr "" +msgstr "Svensk oversettelse av Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " -msgstr "" +msgstr "Tyrkisk oversettelse av Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " -msgstr "" +msgstr "Russisk oversettelse av Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " -msgstr "" +msgstr "Tysk oversettelse av Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " -msgstr "" +msgstr "Spansk oversettelse av Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " -msgstr "" +msgstr "Tjekkisk oversettelse av Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" +"Galisisk oversettelse av Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " -msgstr "" +msgstr "Katalansk oversettelse av Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" +"Brasiliansk portugisisk oversettelse av Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " -msgstr "" +msgstr "Indonesisk oversettelse av Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " -msgstr "" +msgstr "Kroatisk oversettelse av Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." -msgstr "" +msgstr "Synkroniser filer og mapper (GTK-grensesnitt for rsync)." -#: ../src/callbacks.c:1340 -#, fuzzy +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" msgstr "" -"Opphavsrett Piero Orsoni og andre. Utgitt under GPL.\n" -" Se «AUTHORS» og «COPYING» for detaljer.\n" -"Oversatt av Alexander N. Sørnes" +"(C) Piero Orsoni og andre. Utgitt under vilkårene i GPL.\n" +"Les fila COPYING for mer info" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" -msgstr "" +msgstr "Økt importert" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" -msgstr "" +msgstr "Økt eksportert" #~ msgid "" #~ "Source and Destination (directories need a trailing \"/\")" diff -Nru grsync-1.2.5/po/nl_NL.po grsync-1.2.6/po/nl_NL.po --- grsync-1.2.5/po/nl_NL.po 2014-08-20 11:37:02.000000000 +0000 +++ grsync-1.2.6/po/nl_NL.po 2015-12-23 15:45:19.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: 0.1.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2012-01-15 22:02+0100\n" "Last-Translator: Frank de Bruijn \n" "Language-Team: \n" @@ -514,30 +514,40 @@ "(werkt mogelijk niet in Unity-omgevingen, zoals Ubuntu >= 11.4)." #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Foutenlijst" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Foutenlijst van de laatste rsync-run:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Wachten" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Voortgang van de overdracht van het huidige bestand" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Algemene voortgang" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -547,27 +557,27 @@ "later en kan onjuiste waarden tonen afhankelijk van de mate waarin rsync de " "benodigde tijd vooraf juist kan inschatten" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Rsync-uitvoer:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Foutenlijst tonen" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Rsync-run pauzeren/hervatten" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Rsync stoppen en venster sluiten" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "Over achteroplopende deelstrepen" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -604,31 +614,31 @@ "(FOUT) Kan het configuratiebestand niet openen! Is dit misschien de eerste " "run?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tInstellingen opslaan mislukt!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Bladeren" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li verstreken, %li:%02li resterend)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulatie loopt..." -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "De op de opdrachtregel gespecificeerde sessie bestaat niet" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -640,137 +650,137 @@ "maken in het zoekpad (de PATH-variabele). Zie Bestand/Voorkeuren om de naam " "van het uitvoerbare bestand te wijzigen." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** NA-opdracht wordt uitgevoerd:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Voltooid met fouten!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Voltooid zonder fouten!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Exitstatus van rsync-proces:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** VOOR-opdracht wordt uitgevoerd:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** RSYNC-opdracht wordt uitgevoerd (simulatie):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** RSYNC-opdracht wordt uitgevoerd:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Rsync niet uit te voeren" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Deze sessienaam is gereserveerd, gebruik een andere" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Er bestaat al een sessie met deze naam" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Je kunt de standaardsessie niet verwijderen" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Weet je zeker dat je de sessie '%s' wilt verwijderen?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Applicatiepictogrammen door Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Geschreven door Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Maemo-compatibiliteit door Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "Aanvullende bug-fixing door Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Nederlandse vertaling door Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Vereenvoudigd Chinese vertaling door Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Franse vertaling door xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Zweedse vertaling door Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Turkse vertaling door Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Russische vertaling door Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Duitse vertaling door Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Spaanse vertaling door Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Tsjechische vertaling door Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" "Galicische vertaling door Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Catalaanse vertaling door Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Braziliaans Portugese vertaling door Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Indonesische vertaling door Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Bestanden en mappen synchroniseren (een GTK GUI voor rsync)." -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -778,11 +788,11 @@ "(C) Piero Orsoni en anderen. Uitgegeven onder de GPL.\n" "Zie COPYING voor details." -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sessie geïmporteerd" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sessie geëxporteerd" diff -Nru grsync-1.2.5/po/POTFILES.skip grsync-1.2.6/po/POTFILES.skip --- grsync-1.2.5/po/POTFILES.skip 2013-04-30 11:48:54.000000000 +0000 +++ grsync-1.2.6/po/POTFILES.skip 2016-03-15 13:18:44.000000000 +0000 @@ -1 +1,2 @@ grsync-maemo-ui.xml +grsync.desktop.in diff -Nru grsync-1.2.5/po/pt_BR.po grsync-1.2.6/po/pt_BR.po --- grsync-1.2.5/po/pt_BR.po 2014-08-20 11:37:07.000000000 +0000 +++ grsync-1.2.6/po/pt_BR.po 2015-12-23 15:45:21.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: 0.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2012-09-14 23:00-0300\n" "Last-Translator: Fábio Nogueira \n" "Language-Team: Brazilian Portuguese\n" @@ -525,30 +525,40 @@ "como Ubuntu >= 11.4)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Lista de erros" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Lista de erros da última execução do rsync:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Inativo" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Progresso de transferência do arquivo atual" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Progresso global" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -559,27 +569,27 @@ "da capacidade do rsync para estimar com antecedência os arquivos a serem " "copiados" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Saída Rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Clique neste botão para exibir a lista de erros" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Pausar/retomar execução do rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Pare o rsync e feche a janela" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "Sobre as barras finais" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -617,31 +627,31 @@ "(ERRO) Não foi possível abrir o arquivo de configuração! Esta é a primeira " "execução?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tNão é possível salvar as configurações!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Navegar" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li decorrido, %li:%02li restante)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simulação em progresso" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "A sessão especificada na linha de comando não existe" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -654,140 +664,140 @@ "executável. Vá em Arquivo/Preferências para alterar o comando executável " "padrão do rsync. " -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** Carregando o comando POSTERIOR:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "" "Operação completada com erros!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Operação completada com " "sucesso!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Rsync status de saída de processo:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** Carregando o comando ANTERIOR:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** Carregando o comando RSYNC (modo simulação):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** Carregando o comando RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Não é possível executar o rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Você não pode chamar a sessão por este nome pois o mesmo é reservado" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Já existe uma sessão com este nome" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Você não pode deletar a sessão padrão" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Você tem certeza que deseja apagar a sessão '%s'?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "Ícone por Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "Escrito por Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Compatibilidade com o Maema por Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" "Correção adicional de erros por Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "Tradução holandesa por Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "Tradução chinesa por Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "Tradução francesa por Xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "Tradução sueca por Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "Tradução turca por Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "Tradução russa por Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "Tradução alemã por Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "Tradução espanhola por Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "Tradução checa por Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "Tradução galega por Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "Tradução catalã por Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" "Tradução Português do Brasil por Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "Tradução indonésia por Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Sincronizar arquivos e pastas (Um GTK GUI para o rsync)" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -795,10 +805,10 @@ "(C) Piero Orsoni e outros. Lançado sobre a GPL.\n" "Veja COPYING para maiores detalhes" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Sessão importada" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Sessão exportada" diff -Nru grsync-1.2.5/po/ru_RU.po grsync-1.2.6/po/ru_RU.po --- grsync-1.2.5/po/ru_RU.po 2014-08-20 11:35:11.000000000 +0000 +++ grsync-1.2.6/po/ru_RU.po 2015-12-23 15:45:20.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: 0.0.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2011-05-26 21:39+1000\n" "Last-Translator: Alex 'AdUser' Z \n" "Language-Team: Russian \n" @@ -28,7 +28,6 @@ msgstr "Открыть _Приёмник" #: ../grsync.glade.h:5 -#, fuzzy msgid "Switch source with destination" msgstr "Поменять местами источник и назначение" @@ -278,13 +277,16 @@ #: ../grsync.glade.h:65 msgid "Protect remote args" -msgstr "" +msgstr "Автоматически экранировать аргументы" #: ../grsync.glade.h:66 msgid "" "Protect remote arguments from shell expansion, Avoids the need to manually " "escape remote folders and other options which use file names like --exclude" msgstr "" +"Автоматическое экранирование избавляет от необходимости вручную экранировать " +"символы в именах папок и других аргументах (например, в именах файлов в " +"опции --exclude), предотвращая их раскрытие оболочкой" #: ../grsync.glade.h:67 msgid "Advanced options" @@ -383,12 +385,11 @@ #: ../grsync.glade.h:85 msgid "Include these sessions:" -msgstr "" +msgstr "Включить эти сессии:" #: ../grsync.glade.h:86 -#, fuzzy msgid "Set options" -msgstr "Дополнительные опции" +msgstr "Параметры группы" #: ../grsync.glade.h:87 msgid "Add session" @@ -403,13 +404,12 @@ msgstr "Введите имя новой сессии" #: ../grsync.glade.h:90 -#, fuzzy msgid "Add as session set" -msgstr "Добавить сессию" +msgstr "Добавить как группу сессий" #: ../grsync.glade.h:91 msgid "Create a new session set instead of a normal session" -msgstr "" +msgstr "Начать новую сессию, вместо обычной сессии" #: ../grsync.glade.h:92 msgid "Grsync preferences" @@ -476,6 +476,8 @@ "Select this if you want rsync output to scroll many lines at a time, in " "order to be faster" msgstr "" +"Выберите этот параметр, если хотите быструю прокрутку вывода rsync для " +"ускорения" #: ../grsync.glade.h:105 msgid "Enable switch button" @@ -499,32 +501,44 @@ "of the application bar (may not work on Unity environments, like Ubuntu >= " "11.4)" msgstr "" +"Установите этот флажок, чтобы показывать иконку приложения в системном лотке " +"вместо панели приложений" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Список ошибок" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Список ошибок последнего запуска rsync:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Простой" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Прогресс передачи текущего файла" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Общий прогресс" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -534,28 +548,27 @@ "сообщать ошибочные значения в зависимости от возможности rsync определить " "количество оставшихся для передачи файлов" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Вывод rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "Посмотреть список ошибок" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Приостановить/продолжить работу rsync" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Остановить rsync и закрыть окно" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "О завершающих слэшах" -#: ../grsync.glade.h:121 -#, fuzzy +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -569,15 +582,13 @@ "\t\t\t rsync -a /src/foo /dest\n" "\t\t\t rsync -a /src/foo/ /dest/foo\n" msgstr "" -"Завершающий слэш в пути исходной директории предотвращает создание " -"дополнительной директории в приемнике.\n" "Можно запомнить это как «скопировать содержимое директории» и «скопировать " "директорию и её содержимое»\n" "\n" "Другими словами, следующие команды делают то же самое:\n" "\n" -" rsync -a /src/foo /dest\n" -" rsync -a /src/foo/ /dest/foo\n" +"\t\t\t rsync -a /src/foo /dest\n" +"\t\t\t rsync -a /src/foo/ /dest/foo\n" #: ../src/main.c:58 #, c-format @@ -590,31 +601,31 @@ msgstr "" "(ОШИБКА) Не могу открыть файл конфигурации! Возможно это первый запуск?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tНевозможно сохранить настройки!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Открыть" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li прошло, %li:%02li осталось)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Симуляция запущена" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "Сессия, указанная в командной строке, не существует" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -625,139 +636,137 @@ "Установите пакет \"rsync\" или укажите путь к исполняемому файлв в " "переменной PATH. Путь по умолчанию для rsync можно поменять в настройках. " -#: ../src/callbacks.c:898 -#, fuzzy +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" -msgstr "*** Запуск завершающей команды:\n" +msgstr "** Запуск завершающей команды:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Завершено с ошибками!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Завершено успешно!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Статус выхода процесса rsync:" -#: ../src/callbacks.c:1110 -#, fuzzy +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" -msgstr "*** Запуск предварительной команды:\n" +msgstr "** Запуск предварительной команды:\n" -#: ../src/callbacks.c:1120 -#, fuzzy +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" -msgstr "*** Запуск RSYNC (режим симуляции):\n" +msgstr "** Запуск RSYNC (режим симуляции):\n" -#: ../src/callbacks.c:1121 -#, fuzzy +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" -msgstr "*** Запуск команды RSYNC:\n" +msgstr "** Запуск команды RSYNC:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Не могу запустить rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Это имя сессий зарезервировано, вы не можете его использовать" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Сессия с таким названием уже существует" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Вы не можете удалить сессию по умолчанию" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Вы уверены, что хотите удалить сессию '%s' ?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " -msgstr "" +msgstr "Иконки - Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " -msgstr "" +msgstr "Автор - Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " -msgstr "" +msgstr "Реализация совместимости с Maemo - Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" +"Помощь в исправлении ошибок - Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " -msgstr "" +msgstr "Перевод на голландский - Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " -msgstr "" +msgstr "Перевод на китайский - Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " -msgstr "" +msgstr "Перевод на французский - xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " -msgstr "" +msgstr "Перевод на шведский - Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " -msgstr "" +msgstr "Перевод на турецкий - Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " -msgstr "" +msgstr "Перевод на русский - Евгений Терехов " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " -msgstr "" +msgstr "Перевод на немецкий - Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " -msgstr "" +msgstr "Перевод на испанский - Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " -msgstr "" +msgstr "Перевод на чешский - Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" +"Перевод на галисийский - Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " -msgstr "" +msgstr "Перевод на каталанский - Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " -msgstr "" +msgstr "Перевод на португальский - Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " -msgstr "" +msgstr "Перевод на индонезийский - Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " -msgstr "" +msgstr "Перевод на хорватский - Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "Синхронизирует файлы и директории (GTK GUI для rsync)" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -765,11 +774,11 @@ "© Piero Orsoni и другие. Распространяется на условиях GPL.\n" "Смотри файл COPYING для уточнения деталей" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "Сессия импортирована" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "Сессия экспортирована" diff -Nru grsync-1.2.5/po/sv_SE.po grsync-1.2.6/po/sv_SE.po --- grsync-1.2.5/po/sv_SE.po 2014-08-20 11:35:11.000000000 +0000 +++ grsync-1.2.6/po/sv_SE.po 2015-12-23 15:45:20.000000000 +0000 @@ -1,20 +1,21 @@ -# Swedish translation of grsync. -# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the grsync package. -# Daniel Nylander , 2006. -# +# Swedish translation of grsync. +# Copyright (C) 2006 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the grsync package. +# Daniel Nylander , 2006. +# msgid "" msgstr "" "Project-Id-Version: grsync 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" -"PO-Revision-Date: 2006-01-16 10:39+0100\n" -"Last-Translator: Daniel Nylander \n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" +"PO-Revision-Date: 2015-10-10 08:56+0100\n" +"Last-Translator: Påvel Nicklasson \n" "Language-Team: Swedish \n" "Language: sv\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" #: ../grsync.glade.h:1 msgid "Grsync" @@ -22,79 +23,75 @@ #: ../grsync.glade.h:2 msgid "_File" -msgstr "" +msgstr "_Arkiv" #: ../grsync.glade.h:3 -#, fuzzy msgid "Browse S_ource" -msgstr "Bläddra" +msgstr "Blä_ddra i källa" #: ../grsync.glade.h:4 -#, fuzzy msgid "Browse _Destination" -msgstr "Ta bort vid destination" +msgstr "Bläddra i _destination" #: ../grsync.glade.h:5 -#, fuzzy msgid "Switch source with destination" -msgstr "Ta bort vid destination" +msgstr "Växla källa med destination" #: ../grsync.glade.h:6 msgid "_Simulation" -msgstr "" +msgstr "_Simulering" #: ../grsync.glade.h:7 msgid "_Rsync command line" -msgstr "" +msgstr "_Rsync kommandotolk" #: ../grsync.glade.h:8 -#, fuzzy msgid "S_essions" -msgstr "Sessioner:" +msgstr "S_essioner" #: ../grsync.glade.h:9 msgid "_Import" -msgstr "" +msgstr "_Importera" #: ../grsync.glade.h:10 msgid "_Export" -msgstr "" +msgstr "_Exportera" #: ../grsync.glade.h:11 msgid "_Help" -msgstr "" +msgstr "_Hjälp" #: ../grsync.glade.h:12 msgid "_Rsync info" -msgstr "" +msgstr "_Rsync information" #: ../grsync.glade.h:13 msgid "_Contribute" -msgstr "" +msgstr "_Bidra" #: ../grsync.glade.h:14 -#, fuzzy msgid "Click to add a new session" -msgstr "Du kan inte ta bort standardsessionen" +msgstr "Klicka för att lägga till en ny session" #: ../grsync.glade.h:15 -#, fuzzy msgid "Click to delete the current session" -msgstr "Du kan inte ta bort standardsessionen" +msgstr "Klicka för att ta bort aktuell session" #: ../grsync.glade.h:16 msgid "" "Show what would have been done, but actually do nothing (\"dry-run\" in " "rsync language)" msgstr "" +"Visa vad som skulle ha gjorts, men gör i verkligheten ingenting " +"(\"torrkörning\" på rsync-språk)" #: ../grsync.glade.h:17 msgid "_Simulate" -msgstr "" +msgstr "_Simulera" #: ../grsync.glade.h:18 msgid "Make a full run (go!)" -msgstr "" +msgstr "Gör en full körning (kör!)" #: ../grsync.glade.h:19 msgid "Preserve group" @@ -114,20 +111,19 @@ #: ../grsync.glade.h:23 msgid "Do not leave filesystem" -msgstr "Lämna inte filsystemet" +msgstr "Lämna inte filsystem" #: ../grsync.glade.h:24 -#, fuzzy msgid "Do not cross filesystem boundaries" -msgstr "Lämna inte filsystemet" +msgstr "Korsa inte filsystemsgränser" #: ../grsync.glade.h:25 msgid "Delete on destination" -msgstr "Ta bort vid destination" +msgstr "Ta bort i destination" #: ../grsync.glade.h:26 msgid "Delete files in destination which are not present in the source" -msgstr "" +msgstr "Tar bort filer i målet som saknas i källan" #: ../grsync.glade.h:27 msgid "Verbose" @@ -135,67 +131,63 @@ #: ../grsync.glade.h:28 msgid "Show more information" -msgstr "" +msgstr "Visa mer information" #: ../grsync.glade.h:29 msgid "Show transfer progress" msgstr "Visa överföringsförlopp" #: ../grsync.glade.h:30 -#, fuzzy msgid "Ignore existing" msgstr "Ignorera existerande" #: ../grsync.glade.h:31 msgid "Ignore files which already exist in the destination" -msgstr "" +msgstr "Ignorera filer som redan finns i målet" #: ../grsync.glade.h:32 -#, fuzzy msgid "Size only" msgstr "Endast storlek" #: ../grsync.glade.h:33 msgid "Check size only, ignore time and checksum" -msgstr "" +msgstr "Kontrollera endast storlek, ignorera tid och kontrollsumma" #: ../grsync.glade.h:34 msgid "Skip newer" -msgstr "" +msgstr "Hoppa över nyare" #: ../grsync.glade.h:35 -#, fuzzy msgid "Do not update newer files" -msgstr "Uppdatera endast existerande filer" +msgstr "Uppdatera inte nyare filer" #: ../grsync.glade.h:36 msgid "Windows compatibility" -msgstr "" +msgstr "Windowskompatibilitet" #: ../grsync.glade.h:37 msgid "Provides workaround for a windows FAT filesystem limitation" -msgstr "" +msgstr "Ger en lösning för en Windows FAT-filsystembegränsning" #: ../grsync.glade.h:38 msgid "Click to open the file browser" -msgstr "" +msgstr "Klicka för att öppna filhanteraren" #: ../grsync.glade.h:39 msgid "Source directory" -msgstr "" +msgstr "Källkatalog" #: ../grsync.glade.h:40 msgid "Destination directory" -msgstr "" +msgstr "Målkatalog" #: ../grsync.glade.h:41 msgid "Click here to switch the source with the destination directory" -msgstr "" +msgstr "Klicka här för att växla källan med källkatalogen" #: ../grsync.glade.h:42 -#, fuzzy msgid "Source and Destination:" -msgstr "Ta bort vid destination" +msgstr "Källa och destination:" #: ../grsync.glade.h:43 msgid "Basic options" @@ -207,7 +199,7 @@ #: ../grsync.glade.h:45 msgid "Always compare file contents (by checksum)" -msgstr "" +msgstr "Jämför alltid filinnehåll (med kontrollsumma)" #: ../grsync.glade.h:46 msgid "Preserve devices" @@ -223,27 +215,28 @@ #: ../grsync.glade.h:49 msgid "Don't map uid/gid values" -msgstr "Länk inte uid-/gid-värden" +msgstr "Länka inte uid-/gid-värden" #: ../grsync.glade.h:50 msgid "Keep numeric uid/gid instead of mapping user names and group names" msgstr "" +"Behåll numeriskt uid/gid istället för att länka användarnamn och gruppnamn" #: ../grsync.glade.h:51 -#, fuzzy msgid "Additional options:" -msgstr "Avancerade alternativ" +msgstr "Ytterligare alternativ:" #: ../grsync.glade.h:52 msgid "Compress file data" msgstr "Komprimera fildata" #: ../grsync.glade.h:53 -#, fuzzy msgid "" "Compress file data when transferring (useful only if at least one side is " "remote)" -msgstr "Komprimera fildata" +msgstr "" +"Komprimera fildata under överföring (användbart endast om åtminstone ena " +"sidan är avlägsen)" #: ../grsync.glade.h:54 msgid "Copy symlinks as symlinks" @@ -251,7 +244,7 @@ #: ../grsync.glade.h:55 msgid "Symbolic links are copied as such, do not copy link target file" -msgstr "" +msgstr "Symboliska länkar kopieras som sådana, kopiera inte länkens målfil" #: ../grsync.glade.h:56 msgid "Make backups" @@ -259,46 +252,47 @@ #: ../grsync.glade.h:57 msgid "Make backups of existing files on the destination" -msgstr "" +msgstr "Gör säkerhetskopior av befintliga filer i målet" #: ../grsync.glade.h:58 -#, fuzzy msgid "Copy hardlinks as hardlinks" -msgstr "Kopiera symlänkar som symlänkar" +msgstr "Kopiera hårda länkar som hårda länkar" #: ../grsync.glade.h:59 msgid "Hard links are copied as such, do not copy link target file" -msgstr "" +msgstr "Hårda länkar kopieras som sådana, kopiera inte länkens målfil" #: ../grsync.glade.h:60 msgid "Show itemized changes list" -msgstr "" +msgstr "Visa specificerad ändringslista" #: ../grsync.glade.h:61 msgid "Show additional information on every changed file" -msgstr "" +msgstr "Visa ytterligare information om varje ändrad fil" #: ../grsync.glade.h:62 msgid "Disable recursion" -msgstr "" +msgstr "Inaktivera rekursion" #: ../grsync.glade.h:63 msgid "If checked the subdirectories of the source folder will be ignored" -msgstr "" +msgstr "Om markerad kommer källmappens underkataloger att ignoreras" #: ../grsync.glade.h:64 msgid "Additional command line options to pass to the rsync program" -msgstr "" +msgstr "Ytterligare kommandoradsalternativ att skicka till rsync-programmet" #: ../grsync.glade.h:65 msgid "Protect remote args" -msgstr "" +msgstr "Skydda fjärrargument" #: ../grsync.glade.h:66 msgid "" "Protect remote arguments from shell expansion, Avoids the need to manually " "escape remote folders and other options which use file names like --exclude" msgstr "" +"Skyddar fjärrargument från skalexpansion, undviker behovet att manuellt " +"undvika fjärrmappar och andra alternativ som använder filnamn som --exclude" #: ../grsync.glade.h:67 msgid "Advanced options" @@ -306,7 +300,7 @@ #: ../grsync.glade.h:68 msgid "Execute this command before rsync:" -msgstr "" +msgstr "Utför detta kommando innan rsync:" #: ../grsync.glade.h:69 msgid "" @@ -314,10 +308,13 @@ "useful, for instance, to mount a filesystem before starting or to do some " "cleanup." msgstr "" +"Klicka på detta objekt om du vill köra ett kommando innan synkning. Kan vara " +"användbart, till exempel, för att montera ett filsystem innan eller för att " +"utföra viss städning." #: ../grsync.glade.h:70 msgid "Execute this command after rsync:" -msgstr "" +msgstr "Utför detta kommando efter rsync:" #: ../grsync.glade.h:71 msgid "" @@ -325,30 +322,37 @@ "useful, for instance, to unmount a filesystem at the end or to do some " "cleanup." msgstr "" +"Klicka på detta objekt om du vill köra ett kommando efter synkning. Kan vara " +"användbart, till exempel, för att avmontera ett filsystem efteråt eller för " +"att utföra viss städning." #: ../grsync.glade.h:72 msgid "Browse files instead of folders" -msgstr "" +msgstr "Bläddra bland filer istället för mappar" #: ../grsync.glade.h:73 msgid "" "By setting this switch, the browse source and destination buttons will open " "a dialog for selecting files instead of folders" msgstr "" +"Genom att ställa in denna omkopplare, kommer käll- och målknapparna att " +"öppna en dialogruta för att välja filer istället för mappar" #: ../grsync.glade.h:74 msgid "Halt on failure" -msgstr "" +msgstr "Stanna vid fel" #: ../grsync.glade.h:75 msgid "" "When running the \"before\" command, if it fails for some reason, don't run " "rsync and halt" msgstr "" +"När \"innan\"-kommandot körs, om det av någon anledning misslyckas, kör inte " +"rsync och stanna" #: ../grsync.glade.h:76 msgid "On rsync error only" -msgstr "" +msgstr "Endast vid rsync-fel" #: ../grsync.glade.h:77 msgid "" @@ -357,98 +361,102 @@ "trouble.\n" "Try a command like \"mail -s 'rsync error' you@domain.com\"." msgstr "" +"Utför \"efter\"-kommandot endast om synkroniseringen innehöll fel.\n" +"Kan till exempel användas för att skicka ett mail endast om det blev " +"problem.\n" +"Försök med ett kommando som \"mail -s 'rsync error' du@domän.com\"." #: ../grsync.glade.h:80 msgid "Notes:" -msgstr "" +msgstr "Anmärkningar:" #: ../grsync.glade.h:81 -#, fuzzy msgid "Free text notes on the current session" -msgstr "Du kan inte ta bort standardsessionen" +msgstr "Fritextanteckningar om den aktuella sessionen" #: ../grsync.glade.h:82 msgid "Run as superuser" -msgstr "" +msgstr "Kör som superuser" #: ../grsync.glade.h:83 msgid "" "Run rsync with superuser (root, administrator) privileges. Use this if you " "need to access system files, for example when doing a full system backup." msgstr "" +"Kör rsync med superuser (rot, administratör) rättigheter. Använd detta om du " +"måste komma åt systemfiler, till exempel för att göra en fullständig " +"systemsäkerhetskopia." #: ../grsync.glade.h:84 -#, fuzzy msgid "Extra options" -msgstr "Grundläggande alternativ" +msgstr "Ytterligare alternativ" #: ../grsync.glade.h:85 msgid "Include these sessions:" -msgstr "" +msgstr "Inkludera dessa sessioner:" #: ../grsync.glade.h:86 -#, fuzzy msgid "Set options" -msgstr "Grundläggande alternativ" +msgstr "Ange alternativ" #: ../grsync.glade.h:87 -#, fuzzy msgid "Add session" -msgstr "Sessioner:" +msgstr "Lägg till session" #: ../grsync.glade.h:88 -#, fuzzy msgid "Enter session name you want to create:" -msgstr "Ange sessionsnamn" +msgstr "Skriv in sessionsnamn du vill skapa:" #: ../grsync.glade.h:89 -#, fuzzy msgid "Enter the name of the new session to create" -msgstr "Ange sessionsnamn" +msgstr "Skriv in namnet på den nya sessionen" #: ../grsync.glade.h:90 -#, fuzzy msgid "Add as session set" -msgstr "Sessioner:" +msgstr "Lägg till sessionsuppsättning" #: ../grsync.glade.h:91 msgid "Create a new session set instead of a normal session" -msgstr "" +msgstr "Skapa en nya sessionsuppsättning istället för en normal session" #: ../grsync.glade.h:92 msgid "Grsync preferences" -msgstr "" +msgstr "Grsync-inställningar" #: ../grsync.glade.h:93 msgid "Show rsync output by default" -msgstr "" +msgstr "Visa rsync-utdata som standard" #: ../grsync.glade.h:94 msgid "" "Wether to show rsync output by default or hide it (show graphical " "information only)" msgstr "" +"Huruvida rsync-data ska visas som standard eller döljas (visa endast grafisk " +"information)" #: ../grsync.glade.h:95 msgid "Remember last used session" -msgstr "" +msgstr "Kom ihåg senast använda session" #: ../grsync.glade.h:96 msgid "Whether to load the last used session at startup or use the default one" msgstr "" +"Huruvida den senast använda sessionen ska laddas vid start eller använd den " +"förvalda" #: ../grsync.glade.h:97 msgid "Show error list when finished" -msgstr "" +msgstr "Visa fellista vid avslut" #: ../grsync.glade.h:98 msgid "" "When rsync has finished, show all the errors encountered in a separate window" -msgstr "" +msgstr "När rsync är färdigt, visa alla fel som uppstått i ett separat fönster" #: ../grsync.glade.h:99 msgid "Enable logging" -msgstr "" +msgstr "Aktivera loggning" #: ../grsync.glade.h:100 msgid "" @@ -456,39 +464,45 @@ "will be located in the grsync directory (usually \".grsync\" into your user " "home)" msgstr "" +"Huruvida rsync-utdata ska sparas till en loggfil, som namnges som sessionen, " +"som kommer att placeras i grsync-katalogen (oftast \".grsync\" i din hemmapp)" #: ../grsync.glade.h:101 msgid "Enter the rsync command to use, eventually including its full path" msgstr "" +"Ange det rsync-kommando som ska användas, eventuellt med dess fulla sökväg" #: ../grsync.glade.h:102 -#, fuzzy msgid "Rsync executable:" -msgstr "Utdata från rsync:" +msgstr "Rsync-program:" #: ../grsync.glade.h:103 msgid "Fast rsync output scrolling" -msgstr "" +msgstr "Snabb rsync-utdata rullning" #: ../grsync.glade.h:104 msgid "" "Select this if you want rsync output to scroll many lines at a time, in " "order to be faster" msgstr "" +"Välj detta om du vill att rsync-utdata ska rulla flera rader åt gången, för " +"att bli snabbare" #: ../grsync.glade.h:105 msgid "Enable switch button" -msgstr "" +msgstr "Aktivera växlingsknapp" #: ../grsync.glade.h:106 msgid "" "Select this if you want an additional \"switch source with destination\" " "button in the basic options tab" msgstr "" +"Välj detta om du vill ha en ytterligare \"växla källa med mål\"-knapp på " +"fliken för grundläggande alternativ" #: ../grsync.glade.h:107 msgid "Use tray icon" -msgstr "" +msgstr "Använd brickikon" #: ../grsync.glade.h:108 msgid "" @@ -496,59 +510,75 @@ "of the application bar (may not work on Unity environments, like Ubuntu >= " "11.4)" msgstr "" +"Markera den här rutan för att visa en ikon för programmet i systembrickan " +"istället för programfältet (kanske inte fungerar på Unitymiljöer, som Ubuntu " +">= 11.4)" #: ../grsync.glade.h:109 -msgid "Errors list" +msgid "Overwrite logs" msgstr "" #: ../grsync.glade.h:110 -msgid "Error list of last rsync run:" +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" msgstr "" #: ../grsync.glade.h:111 +msgid "Errors list" +msgstr "Fellista" + +#: ../grsync.glade.h:112 +msgid "Error list of last rsync run:" +msgstr "Fellista för senaste rsync-körning:" + +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" -msgstr "" +msgstr "Overksam" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" -msgstr "" +msgstr "Överföringsförlopp för aktuell fil" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" -msgstr "" +msgstr "Totalt förlopp" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " "files to be copied in advance" msgstr "" +"Totalt överföringsförlopp: fungerar bara med rsync version 2.6.1 eller " +"senare, och kan rapportera felaktiga värden beroende på rsync:s förmåga att " +"uppskatta de filer som ska kopieras i förväg" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Utdata från rsync:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" -msgstr "" +msgstr "Klicka på denna knapp för att se fellistan" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" -msgstr "" +msgstr "Pausa/återuppta rsync-körning" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" -msgstr "" +msgstr "Stoppar rsync och stänger fönstret" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" -msgstr "" +msgstr "Om avslutande snedstreck" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -562,11 +592,22 @@ "\t\t\t rsync -a /src/foo /dest\n" "\t\t\t rsync -a /src/foo/ /dest/foo\n" msgstr "" +"Ett avslutande snedstreck på källkatalogen undviker att skapa ytterligare en " +"katalognivå i destinationen.\n" +"Du kan tänka på att ett avslutande / på en källa betyder \"kopiera " +"innehållet i den här katalogen\" i motsats till \"kopiera katalogen själv " +"och dess innehåll\".\n" +"\n" +"Med andra ord, vart och ett av de följande kommandona kopierar filer på " +"samma sätt:\n" +"\n" +"\t\t\t rsync -a /src/foo /dest\n" +"\t\t\t rsync -a /src/foo/ /dest/foo\n" #: ../src/main.c:58 #, c-format msgid "Error: conflicting arguments\n" -msgstr "" +msgstr "Fel: argument i konflikt\n" #: ../src/callbacks.c:138 #, c-format @@ -574,189 +615,185 @@ msgstr "" "(FEL) Kan inte öppna konfigurationsfil! Kanske är det här första gången?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tKunde inte spara inställningar!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Bläddra" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" -msgstr "" +msgstr "%.f%% (%li:%02li förflutet, %li:%02li återstår)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" -msgstr "" +msgstr "Simulering pågår" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" -msgstr "" +msgstr "Sessionen du angav på kommandoraden finns inte" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 -#, fuzzy +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " "default executable search PATH. See file/preferences to change the default " "rsync executable command." msgstr "" -"Kunde inte starta kommandoradsverktyget rsync. Det behövs av det här " -"programmet. Du kanske behöver installera paketet rsync eller göra det " -"tillgängligt i sökvägen PATH." +"Det gick inte att utföra rsync-kommandoradsverktyget. Det krävs för det här " +"programmet. Du kan behöva installera rsync-paketet eller göra det " +"tillgängligt i programstandardsökvägen PATH. Se Arkiv/inställningar för att " +"ändra standardkörkommandot för rsync." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" -msgstr "" +msgstr "** Startar EFTER kommando:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" -msgstr "" +msgstr "Färdigt med fel!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" -msgstr "" +msgstr "Färdigt!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " -msgstr "" +msgstr "Rsync-processavslutningsstatus:" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" -msgstr "" +msgstr "** Startar INNAN kommando:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" -msgstr "" +msgstr "** Startar RSYNC-kommandot (simuleringsläge):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" -msgstr "" +msgstr "** Startar RSYNC-kommandot:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" -msgstr "" +msgstr "Det går inte att köra rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" -msgstr "" +msgstr "Detta sessionsnamn är reserverat, du kan inte kalla det så här" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" -msgstr "" +msgstr "En session med detta namn finns redan" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Du kan inte ta bort standardsessionen" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "Är du säker att du vill ta bort sessionen \"%s\"?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " -msgstr "" +msgstr "Programikoner av Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " -msgstr "" +msgstr "Skrivet av Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " -msgstr "" +msgstr "Maemo-kompatibilitet av Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " -msgstr "" +msgstr "Ytterligare felrättning av Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " -msgstr "" +msgstr "Holländsk översättning av Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " -msgstr "" +msgstr "Förenklad kinesisk översättning av Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " -msgstr "" +msgstr "Fransk översättning av xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " -msgstr "" +msgstr "Svensk översättning av Påvel Nicklasson " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " -msgstr "" +msgstr "Turkisk översättning av Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " -msgstr "" +msgstr "Rysk översättning av Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " -msgstr "" +msgstr "Tysk översättning av Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " -msgstr "" +msgstr "Spansk översättning av Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " -msgstr "" +msgstr "Tjeckisk översättning av Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" +"Galicisk översättning av Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " -msgstr "" +msgstr "Katalansk översättning av Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " -msgstr "" +msgstr "Brasiliansk översättning av Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " -msgstr "" +msgstr "Indonesisk översättning av Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " -msgstr "" +msgstr "Kroatisk översättning av Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." -msgstr "" +msgstr "Synkronisera filer och mappar (en GTK-GUI för rsync)." -#: ../src/callbacks.c:1340 -#, fuzzy +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" msgstr "" -"(C) Piero Orsoni och andra\n" -"Utgiven under GPL\n" -"Se AUTHORS och COPYING\n" -"för detaljer\n" -"\n" -"http://www.opbyte.it/grsync/" +"(C) Piero Orsoni med flera. Släppt under GPL.\n" +"Se KOPIERA för detaljer" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" -msgstr "" +msgstr "Session importerad" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" -msgstr "" +msgstr "Session exporterad" #, fuzzy #~ msgid "" diff -Nru grsync-1.2.5/po/tr_TR.po grsync-1.2.6/po/tr_TR.po --- grsync-1.2.5/po/tr_TR.po 2014-08-20 11:37:22.000000000 +0000 +++ grsync-1.2.6/po/tr_TR.po 2015-12-23 15:45:20.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: grsync\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2006-10-20 14:30+0300\n" "Last-Translator: Doruk Fisek \n" "Language-Team: Turkish \n" @@ -509,30 +509,40 @@ msgstr "" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "Hata listesi" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "Son rsync çalışmasının hata listesi:" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "Boş duran" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "Şu anki dosyanın aktarım durumu" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "Genel durum" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -542,27 +552,27 @@ "çalışır ve rsync'in kopyalanacak dosyaları önceden tahmin etme yeteneğine " "bağlı olarak yanlış değerler verebilir" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Rsync çıktısı:" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "Rsync çalışmasını duraklat/sürdür" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "Rsync'i durdurur ve pencereyi kapatır" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -587,31 +597,31 @@ msgid "(ERROR) Can't open config file! Maybe this is the first run?\n" msgstr "(HATA) Ayar dosyası açılamıyor! Belki bu ilk çalıştırılması?\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\tAyarlar kaydedilemiyor!\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "Göz at" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (%li:%02li geçti, %li:%02li kaldı)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "Simülasyon devam ediyor" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "Komut satırında belirttiğiniz oturum yok" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -623,139 +633,139 @@ "arama yoluna (PATH) yerleştirmeniz gerekebilir. Öntanımlı rsync " "çalıştırılabilir komutunu dosya/ayarlar bölümünden değiştirebilirsiniz." -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 #, fuzzy msgid "** Launching AFTER command:\n" msgstr "*** Rsync SONRASI komutu çalıştırılıyor:\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "Hatalarla tamamlandı!" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "" "Başarıyla tamamlandı!" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 #, fuzzy msgid "** Launching BEFORE command:\n" msgstr "*** Rsync ÖNCESİ komutu çalıştırılıyor:\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 #, fuzzy msgid "** Launching RSYNC command (simulation mode):\n" msgstr "*** RSYNC komutu başlatılıyor (simülasyon kipi):\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 #, fuzzy msgid "** Launching RSYNC command:\n" msgstr "*** RSYNC komutu başlatılıyor:\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "Rsync'i çalıştıramadım" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "Bu oturum ismi ayrılmış durumda, oturuma bu ismi veremezsiniz" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "Aynı isimde bir oturum zaten bulunuyor" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "Öntanımlı oturumu silemezsiniz" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "'%s' oturumunu silmek istediğinize emin misiniz?" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "" -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "" -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "" -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "" -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "" -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "" -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "" -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "" -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "" -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "" -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "" -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "" -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "" -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "" -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "" -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "" -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "" -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "" -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 #, fuzzy msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" @@ -764,11 +774,11 @@ "(C) Piero Orsoni ve diğerleri. GPL ile yayınlanmıştır.\n" "Detaylar için AUTHORS ve COPYING dosyalarınız bakınız" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "" diff -Nru grsync-1.2.5/po/zh_CN.po grsync-1.2.6/po/zh_CN.po --- grsync-1.2.5/po/zh_CN.po 2014-08-20 11:35:11.000000000 +0000 +++ grsync-1.2.6/po/zh_CN.po 2015-12-23 15:45:20.000000000 +0000 @@ -7,14 +7,15 @@ msgstr "" "Project-Id-Version: 0.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" -"PO-Revision-Date: 2006-01-10 10:04:00+0800\n" -"Last-Translator: Xie Yanbo \n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" +"PO-Revision-Date: 2015-12-10 17:49+0800\n" +"Last-Translator: Tommy He \n" "Language-Team: Simplified Chinese \n" -"Language: \n" +"Language: zh_CN\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.8.5\n" #: ../grsync.glade.h:1 msgid "Grsync" @@ -22,79 +23,73 @@ #: ../grsync.glade.h:2 msgid "_File" -msgstr "" +msgstr "文件(_F)" #: ../grsync.glade.h:3 -#, fuzzy msgid "Browse S_ource" -msgstr "浏览" +msgstr "浏览来源(_O)" #: ../grsync.glade.h:4 -#, fuzzy msgid "Browse _Destination" -msgstr "删除目标文件" +msgstr "浏览目标(_D)" #: ../grsync.glade.h:5 -#, fuzzy msgid "Switch source with destination" -msgstr "删除目标文件" +msgstr "交换来源及目标" #: ../grsync.glade.h:6 msgid "_Simulation" -msgstr "" +msgstr "模拟(_S)" #: ../grsync.glade.h:7 msgid "_Rsync command line" -msgstr "" +msgstr "Rsync 命令行(_R)" #: ../grsync.glade.h:8 -#, fuzzy msgid "S_essions" -msgstr "会话：" +msgstr "会话(_E)" #: ../grsync.glade.h:9 msgid "_Import" -msgstr "" +msgstr "导入(_I)" #: ../grsync.glade.h:10 msgid "_Export" -msgstr "" +msgstr "导出(_E)" #: ../grsync.glade.h:11 msgid "_Help" -msgstr "" +msgstr "帮助(_H)" #: ../grsync.glade.h:12 msgid "_Rsync info" -msgstr "" +msgstr "Rsync 信息(_R)" #: ../grsync.glade.h:13 msgid "_Contribute" -msgstr "" +msgstr "贡献(_C)" #: ../grsync.glade.h:14 -#, fuzzy msgid "Click to add a new session" -msgstr "您不能删除默认会话" +msgstr "点击此添加一个新会话" #: ../grsync.glade.h:15 -#, fuzzy msgid "Click to delete the current session" -msgstr "您不能删除默认会话" +msgstr "点击此删除当前会话" #: ../grsync.glade.h:16 msgid "" "Show what would have been done, but actually do nothing (\"dry-run\" in " "rsync language)" -msgstr "" +msgstr "显示将要执行的操作，但并不真正执行（对 rsync 来说即是“预演”）" #: ../grsync.glade.h:17 msgid "_Simulate" -msgstr "" +msgstr "模拟(_S)" #: ../grsync.glade.h:18 msgid "Make a full run (go!)" -msgstr "" +msgstr "开始完全运行（真正执行！）" #: ../grsync.glade.h:19 msgid "Preserve group" @@ -117,17 +112,16 @@ msgstr "不离开当前文件系统" #: ../grsync.glade.h:24 -#, fuzzy msgid "Do not cross filesystem boundaries" -msgstr "不离开当前文件系统" +msgstr "不超越文件系统边界" #: ../grsync.glade.h:25 msgid "Delete on destination" -msgstr "删除目标文件" +msgstr "删除目标处文件" #: ../grsync.glade.h:26 msgid "Delete files in destination which are not present in the source" -msgstr "" +msgstr "删除目标处不存在于来源的文件" #: ../grsync.glade.h:27 msgid "Verbose" @@ -135,67 +129,63 @@ #: ../grsync.glade.h:28 msgid "Show more information" -msgstr "" +msgstr "显示更多信息" #: ../grsync.glade.h:29 msgid "Show transfer progress" msgstr "显示传输进度" #: ../grsync.glade.h:30 -#, fuzzy msgid "Ignore existing" msgstr "忽略已存在文件" #: ../grsync.glade.h:31 msgid "Ignore files which already exist in the destination" -msgstr "" +msgstr "忽略已经存在于目标处的文件" #: ../grsync.glade.h:32 -#, fuzzy msgid "Size only" msgstr "只比较尺寸" #: ../grsync.glade.h:33 msgid "Check size only, ignore time and checksum" -msgstr "" +msgstr "只比较尺寸，忽略时间及校验和" #: ../grsync.glade.h:34 msgid "Skip newer" -msgstr "" +msgstr "跳过较新的文件" #: ../grsync.glade.h:35 -#, fuzzy msgid "Do not update newer files" -msgstr "只更新已存在的文件" +msgstr "不更新较新的文件" #: ../grsync.glade.h:36 msgid "Windows compatibility" -msgstr "" +msgstr "与 Windows 兼容" #: ../grsync.glade.h:37 msgid "Provides workaround for a windows FAT filesystem limitation" -msgstr "" +msgstr "提供绕过 windows FAT 文件系统限制的临时方案" #: ../grsync.glade.h:38 msgid "Click to open the file browser" -msgstr "" +msgstr "点击以打开文件浏览器" #: ../grsync.glade.h:39 msgid "Source directory" -msgstr "" +msgstr "来源目录" #: ../grsync.glade.h:40 msgid "Destination directory" -msgstr "" +msgstr "目标目录" #: ../grsync.glade.h:41 msgid "Click here to switch the source with the destination directory" -msgstr "" +msgstr "点击此交换来源及目标目录" #: ../grsync.glade.h:42 -#, fuzzy msgid "Source and Destination:" -msgstr "删除目标文件" +msgstr "来源及目标：" #: ../grsync.glade.h:43 msgid "Basic options" @@ -207,7 +197,7 @@ #: ../grsync.glade.h:45 msgid "Always compare file contents (by checksum)" -msgstr "" +msgstr "总是比较文件内容（通过校验和）" #: ../grsync.glade.h:46 msgid "Preserve devices" @@ -227,31 +217,29 @@ #: ../grsync.glade.h:50 msgid "Keep numeric uid/gid instead of mapping user names and group names" -msgstr "" +msgstr "保留数字化的 UID/GID 而不映射用户名和组名" #: ../grsync.glade.h:51 -#, fuzzy msgid "Additional options:" -msgstr "高级选项" +msgstr "额外选项：" #: ../grsync.glade.h:52 msgid "Compress file data" msgstr "传输时压缩文件数据" #: ../grsync.glade.h:53 -#, fuzzy msgid "" "Compress file data when transferring (useful only if at least one side is " "remote)" -msgstr "传输时压缩文件数据" +msgstr "传输时压缩文件数据（仅对于至少一方为远程主机时有用）" #: ../grsync.glade.h:54 msgid "Copy symlinks as symlinks" -msgstr "像对待普通文件一样拷贝符号链接" +msgstr "复制符号链接" #: ../grsync.glade.h:55 msgid "Symbolic links are copied as such, do not copy link target file" -msgstr "" +msgstr "原样复制符号连接，并不复制连接指向的文件" #: ../grsync.glade.h:56 msgid "Make backups" @@ -259,46 +247,47 @@ #: ../grsync.glade.h:57 msgid "Make backups of existing files on the destination" -msgstr "" +msgstr "为目标处已存在的文件创建备份" #: ../grsync.glade.h:58 -#, fuzzy msgid "Copy hardlinks as hardlinks" -msgstr "像对待普通文件一样拷贝符号链接" +msgstr "复制硬连接" #: ../grsync.glade.h:59 msgid "Hard links are copied as such, do not copy link target file" -msgstr "" +msgstr "原样复制硬连接，并不复制连接指向的文件" #: ../grsync.glade.h:60 msgid "Show itemized changes list" -msgstr "" +msgstr "分列显示变化列表" #: ../grsync.glade.h:61 msgid "Show additional information on every changed file" -msgstr "" +msgstr "为每个改变的文件显示额外信息" #: ../grsync.glade.h:62 msgid "Disable recursion" -msgstr "" +msgstr "禁用递归" #: ../grsync.glade.h:63 msgid "If checked the subdirectories of the source folder will be ignored" -msgstr "" +msgstr "若选择则忽略来源文件夹中的子目录" #: ../grsync.glade.h:64 msgid "Additional command line options to pass to the rsync program" -msgstr "" +msgstr "需要传递给 rsync 程序的额外命令行选项" #: ../grsync.glade.h:65 msgid "Protect remote args" -msgstr "" +msgstr "保护远程主机参数" #: ../grsync.glade.h:66 msgid "" "Protect remote arguments from shell expansion, Avoids the need to manually " "escape remote folders and other options which use file names like --exclude" msgstr "" +"保护远程主机参数不受 Shell 扩展，避免在如 --exclude 等需要文件名的参数中需要" +"手动转义远程目录名" #: ../grsync.glade.h:67 msgid "Advanced options" @@ -306,7 +295,7 @@ #: ../grsync.glade.h:68 msgid "Execute this command before rsync:" -msgstr "" +msgstr "在 rsync 运行前执行以下命令：" #: ../grsync.glade.h:69 msgid "" @@ -314,10 +303,12 @@ "useful, for instance, to mount a filesystem before starting or to do some " "cleanup." msgstr "" +"勾选此项如果您想要在同步前执行一些命令。某些场景下会很有用，比如在开始前挂载" +"文件系统或者做一些清理。" #: ../grsync.glade.h:70 msgid "Execute this command after rsync:" -msgstr "" +msgstr "在 rsync 运行后执行以下命令：" #: ../grsync.glade.h:71 msgid "" @@ -325,30 +316,32 @@ "useful, for instance, to unmount a filesystem at the end or to do some " "cleanup." msgstr "" +"勾选此项如果您想要在同步后执行一些命令。某些场景下会很有用，比如在结束后卸载" +"文件系统或者做一些清理。" #: ../grsync.glade.h:72 msgid "Browse files instead of folders" -msgstr "" +msgstr "浏览文件而不是文件夹" #: ../grsync.glade.h:73 msgid "" "By setting this switch, the browse source and destination buttons will open " "a dialog for selecting files instead of folders" -msgstr "" +msgstr "通过设定此开关，浏览来源和目标按钮将打开一个对话框供选择文件而非文件夹" #: ../grsync.glade.h:74 msgid "Halt on failure" -msgstr "" +msgstr "遇到错误时停止" #: ../grsync.glade.h:75 msgid "" "When running the \"before\" command, if it fails for some reason, don't run " "rsync and halt" -msgstr "" +msgstr "如果在执行“前提”命令时由于某种原因失败，不再运行 rsync 并停止" #: ../grsync.glade.h:76 msgid "On rsync error only" -msgstr "" +msgstr "仅当遇到 rsync 错误时" #: ../grsync.glade.h:77 msgid "" @@ -357,98 +350,96 @@ "trouble.\n" "Try a command like \"mail -s 'rsync error' you@domain.com\"." msgstr "" +"仅当同步错误时执行“后续”命令。\n" +"比如仅在遇到问题时发送电子邮件。\n" +"类似的命令如“mail -s 'rsync error' you@domain.com”。" #: ../grsync.glade.h:80 msgid "Notes:" -msgstr "" +msgstr "注解：" #: ../grsync.glade.h:81 -#, fuzzy msgid "Free text notes on the current session" -msgstr "您不能删除默认会话" +msgstr "对于当前会话的任意注解" #: ../grsync.glade.h:82 msgid "Run as superuser" -msgstr "" +msgstr "以超级用户运行" #: ../grsync.glade.h:83 msgid "" "Run rsync with superuser (root, administrator) privileges. Use this if you " "need to access system files, for example when doing a full system backup." msgstr "" +"以 rsync 权限（根用户，管理员）运行。若您需要访问系统文件时使用此选项，比如使" +"用完整系统备份时。" #: ../grsync.glade.h:84 -#, fuzzy msgid "Extra options" -msgstr "常用选项" +msgstr "额外选项" #: ../grsync.glade.h:85 msgid "Include these sessions:" -msgstr "" +msgstr "包含这些会话：" #: ../grsync.glade.h:86 -#, fuzzy msgid "Set options" -msgstr "常用选项" +msgstr "组选项" #: ../grsync.glade.h:87 -#, fuzzy msgid "Add session" -msgstr "会话：" +msgstr "添加会话：" #: ../grsync.glade.h:88 -#, fuzzy msgid "Enter session name you want to create:" -msgstr "输入会话名称" +msgstr "输入您想要创建的会话名称：" #: ../grsync.glade.h:89 -#, fuzzy msgid "Enter the name of the new session to create" -msgstr "输入会话名称" +msgstr "输入您想要创建的会话名称" #: ../grsync.glade.h:90 -#, fuzzy msgid "Add as session set" -msgstr "会话：" +msgstr "添加为会话设定组" #: ../grsync.glade.h:91 msgid "Create a new session set instead of a normal session" -msgstr "" +msgstr "创建一个新的会话组而不是普通会话" #: ../grsync.glade.h:92 msgid "Grsync preferences" -msgstr "" +msgstr "Grsync 首选项" #: ../grsync.glade.h:93 msgid "Show rsync output by default" -msgstr "" +msgstr "默认显示 rsync 输出" #: ../grsync.glade.h:94 msgid "" "Wether to show rsync output by default or hide it (show graphical " "information only)" -msgstr "" +msgstr "是否默认显示 rsync 输出或者隐藏它（仅显示图形化的信息）" #: ../grsync.glade.h:95 msgid "Remember last used session" -msgstr "" +msgstr "记住上次使用过的会话" #: ../grsync.glade.h:96 msgid "Whether to load the last used session at startup or use the default one" -msgstr "" +msgstr "是否载入上次使用过的会话或者使用默认会话" #: ../grsync.glade.h:97 msgid "Show error list when finished" -msgstr "" +msgstr "完成后显示错误列表" #: ../grsync.glade.h:98 msgid "" "When rsync has finished, show all the errors encountered in a separate window" -msgstr "" +msgstr "当 rsync 完成后，在另外的窗口显示遇到的所有错误" #: ../grsync.glade.h:99 msgid "Enable logging" -msgstr "" +msgstr "启用日志" #: ../grsync.glade.h:100 msgid "" @@ -456,39 +447,40 @@ "will be located in the grsync directory (usually \".grsync\" into your user " "home)" msgstr "" +"是否保存 rsync 输出为日至文件，以会话名称命名保存在 grsync 目录（通常是您用户" +"目录下的“.grsync”）" #: ../grsync.glade.h:101 msgid "Enter the rsync command to use, eventually including its full path" -msgstr "" +msgstr "输入要使用的 rsync 命令，需要包含完整路径" #: ../grsync.glade.h:102 -#, fuzzy msgid "Rsync executable:" -msgstr "Rsync 输出：" +msgstr "Rsync 可执行文件：" #: ../grsync.glade.h:103 msgid "Fast rsync output scrolling" -msgstr "" +msgstr "快速滚屏 rsync 输出" #: ../grsync.glade.h:104 msgid "" "Select this if you want rsync output to scroll many lines at a time, in " "order to be faster" -msgstr "" +msgstr "勾选此如果您想要 rsync 输出一次滚动多行，从而变得更快" #: ../grsync.glade.h:105 msgid "Enable switch button" -msgstr "" +msgstr "启用切换按钮" #: ../grsync.glade.h:106 msgid "" "Select this if you want an additional \"switch source with destination\" " "button in the basic options tab" -msgstr "" +msgstr "勾选此如果您想要在常用选项标签页拥有“切换来源及目标”按钮" #: ../grsync.glade.h:107 msgid "Use tray icon" -msgstr "" +msgstr "使用托盘图标" #: ../grsync.glade.h:108 msgid "" @@ -496,59 +488,73 @@ "of the application bar (may not work on Unity environments, like Ubuntu >= " "11.4)" msgstr "" +"勾选此将在系统托盘显示应用图标，而不是应用程序栏（可能不适用于 Ubuntu 11.4 以" +"上版本的 Unity 环境）" #: ../grsync.glade.h:109 -msgid "Errors list" +msgid "Overwrite logs" msgstr "" #: ../grsync.glade.h:110 -msgid "Error list of last rsync run:" +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" msgstr "" #: ../grsync.glade.h:111 +msgid "Errors list" +msgstr "错误列表" + +#: ../grsync.glade.h:112 +msgid "Error list of last rsync run:" +msgstr "上次运行 rsync 的错误列表：" + +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" -msgstr "" +msgstr "空闲" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" -msgstr "" +msgstr "当前文件的传输进度" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" -msgstr "" +msgstr "整体进度" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " "files to be copied in advance" msgstr "" +"整体传输进度：仅适用于 rsync 2.6.1 及以上版本，取决于 rsync 先前预估的文件的" +"能力该汇报值可能不准确" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Rsync 输出：" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" -msgstr "" +msgstr "点击此按钮显示错误列表" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" -msgstr "" +msgstr "暂停/恢复 rsync 运行" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" -msgstr "" +msgstr "停止 rsync 并关闭此窗口" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" -msgstr "" +msgstr "关于后缀的斜杠" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -562,198 +568,203 @@ "\t\t\t rsync -a /src/foo /dest\n" "\t\t\t rsync -a /src/foo/ /dest/foo\n" msgstr "" +"在来源目录后的后缀斜杠可以避免在目标处创建多余的目录结构。\n" +"您可以认为一个后缀的 / 代表“复制该目录的内容”而不是“复制该目录本身及其内" +"容”。\n" +"\n" +"换个角度来说，以下的命令以相同的方式复制文件：\n" +"\n" +"\t\t\t rsync -a /src/foo /dest\n" +"\t\t\t rsync -a /src/foo/ /dest/foo\n" #: ../src/main.c:58 #, c-format msgid "Error: conflicting arguments\n" -msgstr "" +msgstr "错误：参数冲突\n" #: ../src/callbacks.c:138 #, c-format msgid "(ERROR) Can't open config file! Maybe this is the first run?\n" -msgstr "(错误) 不能打开配置文件！这是第一次运行本程序吗？\n" +msgstr "(错误) 不能打开配置文件！这是首次运行本程序吗？\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\t无法保存设置！\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "浏览" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" -msgstr "" +msgstr "%.f%% （已用 %li:%02li ，剩余 %li:%02li ）" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" -msgstr "" +msgstr "模拟进行中" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" -msgstr "" +msgstr "您在命令行指定的会话并不存在" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 -#, fuzzy +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " "default executable search PATH. See file/preferences to change the default " "rsync executable command." msgstr "" -"无法运行必需的命令行程序 rsync。您需要安装 rsync 软件包，并确认它的可执行程序" -"位于查询路径 PATH 中。" +"无法运行 rsync 命令行工具。您需要安装 rsync 软件包，并确认它的可执行程序位于" +"默认查询路径 PATH 中。查看文件/首选项来修改默认的 rsync 可执行命令。" -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" -msgstr "" +msgstr "** 启动后续命令：\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" -msgstr "" +msgstr "结束但发生错误！" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" -msgstr "" +msgstr "成功结束！" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " -msgstr "" +msgstr "Rsync 进程退出状态： " -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" -msgstr "" +msgstr "** 启动前提命令：\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" -msgstr "" +msgstr "** 启动 RSYNC 命令（模拟模式）：\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" -msgstr "" +msgstr "** 启动 RSYNC 命令：\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" -msgstr "" +msgstr "无法执行 rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" -msgstr "" +msgstr "该会话名为保留名，您无法以此名调用" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" -msgstr "" +msgstr "一个相同命名的会话已存在" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "您不能删除默认会话" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "您确认要删除会话“%s”吗？" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " -msgstr "" +msgstr "应用图标 Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " -msgstr "" +msgstr "作者 Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " -msgstr "" +msgstr "完善 Maemo 兼容性 Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " -msgstr "" +msgstr "额外的错误修复 Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " -msgstr "" +msgstr "荷兰语 Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "" +"简体中文 Xie Yanbo ，Tommy He " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " -msgstr "" +msgstr "法语 xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " -msgstr "" +msgstr "瑞典语 Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " -msgstr "" +msgstr "土耳其语 Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " -msgstr "" +msgstr "俄语 Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " -msgstr "" +msgstr "德语 Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " -msgstr "" +msgstr "西班牙 Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " -msgstr "" +msgstr "捷克语 Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " -msgstr "" +msgstr "加利西亚语 Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " -msgstr "" +msgstr "加泰罗尼亚语 Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " -msgstr "" +msgstr "巴西葡萄牙语 Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " -msgstr "" +msgstr "印度尼西亚语 Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " -msgstr "" +msgstr "克罗地亚语 Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." -msgstr "" +msgstr "同步文件及文件夹（一个 rsync 的 GTK 图形前端）。" -#: ../src/callbacks.c:1340 -#, fuzzy +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" msgstr "" -"(C) Piero Orsoni 与其他人\n" -"基于 GPL 许可证发布\n" -"详情请参考 AUTHORS 和 COPYING 文件\n" -"\n" -"http://www.opbyte.it/grsync/" +"(C) Piero Orsoni and others. 基于 GPL 许可证发布。\n" +"查看 COPYING 获取详情" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" -msgstr "" +msgstr "会话已导入" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" -msgstr "" +msgstr "会话已导出" #, fuzzy #~ msgid "" diff -Nru grsync-1.2.5/po/zh_TW.po grsync-1.2.6/po/zh_TW.po --- grsync-1.2.5/po/zh_TW.po 2014-08-20 11:37:42.000000000 +0000 +++ grsync-1.2.6/po/zh_TW.po 2015-12-23 15:45:21.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: grsync 1.2.3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-08-20 13:35+0200\n" +"POT-Creation-Date: 2015-12-23 16:45+0100\n" "PO-Revision-Date: 2013-05-25 12:07+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -495,30 +495,40 @@ "環境，例如 Ubuntu >= 11.4)" #: ../grsync.glade.h:109 +msgid "Overwrite logs" +msgstr "" + +#: ../grsync.glade.h:110 +msgid "" +"Whether to overwrite the logs when running a session. This will make you " +"save space, but you'll loose the logs of the previous runs" +msgstr "" + +#: ../grsync.glade.h:111 msgid "Errors list" msgstr "錯誤列表" -#: ../grsync.glade.h:110 +#: ../grsync.glade.h:112 msgid "Error list of last rsync run:" msgstr "最近一次 rsync 運行時的錯誤列表：" -#: ../grsync.glade.h:111 +#: ../grsync.glade.h:113 msgid "rsync" msgstr "rsync" -#: ../grsync.glade.h:112 +#: ../grsync.glade.h:114 msgid "Idle" msgstr "閒置" -#: ../grsync.glade.h:113 +#: ../grsync.glade.h:115 msgid "Transfer progress of current file" msgstr "目前檔案的轉移進度" -#: ../grsync.glade.h:114 +#: ../grsync.glade.h:116 msgid "Global progress" msgstr "整體進度" -#: ../grsync.glade.h:115 +#: ../grsync.glade.h:117 msgid "" "Global transfer progress: works only with rsync version 2.6.1 or newer, and " "may report wrong values depending on the ability of rsync to estimate the " @@ -527,27 +537,27 @@ "整體轉移進度：只能用於 rsync 版本 2.6.1 或更新版本，而依據 rsync 事先估計要複" "製檔案的能力有所不同，也許會報告錯誤的值" -#: ../grsync.glade.h:116 +#: ../grsync.glade.h:118 msgid "Rsync output:" msgstr "Rsync 輸出：" -#: ../grsync.glade.h:117 +#: ../grsync.glade.h:119 msgid "Click this button to show the error list" msgstr "按一下這個按鈕以顯示錯誤列表" -#: ../grsync.glade.h:118 +#: ../grsync.glade.h:120 msgid "Pause/resume rsync run" msgstr "暫停/再續 rsync 的運行" -#: ../grsync.glade.h:119 +#: ../grsync.glade.h:121 msgid "Stops rsync and closes the window" msgstr "停止 rsync 並關閉視窗" -#: ../grsync.glade.h:120 +#: ../grsync.glade.h:122 msgid "About trailing slashes" msgstr "關於尾隨斜線" -#: ../grsync.glade.h:121 +#: ../grsync.glade.h:123 msgid "" "A trailing slash on the source directory avoids creating an additional " "directory level at the destination.\n" @@ -580,31 +590,31 @@ msgid "(ERROR) Can't open config file! Maybe this is the first run?\n" msgstr "(錯誤) 無法開啟組態檔案！也許這是首次運行？\n" -#: ../src/callbacks.c:388 ../src/callbacks.c:1299 +#: ../src/callbacks.c:390 ../src/callbacks.c:1302 #, c-format msgid "\tUnable to save settings!\n" msgstr "\t無法儲存設定值！\n" -#: ../src/callbacks.c:482 ../src/callbacks.c:485 ../src/callbacks.c:512 -#: ../src/callbacks.c:515 ../src/callbacks.c:1481 ../src/callbacks.c:1485 -#: ../src/callbacks.c:1516 ../src/callbacks.c:1520 +#: ../src/callbacks.c:484 ../src/callbacks.c:487 ../src/callbacks.c:514 +#: ../src/callbacks.c:517 ../src/callbacks.c:1486 ../src/callbacks.c:1490 +#: ../src/callbacks.c:1521 ../src/callbacks.c:1525 msgid "Browse" msgstr "瀏覽" -#: ../src/callbacks.c:551 +#: ../src/callbacks.c:553 #, c-format msgid "%.f%% (%li:%02li elapsed, %li:%02li remaining)" msgstr "%.f%% (已過 %li:%02li，尚餘 %li:%02li)" -#: ../src/callbacks.c:703 +#: ../src/callbacks.c:705 msgid "Simulation in progress" msgstr "模擬進度" -#: ../src/callbacks.c:755 ../src/callbacks.c:760 +#: ../src/callbacks.c:757 ../src/callbacks.c:762 msgid "The session you specified on the command line doesn't exists" msgstr "您在命令列上指定的作業階段並不存在" -#: ../src/callbacks.c:774 ../src/callbacks.c:777 +#: ../src/callbacks.c:776 ../src/callbacks.c:779 msgid "" "Unable to execute the rsync command line tool. It is needed by this program. " "You may need to install the rsync package or make it available in the " @@ -615,134 +625,134 @@ "位於預設可執行檔案搜尋路徑中。請參看檔案/偏好設定以變更預設的 rsync 可執行檔" "命令。" -#: ../src/callbacks.c:898 +#: ../src/callbacks.c:900 msgid "** Launching AFTER command:\n" msgstr "** 啟動 AFTER 命令：\n" -#: ../src/callbacks.c:913 +#: ../src/callbacks.c:915 msgid "Completed with errors!" msgstr "完成但有錯誤！" -#: ../src/callbacks.c:916 +#: ../src/callbacks.c:918 msgid "" "Completed successfully!" msgstr "已成功結束！" -#: ../src/callbacks.c:1049 +#: ../src/callbacks.c:1051 msgid "Rsync process exit status: " msgstr "Rsync 行程離開狀態：" -#: ../src/callbacks.c:1110 +#: ../src/callbacks.c:1113 msgid "** Launching BEFORE command:\n" msgstr "** 啟動 BEFORE 命令：\n" -#: ../src/callbacks.c:1120 +#: ../src/callbacks.c:1123 msgid "** Launching RSYNC command (simulation mode):\n" msgstr "** 啟動 RSYNC 命令 (模擬模式)：\n" -#: ../src/callbacks.c:1121 +#: ../src/callbacks.c:1124 msgid "** Launching RSYNC command:\n" msgstr "** 啟動 RSYNC 命令：\n" -#: ../src/callbacks.c:1165 ../src/callbacks.c:1169 +#: ../src/callbacks.c:1168 ../src/callbacks.c:1172 msgid "Cannot execute rsync" msgstr "無法執行 rsync" -#: ../src/callbacks.c:1215 ../src/callbacks.c:1220 +#: ../src/callbacks.c:1218 ../src/callbacks.c:1223 msgid "This session name is reserved, you cannot call it like this" msgstr "這個作業階段名稱已被保留，您無法以此稱呼它" -#: ../src/callbacks.c:1231 ../src/callbacks.c:1236 +#: ../src/callbacks.c:1234 ../src/callbacks.c:1239 msgid "A session named like this already exists" msgstr "同名的作業階段已經存在" -#: ../src/callbacks.c:1265 ../src/callbacks.c:1270 +#: ../src/callbacks.c:1268 ../src/callbacks.c:1273 msgid "You cannot delete the default session" msgstr "您不能刪除預設作業階段" -#: ../src/callbacks.c:1278 ../src/callbacks.c:1281 +#: ../src/callbacks.c:1281 ../src/callbacks.c:1284 #, c-format msgid "Are you sure you want to delete the '%s' session?" msgstr "確定要刪除 %s 作業階段？" -#: ../src/callbacks.c:1313 +#: ../src/callbacks.c:1316 msgid "Application icons by Roberto Gadotti " msgstr "應用程式圖示由 Roberto Gadotti " -#: ../src/callbacks.c:1318 +#: ../src/callbacks.c:1321 msgid "Written by Piero Orsoni " msgstr "作者 Piero Orsoni " -#: ../src/callbacks.c:1319 +#: ../src/callbacks.c:1322 msgid "Maemo compatibility by Luca Donaggio " msgstr "Maemo 相容性由 Luca Donaggio " -#: ../src/callbacks.c:1320 +#: ../src/callbacks.c:1323 msgid "Additional bug-fixing by Luca Marturana " msgstr "額外的錯誤修正由 Luca Marturana " -#: ../src/callbacks.c:1322 +#: ../src/callbacks.c:1325 msgid "Dutch translation by Frank de Bruijn " msgstr "荷蘭語翻譯由 Frank de Bruijn " -#: ../src/callbacks.c:1323 +#: ../src/callbacks.c:1326 msgid "Simplified Chinese translation by Xie Yanbo " msgstr "簡化字漢語翻譯由 Xie Yanbo " -#: ../src/callbacks.c:1324 +#: ../src/callbacks.c:1327 msgid "French translation by xavier " msgstr "法語翻譯由 xavier " -#: ../src/callbacks.c:1325 +#: ../src/callbacks.c:1328 msgid "Swedish translation by Daniel Nylander " msgstr "瑞典語翻譯由 Daniel Nylander " -#: ../src/callbacks.c:1326 +#: ../src/callbacks.c:1329 msgid "Turkish translation by Doruk Fisek " msgstr "土耳其語翻譯由 Doruk Fisek " -#: ../src/callbacks.c:1327 +#: ../src/callbacks.c:1330 msgid "Russian translation by Evgenii Terechkov " msgstr "俄語翻譯由 Evgenii Terechkov " -#: ../src/callbacks.c:1328 +#: ../src/callbacks.c:1331 msgid "German translation by Martin Lettner " msgstr "德語翻譯由 Martin Lettner " -#: ../src/callbacks.c:1329 +#: ../src/callbacks.c:1332 msgid "Spanish translation by Ibon Castilla Varela " msgstr "西班牙語翻譯由 Ibon Castilla Varela " -#: ../src/callbacks.c:1330 +#: ../src/callbacks.c:1333 msgid "Czech translation by Martin Balajka " msgstr "捷克語翻譯由 Martin Balajka " -#: ../src/callbacks.c:1331 +#: ../src/callbacks.c:1334 msgid "Galician translation by Daniel Espinheira " msgstr "加里斯亞語翻譯由 Daniel Espinheira " -#: ../src/callbacks.c:1332 +#: ../src/callbacks.c:1335 msgid "Catalan translation by Josep Sànchez " msgstr "加泰羅尼亞語翻譯由 Josep Sànchez " -#: ../src/callbacks.c:1333 +#: ../src/callbacks.c:1336 msgid "" "Brazilian Portuguese translation by Fábio Nogueira " msgstr "巴西葡萄牙語翻譯由 Fábio Nogueira " -#: ../src/callbacks.c:1334 +#: ../src/callbacks.c:1337 msgid "Indonesian translation by Waluyo Adi Siswanto " msgstr "印尼語翻譯由 Waluyo Adi Siswanto " -#: ../src/callbacks.c:1335 +#: ../src/callbacks.c:1338 msgid "Croatian translation by Bojan Vondra " msgstr "克羅埃西亞語翻譯由 Bojan Vondra " -#: ../src/callbacks.c:1339 +#: ../src/callbacks.c:1342 msgid "Synchronize files and folders (a GTK GUI for rsync)." msgstr "同步檔案與資料夾 (rsync 的 GTK 圖形使用者介面)。" -#: ../src/callbacks.c:1340 +#: ../src/callbacks.c:1343 msgid "" "(C) Piero Orsoni and others. Released under the GPL.\n" "See COPYING for details" @@ -750,11 +760,11 @@ "©Piero Orsoni 與其他人。依據 GPL 釋出。\n" "請參看 COPYING 以瞭解細節" -#: ../src/callbacks.c:1496 ../src/callbacks.c:1500 +#: ../src/callbacks.c:1501 ../src/callbacks.c:1505 msgid "Session imported" msgstr "作業階段已匯入" -#: ../src/callbacks.c:1532 ../src/callbacks.c:1536 +#: ../src/callbacks.c:1537 ../src/callbacks.c:1541 msgid "Session exported" msgstr "作業階段已匯出" diff -Nru grsync-1.2.5/README grsync-1.2.6/README --- grsync-1.2.5/README 2013-04-30 11:48:54.000000000 +0000 +++ grsync-1.2.6/README 2015-12-16 15:24:02.000000000 +0000 @@ -6,9 +6,10 @@ and powerful command line directory and file synchronization tool. Grsync makes use of the GTK libraries and is released under the GPL license, so it is opensource. It doesn't need the gnome libraries to run, but can of course -run under gnome pretty fine. It can be effectively used to synchronize local -directories and it supports remote targets as well (even though it doesn't -support browsing the remote folder). Sample uses of grsync include: +run under gnome, kde or unity pretty fine. It can be effectively used to +synchronize local directories and it supports remote targets as well (even +though it doesn't support browsing the remote folder). +Sample uses of grsync include: synchronize a music collection with removable devices, backup personal files to a networked drive, replication of a partition to another one, mirroring of files, etc. @@ -22,7 +23,7 @@ * Session sets can be created: run multiple sessions at once! * Can do simulation or normal execution * Captures and prints rsync output nicely on a own window and log to a - file + file (remember to clean it periodically or setup automatic log rotation) * Parses rsync output to display progress bars and other information * Highlights errors and show them on a separate window, for better and faster control over rsync runs @@ -33,9 +34,10 @@ * Shell script for batch, crontab use etc. provided (grsync-batch) * Can import and export sessions on file; i.e. share your settings with people! - * Can minimize to tray icon + * Can minimize to system tray (status icon), when supported * Can run specific sessions with superuser privileges * Rsync backup made easy! + * Supports the Unity framework for progress display and notification * Needs rsync installed on the system (command line tool only, no need for server-side daemon) and GTK * Available for free and with sources! diff -Nru grsync-1.2.5/src/callbacks.c grsync-1.2.6/src/callbacks.c --- grsync-1.2.5/src/callbacks.c 2014-08-19 15:45:34.000000000 +0000 +++ grsync-1.2.6/src/callbacks.c 2015-12-23 15:38:40.000000000 +0000 @@ -33,7 +33,7 @@ gboolean had_error, paused, first_load_groups = TRUE, dryrunning = FALSE, must_scroll = FALSE, is_set = FALSE; gchar **groups = NULL, **argv, *error_list = NULL, *watch_oldfile = NULL; GtkWidget *rsync_window = NULL; -gboolean config_output = FALSE, config_remember = TRUE, config_errorlist = FALSE, config_log = FALSE, config_fastscroll = TRUE; +gboolean config_output = FALSE, config_remember = TRUE, config_errorlist = FALSE, config_log = FALSE, config_log_overwrite = FALSE, config_fastscroll = TRUE; #ifndef MAEMO gboolean config_switchbutton = FALSE, config_trayicon = FALSE; #endif @@ -163,6 +163,7 @@ ini_get_boolean(settings_file, "remember", &config_remember); ini_get_boolean(settings_file, "errorlist", &config_errorlist); ini_get_boolean(settings_file, "logging", &config_log); + ini_get_boolean(settings_file, "logging_overwrite", &config_log_overwrite); ini_get_boolean(settings_file, "fastscroll", &config_fastscroll); #ifndef MAEMO ini_get_boolean(settings_file, "switchbutton", &config_switchbutton); @@ -289,12 +290,13 @@ g_key_file_set_boolean(settings_file, CONFIG_GROUP, "remember", config_remember); g_key_file_set_boolean(settings_file, CONFIG_GROUP, "errorlist", config_errorlist); g_key_file_set_boolean(settings_file, CONFIG_GROUP, "logging", config_log); + g_key_file_set_boolean(settings_file, CONFIG_GROUP, "logging_overwrite", config_log_overwrite); g_key_file_set_boolean(settings_file, CONFIG_GROUP, "fastscroll", config_fastscroll); #ifndef MAEMO g_key_file_set_boolean(settings_file, CONFIG_GROUP, "switchbutton", config_switchbutton); g_key_file_set_boolean(settings_file, CONFIG_GROUP, "trayicon", config_trayicon); #endif - if (session_last != -1) g_key_file_set_string(settings_file, CONFIG_GROUP, "last_session", groups[session_last]); + if (session_last != -1 && config_remember) g_key_file_set_string(settings_file, CONFIG_GROUP, "last_session", groups[session_last]); // window position and size g_key_file_set_integer(settings_file, CONFIG_GROUP, "root_x", root_x); @@ -687,7 +689,7 @@ if (config_log) { gtmp = g_strconcat(grsync_dir, "/", groups[session_last], ".log", NULL); - log_file = fopen(gtmp, "a"); + log_file = fopen(gtmp, (config_log_overwrite ? "w" : "a")); g_free(gtmp); } @@ -1104,10 +1106,11 @@ comm_str = (gchar*) gtk_entry_get_text((GtkEntry*) gtk_builder_get_object(builder, "entry_com_before")); if (!g_spawn_command_line_sync(comm_str, &comm_out, &comm_err, &err, NULL) || err) { comm_out = g_strconcat("", NULL); - comm_err = g_strconcat("Error launching command!\n", NULL); + comm_err = g_strconcat("Error launching command!", NULL); + gtk_label_set_text((GtkLabel*) gtk_builder_get_object(builder, "label_file"), comm_err); if (get_checkbox("check_com_halt")) halt = TRUE; } - comm_before = g_strconcat(_("** Launching BEFORE command:\n"), comm_str, "\n", comm_out, comm_err, "\n", NULL); + comm_before = g_strconcat(_("** Launching BEFORE command:\n"), comm_str, "\n", comm_out, comm_err, "\n\n", NULL); g_free(comm_out); g_free(comm_err); } else { @@ -1385,6 +1388,7 @@ set_checkbox("check_remember", config_remember); set_checkbox("check_errorlist", config_errorlist); set_checkbox("check_log", config_log); + set_checkbox("check_log_overwrite", config_log_overwrite); set_checkbox("check_fastscroll", config_fastscroll); #ifndef MAEMO set_checkbox("check_switchbutton", config_switchbutton); @@ -1398,6 +1402,7 @@ config_remember = get_checkbox("check_remember"); config_errorlist = get_checkbox("check_errorlist"); config_log = get_checkbox("check_log"); + config_log_overwrite = get_checkbox("check_log_overwrite"); config_fastscroll = get_checkbox("check_fastscroll"); #ifndef MAEMO config_switchbutton = get_checkbox("check_switchbutton"); diff -Nru grsync-1.2.5/src/Makefile.in grsync-1.2.6/src/Makefile.in --- grsync-1.2.5/src/Makefile.in 2014-04-28 12:26:58.000000000 +0000 +++ grsync-1.2.6/src/Makefile.in 2016-03-15 13:08:34.000000000 +0000 @@ -1,7 +1,7 @@ -# Makefile.in generated by automake 1.14.1 from Makefile.am. +# Makefile.in generated by automake 1.15 from Makefile.am. # @configure_input@ -# Copyright (C) 1994-2013 Free Software Foundation, Inc. +# Copyright (C) 1994-2014 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,7 +16,17 @@ VPATH = @srcdir@ -am__is_gnu_make = test -n '$(MAKEFILE_LIST)' && test -n '$(MAKELEVEL)' +am__is_gnu_make = { \ + if test -z '$(MAKELEVEL)'; then \ + false; \ + elif test -n '$(MAKE_HOST)'; then \ + true; \ + elif test -n '$(MAKE_VERSION)' && test -n '$(CURDIR)'; then \ + true; \ + else \ + false; \ + fi; \ +} am__make_running_with_option = \ case $${target_option-} in \ ?) ;; \ @@ -79,12 +89,11 @@ POST_UNINSTALL = : bin_PROGRAMS = grsync$(EXEEXT) subdir = src -DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ - $(top_srcdir)/mkinstalldirs $(top_srcdir)/depcomp ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 am__aclocal_m4_deps = $(top_srcdir)/configure.in am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ $(ACLOCAL_M4) +DIST_COMMON = $(srcdir)/Makefile.am $(am__DIST_COMMON) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = @@ -177,6 +186,8 @@ done | $(am__uniquify_input)` ETAGS = etags CTAGS = ctags +am__DIST_COMMON = $(srcdir)/Makefile.in $(top_srcdir)/depcomp \ + $(top_srcdir)/mkinstalldirs DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) ACLOCAL = @ACLOCAL@ ALL_LINGUAS = @ALL_LINGUAS@ @@ -339,7 +350,6 @@ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/Makefile'; \ $(am__cd) $(top_srcdir) && \ $(AUTOMAKE) --gnu src/Makefile -.PRECIOUS: Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @case '$?' in \ *config.status*) \ @@ -666,6 +676,8 @@ mostlyclean-generic pdf pdf-am ps ps-am tags tags-am uninstall \ uninstall-am uninstall-binPROGRAMS uninstall-binSCRIPTS +.PRECIOUS: Makefile + # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded.