diff -Nru file-roller-3.22.2/ChangeLog file-roller-3.22.3/ChangeLog --- file-roller-3.22.2/ChangeLog 2016-11-08 07:18:02.000000000 +0000 +++ file-roller-3.22.3/ChangeLog 2017-02-27 20:25:51.000000000 +0000 @@ -1,6 +1,69 @@ +commit 3bf4c97b388b9a4f6095aa8c454831324af51e34 +Author: Paolo Bacchilega +Date: 2017-02-27 + + updated for version 3.22.3 + +M NEWS +M configure.ac + +commit 347a917c0504a9c5ccfd0b8041e40d56ec9bd74a +Author: Paolo Bacchilega +Date: 2017-02-18 + + show the 'open destination' dialog only when using --notify + + and only for the last extracted archive + +M src/fr-application.c +M src/fr-window.c +M src/fr-window.h + +commit a9d765035f5b0786834fa6311e3780788484411a +Author: Paolo Bacchilega +Date: 2017-02-18 + + fixed crash after extracting a file + + [bug #778846] + +M src/fr-window.c + +commit 78a608ae8d0058fdf202da5b561c1cbdd937ad99 +Author: Paolo Bacchilega +Date: 2017-02-18 + + libarchive: don't convert null strings to utf8 + +M src/fr-archive-libarchive.c + +commit 06ffd877cf6444d0b4721458ee8c27af99135f05 +Author: Ask Hjorth Larsen +Date: 2017-02-16 + + Updated Danish translation + +M po/da.po + +commit a6723f359e2115bc07487a146c3a80c782ecac96 +Author: Piotr Drąg +Date: 2016-11-16 + + Update Polish translation + +M po/pl.po + +commit af62f324ed4ba2b31f778cef0a261e2e9f8f1e56 +Author: Matej Urbančič +Date: 2016-11-16 + + Updated Slovenian translation + +M po/sl.po + commit 764cf9e2e29cdd047315de0fef1ed9798e0a6f45 Author: Paolo Bacchilega -Date: 2016-11-08 +Date: 2016-11-08 updated for version 3.22.2 @@ -3851,7 +3914,7 @@ M po/kn.po commit e76ca6ab33e0712ca989f28810ce8b9adacf60df -Merge: 4505620 3b55b04 +Merge: 45056204 3b55b04c Author: Rūdolfs Mazurs Date: 2014-09-07 @@ -10244,7 +10307,7 @@ M help/de/de.po commit 0fd0ac3c6d43d52cb94c5612a04600345d7d7710 -Merge: c623764 f14b36e +Merge: c6237649 f14b36e3 Author: Paolo Bacchilega Date: 2012-08-09 @@ -10827,7 +10890,7 @@ M src/ui/properties.ui commit 8bd373f46d16cd41def5b860a8484ada7ee91951 -Merge: 4944208 c459aab +Merge: 49442086 c459aab9 Author: Paolo Bacchilega Date: 2012-08-06 @@ -19855,7 +19918,7 @@ M po/lt.po commit 53fb4e3ebc7f7f0137d7c03ec0bc7409d7419ba6 -Merge: 2bf6f9f 389f251 +Merge: 2bf6f9fe 389f251c Author: Paolo Bacchilega Date: 2009-10-23 diff -Nru file-roller-3.22.2/configure file-roller-3.22.3/configure --- file-roller-3.22.2/configure 2016-11-08 07:13:55.000000000 +0000 +++ file-roller-3.22.3/configure 2017-02-27 20:21:07.000000000 +0000 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for file-roller 3.22.2. +# Generated by GNU Autoconf 2.69 for file-roller 3.22.3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='file-roller' PACKAGE_TARNAME='file-roller' -PACKAGE_VERSION='3.22.2' -PACKAGE_STRING='file-roller 3.22.2' +PACKAGE_VERSION='3.22.3' +PACKAGE_STRING='file-roller 3.22.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller' PACKAGE_URL='' @@ -1418,7 +1418,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures file-roller 3.22.2 to adapt to many kinds of systems. +\`configure' configures file-roller 3.22.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1488,7 +1488,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file-roller 3.22.2:";; + short | recursive ) echo "Configuration of file-roller 3.22.3:";; esac cat <<\_ACEOF @@ -1626,7 +1626,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file-roller configure 3.22.2 +file-roller configure 3.22.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1904,7 +1904,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by file-roller $as_me 3.22.2, which was +It was created by file-roller $as_me 3.22.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2767,7 +2767,7 @@ # Define the identity of the package. PACKAGE='file-roller' - VERSION='3.22.2' + VERSION='3.22.3' cat >>confdefs.h <<_ACEOF @@ -14740,7 +14740,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by file-roller $as_me 3.22.2, which was +This file was extended by file-roller $as_me 3.22.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14806,7 +14806,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -file-roller config.status 3.22.2 +file-roller config.status 3.22.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru file-roller-3.22.2/configure.ac file-roller-3.22.3/configure.ac --- file-roller-3.22.2/configure.ac 2016-11-08 07:13:46.000000000 +0000 +++ file-roller-3.22.3/configure.ac 2017-02-27 20:20:59.000000000 +0000 @@ -2,7 +2,7 @@ AC_PREREQ([2.68]) -AC_INIT([file-roller],[3.22.2],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller]) +AC_INIT([file-roller],[3.22.3],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller]) AM_INIT_AUTOMAKE([1.11 foreign no-dist-gzip dist-xz tar-ustar]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) diff -Nru file-roller-3.22.2/data/org.gnome.FileRoller.desktop file-roller-3.22.3/data/org.gnome.FileRoller.desktop --- file-roller-3.22.2/data/org.gnome.FileRoller.desktop 2016-11-08 07:14:51.000000000 +0000 +++ file-roller-3.22.3/data/org.gnome.FileRoller.desktop 2017-02-27 20:21:13.000000000 +0000 @@ -283,5 +283,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.22.2 +X-GNOME-Bugzilla-Version=3.22.3 X-GNOME-UsesNotifications=true diff -Nru file-roller-3.22.2/data/org.gnome.FileRoller.desktop.in file-roller-3.22.3/data/org.gnome.FileRoller.desktop.in --- file-roller-3.22.2/data/org.gnome.FileRoller.desktop.in 2016-11-08 07:14:51.000000000 +0000 +++ file-roller-3.22.3/data/org.gnome.FileRoller.desktop.in 2017-02-27 20:21:12.000000000 +0000 @@ -15,5 +15,5 @@ X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.22.2 +X-GNOME-Bugzilla-Version=3.22.3 X-GNOME-UsesNotifications=true diff -Nru file-roller-3.22.2/debian/changelog file-roller-3.22.3/debian/changelog --- file-roller-3.22.2/debian/changelog 2017-02-20 15:00:00.000000000 +0000 +++ file-roller-3.22.3/debian/changelog 2017-03-06 15:00:00.000000000 +0000 @@ -1,9 +1,35 @@ -file-roller (3.22.2-2ubuntu1+sicklylife~ppa2) zesty; urgency=medium +file-roller (3.22.3-1ubuntu1+sicklylife~ppa1) zesty; urgency=medium * Added unzip.diff * Added ja.po.diff - -- Sickly Life Mon, 21 Feb 2017 00:00:00 +0900 + -- Sickly Life Tue, 7 Mar 2017 00:00:00 +0900 + +file-roller (3.22.3-1ubuntu1) zesty; urgency=medium + + * Merge with Debian. Remaining changes: + - debian/control.in: + + Depend on zip and unzip instead of p7zip-full which is in universe + + Suggest p7zip-full and squashfs-tools + + Recommend sessioninstaller + + Bump minimum pkg-gnome-tools for desktop file compatibility script + - debian/rules: + + Make a compatibility desktop file for upgraders + - bz_unity_headerbar.patch: + + Don't use GtkHeaderBar in Unity + - squashfs.patch: + + Support squashfs and snap files + - revert_nautilus_extension_removal.patch: + + Revert removal of nautilus extension since we're not using + Nautilus 3.22 yet + + -- Iain Lane Mon, 06 Mar 2017 16:55:18 +0000 + +file-roller (3.22.3-1) unstable; urgency=medium + + * New upstream release. + + -- Michael Biebl Tue, 28 Feb 2017 02:30:38 +0100 file-roller (3.22.2-2ubuntu1) zesty; urgency=medium diff -Nru file-roller-3.22.2/debian/copyright file-roller-3.22.3/debian/copyright --- file-roller-3.22.2/debian/copyright 2017-02-14 23:29:12.000000000 +0000 +++ file-roller-3.22.3/debian/copyright 2017-03-06 15:00:00.000000000 +0000 @@ -25,7 +25,7 @@ GNU General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see + along with this program. If not, see . On Debian systems, the complete text of the GNU General Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". @@ -42,7 +42,7 @@ Lesser General Public License for more details. . You should have received a copy of the GNU General Public License - along with this program. If not, see . + along with this program. If not, see . . On Debian systems, the complete text of the GNU Lesser General Public License can be found in "/usr/share/common-licenses/LGPL-2". diff -Nru file-roller-3.22.2/debian/patches/ja.po.diff file-roller-3.22.3/debian/patches/ja.po.diff --- file-roller-3.22.2/debian/patches/ja.po.diff 2017-02-20 15:00:00.000000000 +0000 +++ file-roller-3.22.3/debian/patches/ja.po.diff 2017-03-06 15:00:00.000000000 +0000 @@ -50,7 +50,7 @@ -#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:718 -#: ../src/fr-window.c:1972 ../src/fr-window.c:5491 +#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:454 -+#: ../src/fr-window.c:1976 ../src/fr-window.c:5499 ++#: ../src/fr-window.c:1974 ../src/fr-window.c:5497 msgid "Archive Manager" msgstr "アーカイブマネージャー" @@ -302,7 +302,7 @@ msgstr "圧縮" -#: ../src/dlg-extract.c:95 ../src/fr-window.c:6856 -+#: ../src/dlg-extract.c:95 ../src/fr-window.c:6850 ++#: ../src/dlg-extract.c:95 ../src/fr-window.c:6867 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -311,26 +311,26 @@ "作成してもよろしいですか?" -#: ../src/dlg-extract.c:103 ../src/fr-window.c:6864 -+#: ../src/dlg-extract.c:103 ../src/fr-window.c:6858 ++#: ../src/dlg-extract.c:103 ../src/fr-window.c:6875 msgid "Create _Folder" msgstr "フォルダーの作成(_F)" #: ../src/dlg-extract.c:122 ../src/dlg-extract.c:139 ../src/dlg-extract.c:166 -#: ../src/fr-window.c:4373 ../src/fr-window.c:6760 ../src/fr-window.c:6765 -#: ../src/fr-window.c:6885 ../src/fr-window.c:6904 ../src/fr-window.c:6909 -+#: ../src/fr-window.c:4379 ../src/fr-window.c:6774 ../src/fr-window.c:6779 -+#: ../src/fr-window.c:6879 ../src/fr-window.c:6898 ../src/fr-window.c:6903 ++#: ../src/fr-window.c:4377 ../src/fr-window.c:6791 ../src/fr-window.c:6796 ++#: ../src/fr-window.c:6896 ../src/fr-window.c:6915 ../src/fr-window.c:6920 msgid "Extraction not performed" msgstr "アーカイブの展開を中止します" -#: ../src/dlg-extract.c:123 ../src/fr-window.c:6881 -+#: ../src/dlg-extract.c:123 ../src/fr-window.c:6875 ++#: ../src/dlg-extract.c:123 ../src/fr-window.c:6892 #, c-format msgid "Could not create the destination folder: %s." msgstr "展開先のフォルダーを生成できません: %s" -#: ../src/dlg-extract.c:167 ../src/fr-window.c:4600 ../src/fr-window.c:4702 -+#: ../src/dlg-extract.c:167 ../src/fr-window.c:4606 ../src/fr-window.c:4708 ++#: ../src/dlg-extract.c:167 ../src/fr-window.c:4604 ../src/fr-window.c:4706 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" @@ -351,8 +351,8 @@ -#: ../src/fr-window.c:4040 ../src/fr-window.c:7470 ../src/fr-window.c:7827 -#: ../src/fr-window.c:9337 +#: ../src/dlg-package-installer.c:332 ../src/fr-archive.c:751 -+#: ../src/fr-window.c:4046 ../src/fr-window.c:7582 ../src/fr-window.c:7939 -+#: ../src/fr-window.c:9454 ++#: ../src/fr-window.c:4044 ../src/fr-window.c:7598 ../src/fr-window.c:7955 ++#: ../src/fr-window.c:9470 msgid "Archive type not supported." msgstr "この種類のアーカイブはサポートしていません。" @@ -504,7 +504,7 @@ -#: ../src/fr-window.c:2989 +#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:433 +#: ../src/fr-new-archive-dialog.c:451 ../src/fr-new-archive-dialog.c:473 -+#: ../src/fr-window.c:2991 ++#: ../src/fr-window.c:2989 msgid "Could not create the archive" msgstr "アーカイブを生成できません" @@ -519,7 +519,7 @@ #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-new-archive-dialog.c:452 ../src/fr-window.c:8141 -+#: ../src/fr-new-archive-dialog.c:453 ../src/fr-window.c:8253 ++#: ../src/fr-new-archive-dialog.c:453 ../src/fr-window.c:8269 msgid "New name is the same as old one, please type other name." msgstr "新しい名前が古い名前と同じです。他の名前を入力してください。" @@ -540,7 +540,7 @@ +msgstr "ファイルは \"%s\" 内にすでに存在します。ファイルを置換してその内容を上書きします。" -#: ../src/fr-new-archive-dialog.c:502 ../src/fr-window.c:6685 -+#: ../src/fr-new-archive-dialog.c:503 ../src/fr-window.c:6699 ++#: ../src/fr-new-archive-dialog.c:503 ../src/fr-window.c:6716 msgid "_Replace" msgstr "置換(_R)" @@ -561,244 +561,244 @@ msgstr "すべてのファイル" -#: ../src/fr-window.c:1206 -+#: ../src/fr-window.c:1208 ++#: ../src/fr-window.c:1207 msgid "Operation completed" msgstr "操作が完了しました" -#: ../src/fr-window.c:1592 -+#: ../src/fr-window.c:1594 ++#: ../src/fr-window.c:1593 msgid "Folder" msgstr "フォルダー" -#: ../src/fr-window.c:1979 -+#: ../src/fr-window.c:1983 ++#: ../src/fr-window.c:1981 msgid "[read only]" msgstr "[読み込み専用]" -#: ../src/fr-window.c:2120 -+#: ../src/fr-window.c:2124 ++#: ../src/fr-window.c:2122 #, c-format msgid "Could not display the folder \"%s\"" msgstr "フォルダー \"%s\" を表示できません" #. Translators: %s is a filename -#: ../src/fr-window.c:2293 ../src/fr-window.c:2331 -+#: ../src/fr-window.c:2297 ../src/fr-window.c:2335 ++#: ../src/fr-window.c:2295 ../src/fr-window.c:2333 #, c-format msgid "Creating \"%s\"" msgstr "\"%s\" を作成中" #. Translators: %s is a filename -#: ../src/fr-window.c:2297 -+#: ../src/fr-window.c:2301 ++#: ../src/fr-window.c:2299 #, c-format msgid "Loading \"%s\"" msgstr "\"%s\" を読込中" #. Translators: %s is a filename -#: ../src/fr-window.c:2301 -+#: ../src/fr-window.c:2305 ++#: ../src/fr-window.c:2303 #, c-format msgid "Reading \"%s\"" msgstr "\"%s\" を読込中" #. Translators: %s is a filename -#: ../src/fr-window.c:2305 -+#: ../src/fr-window.c:2309 ++#: ../src/fr-window.c:2307 #, c-format msgid "Deleting the files from \"%s\"" msgstr "\"%s\" からファイルを削除中" #. Translators: %s is a filename -#: ../src/fr-window.c:2309 -+#: ../src/fr-window.c:2313 ++#: ../src/fr-window.c:2311 #, c-format msgid "Testing \"%s\"" msgstr "\"%s\" を検査中" -#: ../src/fr-window.c:2312 -+#: ../src/fr-window.c:2316 ++#: ../src/fr-window.c:2314 msgid "Getting the file list" msgstr "ファイルの一覧を取得します" #. Translators: %s is a filename -#: ../src/fr-window.c:2316 -+#: ../src/fr-window.c:2320 ++#: ../src/fr-window.c:2318 #, c-format msgid "Copying the files to add to \"%s\"" msgstr "\"%s\" に追加するためにファイルをコピー中" #. Translators: %s is a filename -#: ../src/fr-window.c:2320 -+#: ../src/fr-window.c:2324 ++#: ../src/fr-window.c:2322 #, c-format msgid "Adding the files to \"%s\"" msgstr "\"%s\" にファイルを追加中" #. Translators: %s is a filename -#: ../src/fr-window.c:2324 -+#: ../src/fr-window.c:2328 ++#: ../src/fr-window.c:2326 #, c-format msgid "Extracting the files from \"%s\"" msgstr "\"%s\" からファイルを展開中" -#: ../src/fr-window.c:2327 -+#: ../src/fr-window.c:2331 ++#: ../src/fr-window.c:2329 msgid "Copying the extracted files to the destination" msgstr "取り出したファイルを展開先にコピー中" #. Translators: %s is a filename -#: ../src/fr-window.c:2336 -+#: ../src/fr-window.c:2340 ++#: ../src/fr-window.c:2338 #, c-format msgid "Saving \"%s\"" msgstr "\"%s\" を保存中" #. Translators: %s is a filename -#: ../src/fr-window.c:2343 -+#: ../src/fr-window.c:2347 ++#: ../src/fr-window.c:2345 #, c-format msgid "Renaming the files in \"%s\"" msgstr "\"%s\" 内のファイル名を変更中" #. Translators: %s is a filename -#: ../src/fr-window.c:2347 -+#: ../src/fr-window.c:2351 ++#: ../src/fr-window.c:2349 #, c-format msgid "Updating the files in \"%s\"" msgstr "\"%s\" 内のファイルを更新中" -#: ../src/fr-window.c:2636 -+#: ../src/fr-window.c:2640 ++#: ../src/fr-window.c:2638 #, c-format msgid "%d file remaining" msgid_plural "%'d files remaining" msgstr[0] "残り %d 個のファイル" -#: ../src/fr-window.c:2640 ../src/fr-window.c:3266 -+#: ../src/fr-window.c:2644 ../src/fr-window.c:3268 ++#: ../src/fr-window.c:2642 ../src/fr-window.c:3266 msgid "Please wait…" msgstr "お待ちください…" -#: ../src/fr-window.c:2758 -+#: ../src/fr-window.c:2762 ++#: ../src/fr-window.c:2760 msgid "Extraction completed successfully" msgstr "アーカイブの展開が完了しました" -#: ../src/fr-window.c:2761 -+#: ../src/fr-window.c:2765 ++#: ../src/fr-window.c:2763 msgid "_Show the Files" msgstr "ファイルを表示する(_S)" #. Translators: %s is a filename -#: ../src/fr-window.c:2778 ../src/fr-window.c:6219 -+#: ../src/fr-window.c:2782 ../src/fr-window.c:6231 ++#: ../src/fr-window.c:2780 ../src/fr-window.c:6224 #, c-format msgid "\"%s\" created successfully" msgstr "\"%s\" の作成に成功しました" -#: ../src/fr-window.c:2785 -+#: ../src/fr-window.c:2789 ++#: ../src/fr-window.c:2787 msgid "_Open the Archive" msgstr "アーカイブを開く(_O)" -#: ../src/fr-window.c:2873 ../src/fr-window.c:3045 -+#: ../src/fr-window.c:2877 ../src/fr-window.c:3047 ++#: ../src/fr-window.c:2875 ../src/fr-window.c:3045 msgid "Command exited abnormally." msgstr "コマンドが異常終了しました。" -#: ../src/fr-window.c:2994 -+#: ../src/fr-window.c:2996 ++#: ../src/fr-window.c:2994 msgid "An error occurred while extracting files." msgstr "ファイルの展開中にエラーが発生しました。" -#: ../src/fr-window.c:3000 -+#: ../src/fr-window.c:3002 ++#: ../src/fr-window.c:3000 #, c-format msgid "Could not open \"%s\"" msgstr "\"%s\" を開けませんでした" -#: ../src/fr-window.c:3005 -+#: ../src/fr-window.c:3007 ++#: ../src/fr-window.c:3005 msgid "An error occurred while loading the archive." msgstr "アーカイブの読み込み中にエラーが発生しました。" -#: ../src/fr-window.c:3009 -+#: ../src/fr-window.c:3011 ++#: ../src/fr-window.c:3009 msgid "An error occurred while deleting files from the archive." msgstr "アーカイブからファイルの削除中にエラーが発生しました。" -#: ../src/fr-window.c:3015 -+#: ../src/fr-window.c:3017 ++#: ../src/fr-window.c:3015 msgid "An error occurred while adding files to the archive." msgstr "ファイルをアーカイブへ追加中にエラーが発生しました。" -#: ../src/fr-window.c:3019 -+#: ../src/fr-window.c:3021 ++#: ../src/fr-window.c:3019 msgid "An error occurred while testing archive." msgstr "アーカイブのテスト中にエラーが発生しました。" -#: ../src/fr-window.c:3024 -+#: ../src/fr-window.c:3026 ++#: ../src/fr-window.c:3024 msgid "An error occurred while saving the archive." msgstr "アーカイブの保存中にエラーが発生しました。" -#: ../src/fr-window.c:3028 -+#: ../src/fr-window.c:3030 ++#: ../src/fr-window.c:3028 msgid "An error occurred while renaming the files." msgstr "ファイル名の変更中にエラーが発生しました。" -#: ../src/fr-window.c:3032 -+#: ../src/fr-window.c:3034 ++#: ../src/fr-window.c:3032 msgid "An error occurred while updating the files." msgstr "ファイルの更新中にエラーが発生しました。" -#: ../src/fr-window.c:3036 -+#: ../src/fr-window.c:3038 ++#: ../src/fr-window.c:3036 msgid "An error occurred." msgstr "エラーが発生しました。" -#: ../src/fr-window.c:3042 -+#: ../src/fr-window.c:3044 ++#: ../src/fr-window.c:3042 msgid "Command not found." msgstr "コマンドが見つかりません。" -#: ../src/fr-window.c:3198 -+#: ../src/fr-window.c:3200 ++#: ../src/fr-window.c:3198 msgid "Test Result" msgstr "テスト結果" -#: ../src/fr-window.c:4165 ../src/fr-window.c:8820 ../src/fr-window.c:8854 -#: ../src/fr-window.c:9134 -+#: ../src/fr-window.c:4171 ../src/fr-window.c:8937 ../src/fr-window.c:8971 -+#: ../src/fr-window.c:9251 ++#: ../src/fr-window.c:4169 ../src/fr-window.c:8953 ../src/fr-window.c:8987 ++#: ../src/fr-window.c:9267 msgid "Could not perform the operation" msgstr "作業を実行できません" -#: ../src/fr-window.c:4190 -+#: ../src/fr-window.c:4196 ++#: ../src/fr-window.c:4194 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" msgstr "このファイルを現在のアーカイブまたは新規のアーカイブに追加しますか?" -#: ../src/fr-window.c:4219 -+#: ../src/fr-window.c:4225 ++#: ../src/fr-window.c:4223 msgid "Do you want to create a new archive with these files?" msgstr "これらのファイルを含んだ新しいアーカイブを作成しますか?" -#: ../src/fr-window.c:4222 -+#: ../src/fr-window.c:4228 ++#: ../src/fr-window.c:4226 msgid "Create _Archive" msgstr "新しいアーカイブの作成(_A)" -#: ../src/fr-window.c:4251 ../src/fr-window.c:7278 -+#: ../src/fr-window.c:4257 ../src/fr-window.c:7390 ++#: ../src/fr-window.c:4255 ../src/fr-window.c:7406 msgid "New Archive" msgstr "新しいアーカイブ" -#: ../src/fr-window.c:4962 -+#: ../src/fr-window.c:4968 ++#: ../src/fr-window.c:4966 msgid "Folders" msgstr "フォルダー" @@ -844,28 +844,28 @@ +msgid "Add Files" +msgstr "ファイルの追加" + -+#: ../src/fr-window.c:5787 ../src/fr-window.c:5817 ++#: ../src/fr-window.c:5780 ../src/fr-window.c:5810 msgid "Find files by name" msgstr "ファイルを名前で検索します" -#: ../src/fr-window.c:5822 -+#: ../src/fr-window.c:5834 ++#: ../src/fr-window.c:5827 msgid "Go to the previous visited location" msgstr "前に表示した場所へ移動します" -#: ../src/fr-window.c:5827 -+#: ../src/fr-window.c:5839 ++#: ../src/fr-window.c:5832 msgid "Go to the next visited location" msgstr "次に表示した場所へ移動します" -#: ../src/fr-window.c:5837 -+#: ../src/fr-window.c:5849 ++#: ../src/fr-window.c:5842 msgid "Go to the home location" msgstr "アーカイブのルートへ移動します" #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5846 ../src/ui/file-selector.ui.h:4 -+#: ../src/fr-window.c:5858 ../src/ui/file-selector.ui.h:4 ++#: ../src/fr-window.c:5851 ../src/ui/file-selector.ui.h:4 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "場所(_L):" @@ -876,52 +876,52 @@ +msgid "Open" +msgstr "開く" + -+#: ../src/fr-window.c:6688 ++#: ../src/fr-window.c:6705 #, c-format msgid "Replace file \"%s\"?" msgstr "ファイル \"%s\" を置き換えますか?" -#: ../src/fr-window.c:6677 -+#: ../src/fr-window.c:6691 ++#: ../src/fr-window.c:6708 #, c-format msgid "Another file with the same name already exists in \"%s\"." msgstr "\"%s\" にすでに同じ名前の別のファイルがあります。" -#: ../src/fr-window.c:6683 -+#: ../src/fr-window.c:6697 ++#: ../src/fr-window.c:6714 msgid "Replace _All" msgstr "すべて置換(_A)" -#: ../src/fr-window.c:6684 -+#: ../src/fr-window.c:6698 ++#: ../src/fr-window.c:6715 msgid "_Skip" msgstr "スキップ(_S)" -#: ../src/fr-window.c:7462 ../src/fr-window.c:7819 -+#: ../src/fr-window.c:7574 ../src/fr-window.c:7931 ++#: ../src/fr-window.c:7590 ../src/fr-window.c:7947 #, c-format msgid "Could not save the archive \"%s\"" msgstr "アーカイブ \"%s\" を保存できません" -#: ../src/fr-window.c:7589 -+#: ../src/fr-window.c:7701 ++#: ../src/fr-window.c:7717 msgid "Save" msgstr "保存" -#: ../src/fr-window.c:7913 -+#: ../src/fr-window.c:8025 ++#: ../src/fr-window.c:8041 msgid "Last Output" msgstr "最後の出力" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8136 -+#: ../src/fr-window.c:8248 ++#: ../src/fr-window.c:8264 msgid "New name is void, please type a name." msgstr "名前が入力されていません。名前を入力してください。" #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8146 -+#: ../src/fr-window.c:8258 ++#: ../src/fr-window.c:8274 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " @@ -932,7 +932,7 @@ +msgstr "名前 \"%s\" には、以下の文字列のうちの少なくとも一つを含んでいるので無効です: %s 。他の名前を入力してください。" -#: ../src/fr-window.c:8182 -+#: ../src/fr-window.c:8294 ++#: ../src/fr-window.c:8310 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -941,12 +941,12 @@ "%s" -#: ../src/fr-window.c:8182 ../src/fr-window.c:8184 -+#: ../src/fr-window.c:8294 ../src/fr-window.c:8296 ++#: ../src/fr-window.c:8310 ../src/fr-window.c:8312 msgid "Please use a different name." msgstr "別の名前を指定してください。" -#: ../src/fr-window.c:8184 -+#: ../src/fr-window.c:8296 ++#: ../src/fr-window.c:8312 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -955,61 +955,61 @@ "%s" -#: ../src/fr-window.c:8254 -+#: ../src/fr-window.c:8366 ++#: ../src/fr-window.c:8382 msgid "Rename" msgstr "名前の変更" -#: ../src/fr-window.c:8255 -+#: ../src/fr-window.c:8367 ++#: ../src/fr-window.c:8383 msgid "_New folder name:" msgstr "新しいフォルダー名(_N):" -#: ../src/fr-window.c:8255 -+#: ../src/fr-window.c:8367 ++#: ../src/fr-window.c:8383 msgid "_New file name:" msgstr "新しいファイル名(_N):" -#: ../src/fr-window.c:8259 -+#: ../src/fr-window.c:8371 ++#: ../src/fr-window.c:8387 msgid "_Rename" msgstr "名前の変更(_R)" -#: ../src/fr-window.c:8276 ../src/fr-window.c:8294 -+#: ../src/fr-window.c:8388 ../src/fr-window.c:8406 ++#: ../src/fr-window.c:8404 ../src/fr-window.c:8422 msgid "Could not rename the folder" msgstr "フォルダー名を変更できません" -#: ../src/fr-window.c:8276 ../src/fr-window.c:8294 -+#: ../src/fr-window.c:8388 ../src/fr-window.c:8406 ++#: ../src/fr-window.c:8404 ../src/fr-window.c:8422 msgid "Could not rename the file" msgstr "ファイル名を変更できません" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8727 -+#: ../src/fr-window.c:8844 ++#: ../src/fr-window.c:8860 #, c-format msgid "Moving the files from \"%s\" to \"%s\"" msgstr "\"%s\" から \"%s\" へファイルを移動中" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8730 -+#: ../src/fr-window.c:8847 ++#: ../src/fr-window.c:8863 #, c-format msgid "Copying the files from \"%s\" to \"%s\"" msgstr "\"%s\" から \"%s\" へファイルをコピー中" -#: ../src/fr-window.c:8781 -+#: ../src/fr-window.c:8898 ++#: ../src/fr-window.c:8914 msgid "Paste Selection" msgstr "選択部分の貼り付け" -#: ../src/fr-window.c:8782 -+#: ../src/fr-window.c:8899 ++#: ../src/fr-window.c:8915 msgid "_Destination folder:" msgstr "操作先のフォルダー(_D):" -#: ../src/fr-window.c:8786 ../src/ui/app-menubar.ui.h:12 -+#: ../src/fr-window.c:8903 ../src/ui/app-menubar.ui.h:12 ++#: ../src/fr-window.c:8919 ../src/ui/app-menubar.ui.h:12 msgid "_Paste" msgstr "貼り付け(_P)" diff -Nru file-roller-3.22.2/file-roller.spec file-roller-3.22.3/file-roller.spec --- file-roller-3.22.2/file-roller.spec 2016-11-08 07:14:51.000000000 +0000 +++ file-roller-3.22.3/file-roller.spec 2017-02-27 20:21:12.000000000 +0000 @@ -1,7 +1,7 @@ %define release 6 %define prefix /usr %define name file-roller -%define version 3.22.2 +%define version 3.22.3 Summary: An archive manager for GNOME. Name: %{name} diff -Nru file-roller-3.22.2/NEWS file-roller-3.22.3/NEWS --- file-roller-3.22.2/NEWS 2016-11-08 07:17:09.000000000 +0000 +++ file-roller-3.22.3/NEWS 2017-02-27 20:24:16.000000000 +0000 @@ -1,3 +1,16 @@ +version 3.22.3 +-------------- + + Bugs fixed: + + * Fixed crash after extracting a file (#778846) + + New or updated application translations: + + * Danish (Ask Hjorth Larsen ) + * Polish (Piotr Drąg) + * Slovenian (Matej Urbančič) + version 3.22.2 -------------- diff -Nru file-roller-3.22.2/po/da.po file-roller-3.22.3/po/da.po --- file-roller-3.22.2/po/da.po 2016-09-14 16:57:20.000000000 +0000 +++ file-roller-3.22.3/po/da.po 2017-02-18 08:26:39.000000000 +0000 @@ -19,8 +19,9 @@ msgid "" msgstr "" "Project-Id-Version: file-roller\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-09-12 02:03+0200\n" +"Report-Msgid-Bugs-To: " +"http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2016-11-16 07:57+0000\n" "PO-Revision-Date: 2016-09-08 03:01+0200\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish \n" @@ -65,9 +66,8 @@ msgid "xz archives (.tar.xz)" msgstr "xz-arkiver (.tar.xz)" -#. set the name and icon -#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:715 -#: ../src/fr-window.c:1974 ../src/fr-window.c:5491 +#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:454 +#: ../src/fr-window.c:1974 ../src/fr-window.c:5497 msgid "Archive Manager" msgstr "Arkivhåndtering" @@ -293,11 +293,11 @@ msgstr "Forkert adgangskode." #: ../src/dlg-batch-add.c:88 ../src/fr-application.c:226 -#: ../src/fr-application.c:262 ../src/fr-application.c:574 +#: ../src/fr-application.c:262 ../src/fr-application.c:582 msgid "Compress" msgstr "Komprimér" -#: ../src/dlg-extract.c:95 ../src/fr-window.c:6838 +#: ../src/dlg-extract.c:95 ../src/fr-window.c:6843 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -308,22 +308,22 @@ "\n" "Vil du oprette den?" -#: ../src/dlg-extract.c:103 ../src/fr-window.c:6846 +#: ../src/dlg-extract.c:103 ../src/fr-window.c:6851 msgid "Create _Folder" msgstr "Opret _mappe" #: ../src/dlg-extract.c:122 ../src/dlg-extract.c:139 ../src/dlg-extract.c:166 -#: ../src/fr-window.c:4373 ../src/fr-window.c:6762 ../src/fr-window.c:6767 -#: ../src/fr-window.c:6867 ../src/fr-window.c:6886 ../src/fr-window.c:6891 +#: ../src/fr-window.c:4377 ../src/fr-window.c:6767 ../src/fr-window.c:6772 +#: ../src/fr-window.c:6872 ../src/fr-window.c:6891 ../src/fr-window.c:6896 msgid "Extraction not performed" msgstr "Udpakning ikke udført" -#: ../src/dlg-extract.c:123 ../src/fr-window.c:6863 +#: ../src/dlg-extract.c:123 ../src/fr-window.c:6868 #, c-format msgid "Could not create the destination folder: %s." msgstr "Kan ikke oprette destinationsmappen: %s." -#: ../src/dlg-extract.c:167 ../src/fr-window.c:4600 ../src/fr-window.c:4702 +#: ../src/dlg-extract.c:167 ../src/fr-window.c:4604 ../src/fr-window.c:4706 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" @@ -341,8 +341,8 @@ #: ../src/dlg-package-installer.c:296 ../src/dlg-package-installer.c:305 #: ../src/dlg-package-installer.c:332 ../src/fr-archive.c:751 -#: ../src/fr-window.c:4040 ../src/fr-window.c:7570 ../src/fr-window.c:7927 -#: ../src/fr-window.c:9442 +#: ../src/fr-window.c:4044 ../src/fr-window.c:7575 ../src/fr-window.c:7932 +#: ../src/fr-window.c:9447 msgid "Archive type not supported." msgstr "Arkivtypen understøttes ikke." @@ -458,12 +458,12 @@ msgstr "Vis version" #: ../src/fr-application.c:298 ../src/fr-application.c:324 -#: ../src/fr-application.c:597 +#: ../src/fr-application.c:605 msgctxt "Window title" msgid "Extract archive" msgstr "Udpak arkiv" -#: ../src/fr-application.c:477 +#: ../src/fr-application.c:485 msgid "- Create and modify an archive" msgstr "- Opret og ændr et arkiv" @@ -497,7 +497,7 @@ msgid "This archive type cannot be modified" msgstr "Denne arkivtype kan ikke modificeres" -#: ../src/fr-archive.c:1866 ../src/fr-new-archive-dialog.c:474 +#: ../src/fr-archive.c:1866 ../src/fr-new-archive-dialog.c:475 msgid "You can't add an archive to itself." msgstr "Du kan ikke tilføje et arkiv til sig selv." @@ -549,8 +549,8 @@ msgstr "Kunne ikke indlæse stedet" #: ../src/fr-new-archive-dialog.c:349 ../src/fr-new-archive-dialog.c:368 -#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:432 -#: ../src/fr-new-archive-dialog.c:450 ../src/fr-new-archive-dialog.c:472 +#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:433 +#: ../src/fr-new-archive-dialog.c:451 ../src/fr-new-archive-dialog.c:473 #: ../src/fr-window.c:2989 msgid "Could not create the archive" msgstr "Kunne ikke oprette arkivet" @@ -559,33 +559,33 @@ msgid "You have to specify an archive name." msgstr "Du skal angive et arkivnavn." -#: ../src/fr-new-archive-dialog.c:434 +#: ../src/fr-new-archive-dialog.c:435 msgid "You don't have permission to create an archive in this folder" msgstr "Du har ikke rettighed til at oprette et arkiv i denne mappe" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-new-archive-dialog.c:452 ../src/fr-window.c:8241 +#: ../src/fr-new-archive-dialog.c:453 ../src/fr-window.c:8246 msgid "New name is the same as old one, please type other name." msgstr "" "Det nye navn er det samme som det gamle, indtast venligst et andet navn." -#: ../src/fr-new-archive-dialog.c:495 +#: ../src/fr-new-archive-dialog.c:496 #, c-format msgid "A file named \"%s\" already exists. Do you want to replace it?" msgstr "Der findes allerede en fil ved navn \"%s\". Vil du erstatte den?" -#: ../src/fr-new-archive-dialog.c:496 +#: ../src/fr-new-archive-dialog.c:497 #, c-format msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" "Filen findes allerede i \"%s\". At erstatte den vil overskrive dens indhold." -#: ../src/fr-new-archive-dialog.c:502 ../src/fr-window.c:6687 +#: ../src/fr-new-archive-dialog.c:503 ../src/fr-window.c:6692 msgid "_Replace" msgstr "_Erstat" -#: ../src/fr-new-archive-dialog.c:517 +#: ../src/fr-new-archive-dialog.c:518 msgid "Could not delete the old archive." msgstr "Kunne ikke slette det gamle arkiv." @@ -702,7 +702,7 @@ #: ../src/fr-window.c:2642 ../src/fr-window.c:3266 msgid "Please wait…" -msgstr "Vent venligst…" +msgstr "Vent venligst …" #: ../src/fr-window.c:2760 msgid "Extraction completed successfully" @@ -713,7 +713,7 @@ msgstr "_Vis filerne" #. Translators: %s is a filename -#: ../src/fr-window.c:2780 ../src/fr-window.c:6219 +#: ../src/fr-window.c:2780 ../src/fr-window.c:6224 #, c-format msgid "\"%s\" created successfully" msgstr "\"%s\" oprettet" @@ -775,12 +775,12 @@ msgid "Test Result" msgstr "Testresultat" -#: ../src/fr-window.c:4165 ../src/fr-window.c:8925 ../src/fr-window.c:8959 -#: ../src/fr-window.c:9239 +#: ../src/fr-window.c:4169 ../src/fr-window.c:8930 ../src/fr-window.c:8964 +#: ../src/fr-window.c:9244 msgid "Could not perform the operation" msgstr "Kunne ikke udføre handlingen" -#: ../src/fr-window.c:4190 +#: ../src/fr-window.c:4194 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" @@ -788,122 +788,122 @@ "Vil du tilføje denne fil til det aktuelle arkiv eller åbne den som et nyt " "arkiv?" -#: ../src/fr-window.c:4219 +#: ../src/fr-window.c:4223 msgid "Do you want to create a new archive with these files?" msgstr "Vil du oprette et nyt arkiv med disse filer?" -#: ../src/fr-window.c:4222 +#: ../src/fr-window.c:4226 msgid "Create _Archive" msgstr "Opret _arkiv" -#: ../src/fr-window.c:4251 ../src/fr-window.c:7378 +#: ../src/fr-window.c:4255 ../src/fr-window.c:7383 msgid "New Archive" msgstr "Nyt arkiv" -#: ../src/fr-window.c:4962 +#: ../src/fr-window.c:4966 msgid "Folders" msgstr "Mapper" -#: ../src/fr-window.c:5000 ../src/ui/file-selector.ui.h:7 +#: ../src/fr-window.c:5004 ../src/ui/file-selector.ui.h:7 msgctxt "File" msgid "Size" msgstr "Størrelse" -#: ../src/fr-window.c:5001 +#: ../src/fr-window.c:5005 msgctxt "File" msgid "Type" msgstr "Type" -#: ../src/fr-window.c:5002 ../src/ui/file-selector.ui.h:8 +#: ../src/fr-window.c:5006 ../src/ui/file-selector.ui.h:8 msgctxt "File" msgid "Modified" msgstr "Ændret" -#: ../src/fr-window.c:5003 +#: ../src/fr-window.c:5007 msgctxt "File" msgid "Location" msgstr "Placering" -#: ../src/fr-window.c:5012 ../src/ui/file-selector.ui.h:6 +#: ../src/fr-window.c:5016 ../src/ui/file-selector.ui.h:6 msgctxt "File" msgid "Name" msgstr "Navn" -#: ../src/fr-window.c:5766 ../src/ui/extract-dialog-options.ui.h:1 +#: ../src/fr-window.c:5771 ../src/ui/extract-dialog-options.ui.h:1 msgctxt "Action" msgid "Extract" msgstr "Udpak" -#: ../src/fr-window.c:5770 +#: ../src/fr-window.c:5775 msgctxt "Action" msgid "Add Files" msgstr "Tilføj filer" -#: ../src/fr-window.c:5775 ../src/fr-window.c:5805 +#: ../src/fr-window.c:5780 ../src/fr-window.c:5810 msgid "Find files by name" msgstr "Find filer efter navn" -#: ../src/fr-window.c:5822 +#: ../src/fr-window.c:5827 msgid "Go to the previous visited location" msgstr "Gå til forrige besøgte placering" -#: ../src/fr-window.c:5827 +#: ../src/fr-window.c:5832 msgid "Go to the next visited location" msgstr "Gå til næste besøgte placering" -#: ../src/fr-window.c:5837 +#: ../src/fr-window.c:5842 msgid "Go to the home location" msgstr "Gå til hjemmemappen" #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5846 ../src/ui/file-selector.ui.h:4 +#: ../src/fr-window.c:5851 ../src/ui/file-selector.ui.h:4 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "_Placering:" -#: ../src/fr-window.c:6233 ../src/ui/menus.ui.h:1 +#: ../src/fr-window.c:6238 ../src/ui/menus.ui.h:1 msgctxt "Action" msgid "Open" msgstr "Åbn" -#: ../src/fr-window.c:6676 +#: ../src/fr-window.c:6681 #, c-format msgid "Replace file \"%s\"?" msgstr "Erstat filen \"%s\"?" -#: ../src/fr-window.c:6679 +#: ../src/fr-window.c:6684 #, c-format msgid "Another file with the same name already exists in \"%s\"." msgstr "Der findes allerede en anden fil med samme navn i \"%s\"." -#: ../src/fr-window.c:6685 +#: ../src/fr-window.c:6690 msgid "Replace _All" msgstr "Erstat _alle" -#: ../src/fr-window.c:6686 +#: ../src/fr-window.c:6691 msgid "_Skip" msgstr "_Spring over" -#: ../src/fr-window.c:7562 ../src/fr-window.c:7919 +#: ../src/fr-window.c:7567 ../src/fr-window.c:7924 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Kunne ikke gemme arkivet \"%s\"" -#: ../src/fr-window.c:7689 +#: ../src/fr-window.c:7694 msgid "Save" msgstr "Gem" -#: ../src/fr-window.c:8013 +#: ../src/fr-window.c:8018 msgid "Last Output" msgstr "Sidste uddata" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8236 +#: ../src/fr-window.c:8241 msgid "New name is void, please type a name." msgstr "Det nye navn er tomt, indtast venligst et navn." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8246 +#: ../src/fr-window.c:8251 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " @@ -912,7 +912,7 @@ "Navnet \"%s\" er ikke gyldigt, fordi det indeholder mindst et af følgende " "tegn: %s. Indtast venligst et andet navn." -#: ../src/fr-window.c:8282 +#: ../src/fr-window.c:8287 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -923,11 +923,11 @@ "\n" "%s" -#: ../src/fr-window.c:8282 ../src/fr-window.c:8284 +#: ../src/fr-window.c:8287 ../src/fr-window.c:8289 msgid "Please use a different name." msgstr "Brug venligst et andet navn." -#: ../src/fr-window.c:8284 +#: ../src/fr-window.c:8289 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -938,52 +938,52 @@ "\n" "%s" -#: ../src/fr-window.c:8354 +#: ../src/fr-window.c:8359 msgid "Rename" msgstr "Omdøb" -#: ../src/fr-window.c:8355 +#: ../src/fr-window.c:8360 msgid "_New folder name:" msgstr "_Nyt mappenavn:" -#: ../src/fr-window.c:8355 +#: ../src/fr-window.c:8360 msgid "_New file name:" msgstr "_Nyt filnavn:" -#: ../src/fr-window.c:8359 +#: ../src/fr-window.c:8364 msgid "_Rename" msgstr "_Omdøb" -#: ../src/fr-window.c:8376 ../src/fr-window.c:8394 +#: ../src/fr-window.c:8381 ../src/fr-window.c:8399 msgid "Could not rename the folder" msgstr "Kunne ikke omdøbe mappen" -#: ../src/fr-window.c:8376 ../src/fr-window.c:8394 +#: ../src/fr-window.c:8381 ../src/fr-window.c:8399 msgid "Could not rename the file" msgstr "Kunne ikke omdøbe filen" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8832 +#: ../src/fr-window.c:8837 #, c-format msgid "Moving the files from \"%s\" to \"%s\"" msgstr "Flytter filerne fra \"%s\" til \"%s\"" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8835 +#: ../src/fr-window.c:8840 #, c-format msgid "Copying the files from \"%s\" to \"%s\"" msgstr "Kopierer filerne fra \"%s\" til \"%s\"" # scootergrisen: måske "Indsæt markering", "Indsæt markeringen" -#: ../src/fr-window.c:8886 +#: ../src/fr-window.c:8891 msgid "Paste Selection" msgstr "Indsæt det markerede" -#: ../src/fr-window.c:8887 +#: ../src/fr-window.c:8892 msgid "_Destination folder:" msgstr "_Destinationsmappe:" -#: ../src/fr-window.c:8891 ../src/ui/app-menubar.ui.h:12 +#: ../src/fr-window.c:8896 ../src/ui/app-menubar.ui.h:12 msgid "_Paste" msgstr "_Indsæt" @@ -1072,19 +1072,19 @@ #: ../src/ui/app-menubar.ui.h:2 ../src/ui/app-menu.ui.h:1 msgid "_New Archive…" -msgstr "_Nyt arkiv…" +msgstr "_Nyt arkiv …" #: ../src/ui/app-menubar.ui.h:3 ../src/ui/app-menu.ui.h:2 msgid "_Open…" -msgstr "_Åbn…" +msgstr "_Åbn …" #: ../src/ui/app-menubar.ui.h:4 msgid "_Extract Files…" -msgstr "_Udpak filer…" +msgstr "_Udpak filer …" #: ../src/ui/app-menubar.ui.h:5 msgid "Save _As…" -msgstr "Gem _som…" +msgstr "Gem _som …" #: ../src/ui/app-menubar.ui.h:6 ../src/ui/gears-menu.ui.h:3 msgid "_Test Integrity" @@ -1108,15 +1108,15 @@ #: ../src/ui/app-menubar.ui.h:13 msgid "_Add Files…" -msgstr "_Tilføj filer…" +msgstr "_Tilføj filer …" #: ../src/ui/app-menubar.ui.h:14 ../src/ui/menus.ui.h:7 msgid "_Rename…" -msgstr "_Omdøb…" +msgstr "_Omdøb …" #: ../src/ui/app-menubar.ui.h:15 msgid "_Delete Files…" -msgstr "_Slet filer…" +msgstr "_Slet filer …" #: ../src/ui/app-menubar.ui.h:16 ../src/ui/file-selector.ui.h:1 msgid "_Select All" @@ -1132,7 +1132,7 @@ #: ../src/ui/app-menubar.ui.h:19 msgid "Set Pass_word…" -msgstr "Indstil ad_gangskode…" +msgstr "Indstil ad_gangskode …" #: ../src/ui/app-menubar.ui.h:20 msgid "_View" @@ -1208,19 +1208,19 @@ #: ../src/ui/gears-menu.ui.h:1 msgid "Save As…" -msgstr "Gem som…" +msgstr "Gem som …" #: ../src/ui/gears-menu.ui.h:2 msgid "Pass_word…" -msgstr "_Adgangskode…" +msgstr "_Adgangskode …" #: ../src/ui/menus.ui.h:2 msgid "_Open With…" -msgstr "_Åbn med…" +msgstr "_Åbn med …" #: ../src/ui/menus.ui.h:3 msgid "_Extract…" -msgstr "_Udpak…" +msgstr "_Udpak …" #: ../src/ui/menus.ui.h:4 msgid "Cut" @@ -1318,13 +1318,14 @@ #~ msgstr "Udpak det markerede arkiv til den nuværende placering" #~ msgid "Extract To..." -#~ msgstr "Udpak til..." +#~ msgstr "Udpak til …" #~ msgid "Extract the selected archive" #~ msgstr "Udpak det markerede arkiv" #~ msgid "Compress..." -#~ msgstr "Komprimér..." +#~ msgstr "Komprimér …" #~ msgid "Create a compressed archive with the selected objects" #~ msgstr "Opret et komprimeret arkiv med de markerede objekter" + diff -Nru file-roller-3.22.2/po/pl.po file-roller-3.22.3/po/pl.po --- file-roller-3.22.2/po/pl.po 2016-09-14 16:57:20.000000000 +0000 +++ file-roller-3.22.3/po/pl.po 2017-02-18 08:26:39.000000000 +0000 @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: file-roller\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-08-17 17:40+0200\n" -"PO-Revision-Date: 2016-08-17 17:42+0200\n" +"POT-Creation-Date: 2016-11-16 13:23+0100\n" +"PO-Revision-Date: 2016-11-16 13:24+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -59,9 +59,8 @@ msgid "xz archives (.tar.xz)" msgstr "archiwa xz (.tar.xz)" -#. set the name and icon -#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:718 -#: ../src/fr-window.c:1973 ../src/fr-window.c:5490 +#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:454 +#: ../src/fr-window.c:1974 ../src/fr-window.c:5497 msgid "Archive Manager" msgstr "Archiwa" @@ -211,31 +210,6 @@ msgid "The default size for volumes." msgstr "Domyślny rozmiar woluminów." -#: ../nautilus/nautilus-fileroller.c:329 -msgid "Extract Here" -msgstr "Rozpakuj tutaj" - -#. Translators: the current position is the current folder -#: ../nautilus/nautilus-fileroller.c:331 -msgid "Extract the selected archive to the current position" -msgstr "Rozpakowuje wybrane archiwum w bieżącym położeniu" - -#: ../nautilus/nautilus-fileroller.c:348 -msgid "Extract To..." -msgstr "Rozpakuj do…" - -#: ../nautilus/nautilus-fileroller.c:349 -msgid "Extract the selected archive" -msgstr "Rozpakowuje wybrane archiwum" - -#: ../nautilus/nautilus-fileroller.c:368 -msgid "Compress..." -msgstr "Utwórz archiwum…" - -#: ../nautilus/nautilus-fileroller.c:369 -msgid "Create a compressed archive with the selected objects" -msgstr "Tworzy skompresowane archiwum z zaznaczonych obiektów" - #: ../src/dlg-add.c:114 msgid "Could not add the files to the archive" msgstr "Nie można dodać plików do archiwum" @@ -271,25 +245,25 @@ msgid "Reset Options" msgstr "Przywróć domyślne opcje" -#: ../src/dlg-add.c:763 +#: ../src/dlg-add.c:764 msgctxt "Window title" msgid "Load Options" msgstr "Wczytanie opcji" -#: ../src/dlg-add.c:772 +#: ../src/dlg-add.c:773 msgid "_Apply" msgstr "_Zastosuj" -#: ../src/dlg-add.c:773 ../src/dlg-delete.c:136 +#: ../src/dlg-add.c:774 ../src/dlg-delete.c:136 msgid "_Delete" msgstr "_Usuń" -#: ../src/dlg-add.c:855 +#: ../src/dlg-add.c:856 msgctxt "Window title" msgid "Save Options" msgstr "Zapis opcji" -#: ../src/dlg-add.c:856 +#: ../src/dlg-add.c:857 msgid "_Options Name:" msgstr "Nazwa _opcji:" @@ -308,11 +282,11 @@ msgstr "Błędne hasło." #: ../src/dlg-batch-add.c:88 ../src/fr-application.c:226 -#: ../src/fr-application.c:262 ../src/fr-application.c:574 +#: ../src/fr-application.c:262 ../src/fr-application.c:582 msgid "Compress" msgstr "Kompresja" -#: ../src/dlg-extract.c:95 ../src/fr-window.c:6837 +#: ../src/dlg-extract.c:95 ../src/fr-window.c:6843 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -323,22 +297,22 @@ "\n" "Utworzyć go?" -#: ../src/dlg-extract.c:103 ../src/fr-window.c:6845 +#: ../src/dlg-extract.c:103 ../src/fr-window.c:6851 msgid "Create _Folder" msgstr "U_twórz katalog" #: ../src/dlg-extract.c:122 ../src/dlg-extract.c:139 ../src/dlg-extract.c:166 -#: ../src/fr-window.c:4372 ../src/fr-window.c:6761 ../src/fr-window.c:6766 -#: ../src/fr-window.c:6866 ../src/fr-window.c:6885 ../src/fr-window.c:6890 +#: ../src/fr-window.c:4377 ../src/fr-window.c:6767 ../src/fr-window.c:6772 +#: ../src/fr-window.c:6872 ../src/fr-window.c:6891 ../src/fr-window.c:6896 msgid "Extraction not performed" msgstr "Nie przeprowadzono rozpakowania plików" -#: ../src/dlg-extract.c:123 ../src/fr-window.c:6862 +#: ../src/dlg-extract.c:123 ../src/fr-window.c:6868 #, c-format msgid "Could not create the destination folder: %s." msgstr "Nie można utworzyć katalogu docelowego: %s." -#: ../src/dlg-extract.c:167 ../src/fr-window.c:4599 ../src/fr-window.c:4701 +#: ../src/dlg-extract.c:167 ../src/fr-window.c:4604 ../src/fr-window.c:4706 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" @@ -355,8 +329,8 @@ #: ../src/dlg-package-installer.c:296 ../src/dlg-package-installer.c:305 #: ../src/dlg-package-installer.c:332 ../src/fr-archive.c:751 -#: ../src/fr-window.c:4039 ../src/fr-window.c:7569 ../src/fr-window.c:7926 -#: ../src/fr-window.c:9436 +#: ../src/fr-window.c:4044 ../src/fr-window.c:7575 ../src/fr-window.c:7932 +#: ../src/fr-window.c:9447 msgid "Archive type not supported." msgstr "Nieobsługiwany typ archiwum." @@ -480,12 +454,12 @@ msgstr "Wyświetla wersję" #: ../src/fr-application.c:298 ../src/fr-application.c:324 -#: ../src/fr-application.c:597 +#: ../src/fr-application.c:605 msgctxt "Window title" msgid "Extract archive" msgstr "Rozpakowanie archiwum" -#: ../src/fr-application.c:477 +#: ../src/fr-application.c:485 msgid "- Create and modify an archive" msgstr "— tworzenie i modyfikowanie archiwów" @@ -517,7 +491,7 @@ msgid "This archive type cannot be modified" msgstr "Tego typu archiwum nie można modyfikować" -#: ../src/fr-archive.c:1866 ../src/fr-new-archive-dialog.c:474 +#: ../src/fr-archive.c:1866 ../src/fr-new-archive-dialog.c:475 msgid "You can't add an archive to itself." msgstr "Nie można dodać pliku archiwum do niego samego." @@ -568,9 +542,9 @@ msgstr "Nie można wczytać położenia" #: ../src/fr-new-archive-dialog.c:349 ../src/fr-new-archive-dialog.c:368 -#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:432 -#: ../src/fr-new-archive-dialog.c:450 ../src/fr-new-archive-dialog.c:472 -#: ../src/fr-window.c:2988 +#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:433 +#: ../src/fr-new-archive-dialog.c:451 ../src/fr-new-archive-dialog.c:473 +#: ../src/fr-window.c:2989 msgid "Could not create the archive" msgstr "Nie można utworzyć archiwum" @@ -578,31 +552,31 @@ msgid "You have to specify an archive name." msgstr "Należy wprowadzić nazwę archiwum." -#: ../src/fr-new-archive-dialog.c:434 +#: ../src/fr-new-archive-dialog.c:435 msgid "You don't have permission to create an archive in this folder" msgstr "Brak uprawnień do utworzenia archiwum w tym katalogu" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-new-archive-dialog.c:452 ../src/fr-window.c:8240 +#: ../src/fr-new-archive-dialog.c:453 ../src/fr-window.c:8246 msgid "New name is the same as old one, please type other name." msgstr "Nowa nazwa jest taka sama jak poprzednia. Proszę wpisać inną." -#: ../src/fr-new-archive-dialog.c:495 +#: ../src/fr-new-archive-dialog.c:496 #, c-format msgid "A file named \"%s\" already exists. Do you want to replace it?" msgstr "Plik o nazwie „%s” już istnieje. Zastąpić go?" -#: ../src/fr-new-archive-dialog.c:496 +#: ../src/fr-new-archive-dialog.c:497 #, c-format msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "Plik już istnieje w „%s”. Zastąpienie go nadpisze jego zawartość." -#: ../src/fr-new-archive-dialog.c:502 ../src/fr-window.c:6686 +#: ../src/fr-new-archive-dialog.c:503 ../src/fr-window.c:6692 msgid "_Replace" msgstr "_Zastąp" -#: ../src/fr-new-archive-dialog.c:517 +#: ../src/fr-new-archive-dialog.c:518 msgid "Could not delete the old archive." msgstr "Nie można usunąć starego archiwum." @@ -627,90 +601,90 @@ msgid "Folder" msgstr "Katalog" -#: ../src/fr-window.c:1980 +#: ../src/fr-window.c:1981 msgid "[read only]" msgstr "[tylko do odczytu]" -#: ../src/fr-window.c:2121 +#: ../src/fr-window.c:2122 #, c-format msgid "Could not display the folder \"%s\"" msgstr "Nie można wyświetlić katalogu „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2294 ../src/fr-window.c:2332 +#: ../src/fr-window.c:2295 ../src/fr-window.c:2333 #, c-format msgid "Creating \"%s\"" msgstr "Tworzenie pliku „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2298 +#: ../src/fr-window.c:2299 #, c-format msgid "Loading \"%s\"" msgstr "Wczytywanie pliku „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2302 +#: ../src/fr-window.c:2303 #, c-format msgid "Reading \"%s\"" msgstr "Odczytywanie pliku „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2306 +#: ../src/fr-window.c:2307 #, c-format msgid "Deleting the files from \"%s\"" msgstr "Usuwanie plików z „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2310 +#: ../src/fr-window.c:2311 #, c-format msgid "Testing \"%s\"" msgstr "Testowanie pliku „%s”" -#: ../src/fr-window.c:2313 +#: ../src/fr-window.c:2314 msgid "Getting the file list" msgstr "Pobieranie listy plików" #. Translators: %s is a filename -#: ../src/fr-window.c:2317 +#: ../src/fr-window.c:2318 #, c-format msgid "Copying the files to add to \"%s\"" msgstr "Kopiowanie plików do dodania do „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2321 +#: ../src/fr-window.c:2322 #, c-format msgid "Adding the files to \"%s\"" msgstr "Dodawanie plików do „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2325 +#: ../src/fr-window.c:2326 #, c-format msgid "Extracting the files from \"%s\"" msgstr "Rozpakowywanie plików z „%s”" -#: ../src/fr-window.c:2328 +#: ../src/fr-window.c:2329 msgid "Copying the extracted files to the destination" msgstr "Kopiowanie rozpakowanych plików do miejsca docelowego" #. Translators: %s is a filename -#: ../src/fr-window.c:2337 +#: ../src/fr-window.c:2338 #, c-format msgid "Saving \"%s\"" msgstr "Zapisywanie pliku „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2344 +#: ../src/fr-window.c:2345 #, c-format msgid "Renaming the files in \"%s\"" msgstr "Zmienianie nazw plików w „%s”" #. Translators: %s is a filename -#: ../src/fr-window.c:2348 +#: ../src/fr-window.c:2349 #, c-format msgid "Updating the files in \"%s\"" msgstr "Aktualizowanie plików w „%s”" -#: ../src/fr-window.c:2637 +#: ../src/fr-window.c:2638 #, c-format msgid "%d file remaining" msgid_plural "%'d files remaining" @@ -718,209 +692,209 @@ msgstr[1] "Pozostały %'d pliki" msgstr[2] "Pozostało %'d plików" -#: ../src/fr-window.c:2641 ../src/fr-window.c:3265 +#: ../src/fr-window.c:2642 ../src/fr-window.c:3266 msgid "Please wait…" msgstr "Proszę czekać…" -#: ../src/fr-window.c:2759 +#: ../src/fr-window.c:2760 msgid "Extraction completed successfully" msgstr "Pomyślnie ukończono rozpakowywanie" -#: ../src/fr-window.c:2762 +#: ../src/fr-window.c:2763 msgid "_Show the Files" msgstr "_Wyświetl pliki" #. Translators: %s is a filename -#: ../src/fr-window.c:2779 ../src/fr-window.c:6218 +#: ../src/fr-window.c:2780 ../src/fr-window.c:6224 #, c-format msgid "\"%s\" created successfully" msgstr "Pomyślnie utworzono „%s”" -#: ../src/fr-window.c:2786 +#: ../src/fr-window.c:2787 msgid "_Open the Archive" msgstr "_Otwórz archiwum" -#: ../src/fr-window.c:2874 ../src/fr-window.c:3044 +#: ../src/fr-window.c:2875 ../src/fr-window.c:3045 msgid "Command exited abnormally." msgstr "Polecenie zakończyło się z kodem błędu." -#: ../src/fr-window.c:2993 +#: ../src/fr-window.c:2994 msgid "An error occurred while extracting files." msgstr "Wystąpił błąd podczas rozpakowywania plików." -#: ../src/fr-window.c:2999 +#: ../src/fr-window.c:3000 #, c-format msgid "Could not open \"%s\"" msgstr "Nie można otworzyć „%s”" -#: ../src/fr-window.c:3004 +#: ../src/fr-window.c:3005 msgid "An error occurred while loading the archive." msgstr "Wystąpił błąd podczas wczytywania archiwum." -#: ../src/fr-window.c:3008 +#: ../src/fr-window.c:3009 msgid "An error occurred while deleting files from the archive." msgstr "Wystąpił błąd podczas usuwania plików z archiwum." -#: ../src/fr-window.c:3014 +#: ../src/fr-window.c:3015 msgid "An error occurred while adding files to the archive." msgstr "Wystąpił błąd podczas dodawania plików do archiwum." -#: ../src/fr-window.c:3018 +#: ../src/fr-window.c:3019 msgid "An error occurred while testing archive." msgstr "Wystąpił błąd podczas testowania archiwum." -#: ../src/fr-window.c:3023 +#: ../src/fr-window.c:3024 msgid "An error occurred while saving the archive." msgstr "Wystąpił błąd podczas zapisywania archiwum." -#: ../src/fr-window.c:3027 +#: ../src/fr-window.c:3028 msgid "An error occurred while renaming the files." msgstr "Wystąpił błąd podczas zmieniania nazw plików." -#: ../src/fr-window.c:3031 +#: ../src/fr-window.c:3032 msgid "An error occurred while updating the files." msgstr "Wystąpił błąd podczas aktualizowania plików." -#: ../src/fr-window.c:3035 +#: ../src/fr-window.c:3036 msgid "An error occurred." msgstr "Wystąpił błąd." -#: ../src/fr-window.c:3041 +#: ../src/fr-window.c:3042 msgid "Command not found." msgstr "Nie odnaleziono polecenia." -#: ../src/fr-window.c:3197 +#: ../src/fr-window.c:3198 msgid "Test Result" msgstr "Wyniki testu" -#: ../src/fr-window.c:4164 ../src/fr-window.c:8919 ../src/fr-window.c:8953 -#: ../src/fr-window.c:9233 +#: ../src/fr-window.c:4169 ../src/fr-window.c:8930 ../src/fr-window.c:8964 +#: ../src/fr-window.c:9244 msgid "Could not perform the operation" msgstr "Nie można wykonać działania" -#: ../src/fr-window.c:4189 +#: ../src/fr-window.c:4194 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" msgstr "" "Dodać ten plik do bieżącego archiwum, czy też otworzyć go jako nowe archiwum?" -#: ../src/fr-window.c:4218 +#: ../src/fr-window.c:4223 msgid "Do you want to create a new archive with these files?" msgstr "Utworzyć nowe archiwum z użyciem tych plików?" -#: ../src/fr-window.c:4221 +#: ../src/fr-window.c:4226 msgid "Create _Archive" msgstr "U_twórz archiwum" -#: ../src/fr-window.c:4250 ../src/fr-window.c:7377 +#: ../src/fr-window.c:4255 ../src/fr-window.c:7383 msgid "New Archive" msgstr "Nowe archiwum" -#: ../src/fr-window.c:4961 +#: ../src/fr-window.c:4966 msgid "Folders" msgstr "Katalogi" -#: ../src/fr-window.c:4999 ../src/ui/file-selector.ui.h:7 +#: ../src/fr-window.c:5004 ../src/ui/file-selector.ui.h:7 msgctxt "File" msgid "Size" msgstr "Rozmiar" -#: ../src/fr-window.c:5000 +#: ../src/fr-window.c:5005 msgctxt "File" msgid "Type" msgstr "Typ" -#: ../src/fr-window.c:5001 ../src/ui/file-selector.ui.h:8 +#: ../src/fr-window.c:5006 ../src/ui/file-selector.ui.h:8 msgctxt "File" msgid "Modified" -msgstr "Zmodyfikowany" +msgstr "Modyfikacja" -#: ../src/fr-window.c:5002 +#: ../src/fr-window.c:5007 msgctxt "File" msgid "Location" msgstr "Położenie" -#: ../src/fr-window.c:5011 ../src/ui/file-selector.ui.h:6 +#: ../src/fr-window.c:5016 ../src/ui/file-selector.ui.h:6 msgctxt "File" msgid "Name" msgstr "Nazwa" -#: ../src/fr-window.c:5765 ../src/ui/extract-dialog-options.ui.h:1 +#: ../src/fr-window.c:5771 ../src/ui/extract-dialog-options.ui.h:1 msgctxt "Action" msgid "Extract" msgstr "Rozpakuj" -#: ../src/fr-window.c:5769 +#: ../src/fr-window.c:5775 msgctxt "Action" msgid "Add Files" msgstr "Dodaj pliki" -#: ../src/fr-window.c:5774 ../src/fr-window.c:5804 +#: ../src/fr-window.c:5780 ../src/fr-window.c:5810 msgid "Find files by name" msgstr "Wyszukuje pliki według nazwy" -#: ../src/fr-window.c:5821 +#: ../src/fr-window.c:5827 msgid "Go to the previous visited location" msgstr "Przechodzi do poprzednio odwiedzonego położenia" -#: ../src/fr-window.c:5826 +#: ../src/fr-window.c:5832 msgid "Go to the next visited location" msgstr "Przechodzi do następnego odwiedzonego położenia" -#: ../src/fr-window.c:5836 +#: ../src/fr-window.c:5842 msgid "Go to the home location" msgstr "Przechodzi do położenia początkowego" #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5845 ../src/ui/file-selector.ui.h:4 +#: ../src/fr-window.c:5851 ../src/ui/file-selector.ui.h:4 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "_Położenie:" -#: ../src/fr-window.c:6232 ../src/ui/menus.ui.h:1 +#: ../src/fr-window.c:6238 ../src/ui/menus.ui.h:1 msgctxt "Action" msgid "Open" msgstr "Otwórz" -#: ../src/fr-window.c:6675 +#: ../src/fr-window.c:6681 #, c-format msgid "Replace file \"%s\"?" msgstr "Zastąpić plik „%s”?" -#: ../src/fr-window.c:6678 +#: ../src/fr-window.c:6684 #, c-format msgid "Another file with the same name already exists in \"%s\"." msgstr "Inny plik o tej samej nazwie już istnieje w „%s”." -#: ../src/fr-window.c:6684 +#: ../src/fr-window.c:6690 msgid "Replace _All" msgstr "Z_astąp wszystkie" -#: ../src/fr-window.c:6685 +#: ../src/fr-window.c:6691 msgid "_Skip" msgstr "_Pomiń" -#: ../src/fr-window.c:7561 ../src/fr-window.c:7918 +#: ../src/fr-window.c:7567 ../src/fr-window.c:7924 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Nie można zapisać archiwum „%s”" -#: ../src/fr-window.c:7688 +#: ../src/fr-window.c:7694 msgid "Save" msgstr "Zapisz" -#: ../src/fr-window.c:8012 +#: ../src/fr-window.c:8018 msgid "Last Output" msgstr "Ostatnie dane" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8235 +#: ../src/fr-window.c:8241 msgid "New name is void, please type a name." msgstr "Nowa nazwa jest pusta. Proszę wpisać nazwę." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8245 +#: ../src/fr-window.c:8251 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " @@ -929,7 +903,7 @@ "Nazwa „%s” jest nieprawidłowa, ponieważ zawiera co najmniej jeden " "z następujących znaków: %s. Proszę wpisać inną nazwę." -#: ../src/fr-window.c:8281 +#: ../src/fr-window.c:8287 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -940,11 +914,11 @@ "\n" "%s" -#: ../src/fr-window.c:8281 ../src/fr-window.c:8283 +#: ../src/fr-window.c:8287 ../src/fr-window.c:8289 msgid "Please use a different name." msgstr "Proszę użyć innej nazwy." -#: ../src/fr-window.c:8283 +#: ../src/fr-window.c:8289 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -955,51 +929,51 @@ "\n" "%s" -#: ../src/fr-window.c:8353 +#: ../src/fr-window.c:8359 msgid "Rename" msgstr "Zmień nazwę" -#: ../src/fr-window.c:8354 +#: ../src/fr-window.c:8360 msgid "_New folder name:" msgstr "_Nowa nazwa katalogu:" -#: ../src/fr-window.c:8354 +#: ../src/fr-window.c:8360 msgid "_New file name:" msgstr "_Nowa nazwa pliku:" -#: ../src/fr-window.c:8358 +#: ../src/fr-window.c:8364 msgid "_Rename" msgstr "Zmień n_azwę" -#: ../src/fr-window.c:8375 ../src/fr-window.c:8393 +#: ../src/fr-window.c:8381 ../src/fr-window.c:8399 msgid "Could not rename the folder" msgstr "Nie można zmienić nazwy katalogu" -#: ../src/fr-window.c:8375 ../src/fr-window.c:8393 +#: ../src/fr-window.c:8381 ../src/fr-window.c:8399 msgid "Could not rename the file" msgstr "Nie można zmienić nazwy pliku" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8826 +#: ../src/fr-window.c:8837 #, c-format msgid "Moving the files from \"%s\" to \"%s\"" msgstr "Przenoszenie plików z „%s” do „%s”" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8829 +#: ../src/fr-window.c:8840 #, c-format msgid "Copying the files from \"%s\" to \"%s\"" msgstr "Kopiowanie plików z „%s” do „%s”" -#: ../src/fr-window.c:8880 +#: ../src/fr-window.c:8891 msgid "Paste Selection" msgstr "Wklejanie zaznaczenia" -#: ../src/fr-window.c:8881 +#: ../src/fr-window.c:8892 msgid "_Destination folder:" msgstr "Katalog _docelowy:" -#: ../src/fr-window.c:8885 ../src/ui/app-menubar.ui.h:12 +#: ../src/fr-window.c:8896 ../src/ui/app-menubar.ui.h:12 msgid "_Paste" msgstr "Wk_lej" diff -Nru file-roller-3.22.2/po/sl.po file-roller-3.22.3/po/sl.po --- file-roller-3.22.2/po/sl.po 2016-08-17 07:12:22.000000000 +0000 +++ file-roller-3.22.3/po/sl.po 2017-02-18 08:26:39.000000000 +0000 @@ -5,25 +5,25 @@ # Andraž Tori , 2002. # Matjaž Horvat , 2006. # Matic Žgur , 2007. -# Matej Urbančič , 2007-2016. +# Matej Urbančič , 2007–2016. # msgid "" msgstr "" "Project-Id-Version: file-roller master\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-" "roller&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2016-02-01 22:16+0100\n" -"PO-Revision-Date: 2016-02-01 22:17+0100\n" +"POT-Creation-Date: 2016-11-15 20:09+0100\n" +"PO-Revision-Date: 2016-11-15 20:16+0100\n" "Last-Translator: Matej Urbančič \n" "Language-Team: Slovenian GNOME Translation Team \n" -"Language: sl\n" +"Language: sl_SI\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" "X-Poedit-SourceCharset: utf-8\n" -"X-Generator: Poedit 1.8.4\n" +"X-Generator: Poedit 1.8.9\n" #: ../data/org.gnome.FileRoller.appdata.xml.in.h:1 msgid "Open, modify and create compressed archive files" @@ -61,9 +61,8 @@ msgid "xz archives (.tar.xz)" msgstr "arhivi xz (.tar.xz)" -#. set the name and icon -#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:718 -#: ../src/fr-window.c:1973 ../src/fr-window.c:5492 +#: ../data/org.gnome.FileRoller.desktop.in.in.h:1 ../src/fr-application.c:454 +#: ../src/fr-window.c:1974 ../src/fr-window.c:5497 msgid "Archive Manager" msgstr "Upravljalnik arhivov" @@ -76,11 +75,11 @@ msgid "zip;tar;extract;unpack;" msgstr "zip;tar;ekstrakcija;razširjanje;odpakiranje;pakiranje;arhiv;" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:1 +#: ../data/org.gnome.FileRoller.gschema.xml.h:1 msgid "How to sort files" msgstr "Kako razvrstiti mape" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:2 +#: ../data/org.gnome.FileRoller.gschema.xml.h:2 msgid "" "What criteria must be used to arrange files. Possible values: name, size, " "type, time, path." @@ -88,11 +87,11 @@ "Kakšen kriterij mora biti uporabljen za razvrščanje datotek. Mogoče " "vrednosti so: ime, velikost, vrsta, čas in pot." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:3 +#: ../data/org.gnome.FileRoller.gschema.xml.h:3 msgid "Sort type" msgstr "Vrsta razvrščanja" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:4 +#: ../data/org.gnome.FileRoller.gschema.xml.h:4 msgid "" "Whether to sort in ascending or descending direction. Possible values: " "ascending, descending." @@ -100,11 +99,11 @@ "Možnost določa, kako naj se predmeti razvrstijo. Mogoče vrednosti sta " "padajoče ali naraščajoče." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:5 +#: ../data/org.gnome.FileRoller.gschema.xml.h:5 msgid "List Mode" msgstr "Način izpisa seznama" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:6 +#: ../data/org.gnome.FileRoller.gschema.xml.h:6 msgid "" "Use 'all-files' to view all the files in the archive in a single list, use " "'as-folder' to navigate the archive as a folder." @@ -112,61 +111,61 @@ "Možnost 'vse-datoteke' omogoča pogled vseh datotek v arhivu v enem seznamu, " "možnost 'kot-mapa' pa omogoča brskanje kot pri mapi." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:7 +#: ../data/org.gnome.FileRoller.gschema.xml.h:7 msgid "Display type" msgstr "Prikaži vrsto" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:8 +#: ../data/org.gnome.FileRoller.gschema.xml.h:8 msgid "Display the type column in the main window." msgstr "Pokaži stolpec vrste v glavnem oknu." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:9 +#: ../data/org.gnome.FileRoller.gschema.xml.h:9 msgid "Display size" msgstr "Pokaži velikost" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:10 +#: ../data/org.gnome.FileRoller.gschema.xml.h:10 msgid "Display the size column in the main window." msgstr "Pokaži stolpec velikosti v glavnem oknu." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:11 +#: ../data/org.gnome.FileRoller.gschema.xml.h:11 msgid "Display time" msgstr "Pokaži čas" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:12 +#: ../data/org.gnome.FileRoller.gschema.xml.h:12 msgid "Display the time column in the main window." msgstr "Pokaži stolpec časa v glavnem oknu." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:13 +#: ../data/org.gnome.FileRoller.gschema.xml.h:13 msgid "Display path" msgstr "Pokaži pot" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:14 +#: ../data/org.gnome.FileRoller.gschema.xml.h:14 msgid "Display the path column in the main window." msgstr "Pokaži stolpec poti v glavnem oknu." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:15 +#: ../data/org.gnome.FileRoller.gschema.xml.h:15 msgid "Name column width" msgstr "Širina stolpca z imenom" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:16 +#: ../data/org.gnome.FileRoller.gschema.xml.h:16 msgid "The default width of the name column in the file list." msgstr "Privzeta širina stolpca imena v seznamu datotek." # G:4 K:0 O:0 -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:17 +#: ../data/org.gnome.FileRoller.gschema.xml.h:17 msgid "View the sidebar" msgstr "Pokaži stransko vrstico" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:18 +#: ../data/org.gnome.FileRoller.gschema.xml.h:18 msgid "Whether to display the sidebar." msgstr "Ali naj bo prikazana stranska vrstica." # G:0 K:1 O:0 -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19 +#: ../data/org.gnome.FileRoller.gschema.xml.h:19 msgid "Editors" msgstr "Urejevalniki" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20 +#: ../data/org.gnome.FileRoller.gschema.xml.h:20 msgid "" "List of applications entered in the 'Open File' dialog and not associated " "with the file type." @@ -174,11 +173,11 @@ "Seznam programov v pogovornem oknu 'Odpri datoteko', ki niso povezani z " "izbrano vrsto datoteke." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 +#: ../data/org.gnome.FileRoller.gschema.xml.h:21 msgid "Compression level" msgstr "Raven stiskanja" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22 +#: ../data/org.gnome.FileRoller.gschema.xml.h:22 msgid "" "Compression level used when adding files to an archive. Possible values: " "very-fast, fast, normal, maximum." @@ -186,11 +185,11 @@ "Uporabljena raven stiskanja med dodajanjem datotek v arhiv. Mogoče vrednosti " "so: zelo hitro, hitro, običajno, največja raven." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 +#: ../data/org.gnome.FileRoller.gschema.xml.h:23 msgid "Encrypt the archive header" msgstr "Šifriraj glavo arhiva" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24 +#: ../data/org.gnome.FileRoller.gschema.xml.h:24 msgid "" "Whether to encrypt the archive header. If the header is encrypted the " "password will be required to list the archive content as well." @@ -199,48 +198,23 @@ "vsebine arhiva zahtevano geslo." # G:0 K:2 O:0 -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25 +#: ../data/org.gnome.FileRoller.gschema.xml.h:25 msgid "Do not overwrite newer files" msgstr "Ne prepiši novejših datotek" # G:0 K:1 O:0 -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26 +#: ../data/org.gnome.FileRoller.gschema.xml.h:26 msgid "Recreate the folders stored in the archive" msgstr "Ponovno ustvari mape shranjene v arhivu" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27 +#: ../data/org.gnome.FileRoller.gschema.xml.h:27 msgid "Default volume size" msgstr "Privzeta velikost nosilcev" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28 +#: ../data/org.gnome.FileRoller.gschema.xml.h:28 msgid "The default size for volumes." msgstr "Privzeta velikost nosilcev" -#: ../nautilus/nautilus-fileroller.c:329 -msgid "Extract Here" -msgstr "Odpakiraj v to mapo" - -#. Translators: the current position is the current folder -#: ../nautilus/nautilus-fileroller.c:331 -msgid "Extract the selected archive to the current position" -msgstr "Odpakiraj vsebino izbranega arhiva na trenutno mesto" - -#: ../nautilus/nautilus-fileroller.c:348 -msgid "Extract To..." -msgstr "Odpakiraj vsebino v ..." - -#: ../nautilus/nautilus-fileroller.c:349 -msgid "Extract the selected archive" -msgstr "Odpakiraj vsebino izbranega arhiva" - -#: ../nautilus/nautilus-fileroller.c:368 -msgid "Compress..." -msgstr "Zapakiraj ..." - -#: ../nautilus/nautilus-fileroller.c:369 -msgid "Create a compressed archive with the selected objects" -msgstr "Ustvari zapakiran arhiv z izbranimi predmeti" - # G:0 K:1 O:0 #: ../src/dlg-add.c:114 msgid "Could not add the files to the archive" @@ -249,10 +223,10 @@ #: ../src/dlg-add.c:115 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" -msgstr "Ni ustreznih dovoljenj za branje datotek iz mape \"%s\"" +msgstr "Ni ustreznih dovoljenj za branje datotek iz mape »%s«" -# G:0 K:1 O:0 -#: ../src/dlg-add.c:182 ../src/fr-window.c:5771 +#: ../src/dlg-add.c:182 +msgctxt "Window title" msgid "Add Files" msgstr "Dodaj datoteke" @@ -261,31 +235,42 @@ msgid "_Options" msgstr "_Možnosti" -# G:1 K:0 O:0 #. load options -#: ../src/dlg-add.c:204 ../src/dlg-add.c:763 +#: ../src/dlg-add.c:204 +msgctxt "Action" msgid "Load Options" -msgstr "Naloži možnosti" +msgstr "Možnosti nalaganja" #. save options -#: ../src/dlg-add.c:211 ../src/dlg-add.c:855 +#: ../src/dlg-add.c:211 +msgctxt "Action" msgid "Save Options" -msgstr "Shrani možnosti" +msgstr "Možnosti shranjevanja" #. clear options #: ../src/dlg-add.c:218 msgid "Reset Options" msgstr "Počisti možnosti" -#: ../src/dlg-add.c:772 +#: ../src/dlg-add.c:764 +msgctxt "Window title" +msgid "Load Options" +msgstr "Možnosti nalaganja" + +#: ../src/dlg-add.c:773 msgid "_Apply" msgstr "_Uveljavi" -#: ../src/dlg-add.c:773 ../src/dlg-delete.c:136 +#: ../src/dlg-add.c:774 ../src/dlg-delete.c:136 msgid "_Delete" msgstr "_Izbriši" #: ../src/dlg-add.c:856 +msgctxt "Window title" +msgid "Save Options" +msgstr "Možnosti shranjevanja" + +#: ../src/dlg-add.c:857 msgid "_Options Name:" msgstr "_Ime možnosti:" @@ -297,53 +282,53 @@ #: ../src/dlg-ask-password.c:148 #, c-format msgid "Password required for \"%s\"" -msgstr "Zahtevano geslo za \"%s\"" +msgstr "Zahtevano geslo za »%s«" #: ../src/dlg-ask-password.c:157 msgid "Wrong password." msgstr "Napačno geslo." #: ../src/dlg-batch-add.c:88 ../src/fr-application.c:226 -#: ../src/fr-application.c:262 ../src/fr-application.c:574 +#: ../src/fr-application.c:262 ../src/fr-application.c:582 msgid "Compress" msgstr "Zapakiraj" # G:1 K:0 O:0 -#: ../src/dlg-extract.c:95 ../src/fr-window.c:6857 +#: ../src/dlg-extract.c:95 ../src/fr-window.c:6843 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" "\n" "Do you want to create it?" msgstr "" -"Ciljna mapa \"%s\" ne obstaja.\n" +"Ciljna mapa »%s« ne obstaja.\n" "\n" "Ali jo želite ustvariti?" -#: ../src/dlg-extract.c:103 ../src/fr-window.c:6865 +#: ../src/dlg-extract.c:103 ../src/fr-window.c:6851 msgid "Create _Folder" msgstr "Ustvari _mapo" #: ../src/dlg-extract.c:122 ../src/dlg-extract.c:139 ../src/dlg-extract.c:166 -#: ../src/fr-window.c:4374 ../src/fr-window.c:6761 ../src/fr-window.c:6766 -#: ../src/fr-window.c:6886 ../src/fr-window.c:6905 ../src/fr-window.c:6910 +#: ../src/fr-window.c:4377 ../src/fr-window.c:6767 ../src/fr-window.c:6772 +#: ../src/fr-window.c:6872 ../src/fr-window.c:6891 ../src/fr-window.c:6896 msgid "Extraction not performed" msgstr "Odpakiranje ni izvedeno" # G:0 K:3 O:0 -#: ../src/dlg-extract.c:123 ../src/fr-window.c:6882 +#: ../src/dlg-extract.c:123 ../src/fr-window.c:6868 #, c-format msgid "Could not create the destination folder: %s." msgstr "Ni mogoče ustvariti ciljne mape: %s." -#: ../src/dlg-extract.c:167 ../src/fr-window.c:4601 ../src/fr-window.c:4703 +#: ../src/dlg-extract.c:167 ../src/fr-window.c:4604 ../src/fr-window.c:4706 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" -msgstr "Ni ustreznih dovoljenj za odpakiranje arhivov v mapo \"%s\"" +msgstr "Ni ustreznih dovoljenj za odpakiranje arhivov v mapo »%s«" -#: ../src/dlg-extract.c:279 ../src/fr-window.c:5767 -#: ../src/ui/extract-dialog-options.ui.h:1 +#: ../src/dlg-extract.c:279 +msgctxt "Window title" msgid "Extract" msgstr "Odpakiraj" @@ -352,9 +337,9 @@ msgstr "Prišlo je do napake med iskanjem programa:" #: ../src/dlg-package-installer.c:296 ../src/dlg-package-installer.c:305 -#: ../src/dlg-package-installer.c:332 ../src/fr-archive.c:744 -#: ../src/fr-window.c:4041 ../src/fr-window.c:7471 ../src/fr-window.c:7828 -#: ../src/fr-window.c:9338 +#: ../src/dlg-package-installer.c:332 ../src/fr-archive.c:751 +#: ../src/fr-window.c:4044 ../src/fr-window.c:7575 ../src/fr-window.c:7932 +#: ../src/fr-window.c:9447 msgid "Archive type not supported." msgstr "Vrsta arhiva ni podprta." @@ -379,7 +364,7 @@ #: ../src/dlg-password.c:109 #, c-format msgid "Enter a password for \"%s\"" -msgstr "Vnesite geslo za \"%s\"" +msgstr "Vnesite geslo za »%s«" # G:17 K:17 O:0 #: ../src/dlg-prop.c:107 @@ -391,7 +376,7 @@ #: ../src/dlg-update.c:162 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" -msgstr "Ali naj se posodobi datoteka \"%s\" v arhivu \"%s\"?" +msgstr "Ali naj se posodobi datoteka »%s« v arhivu »%s«?" #. secondary text #: ../src/dlg-update.c:174 ../src/dlg-update.c:200 @@ -423,7 +408,7 @@ #: ../src/dlg-update.c:190 #, c-format msgid "Update the files in the archive \"%s\"?" -msgstr "Ali naj se posodobi datoteke v arhivu \"%s\"" +msgstr "Ali naj se posodobi datoteke v arhivu »%s«" # G:1 K:2 O:0 #: ../src/dlg-update.c:319 ../src/dlg-update.c:332 @@ -487,12 +472,13 @@ msgstr "Pokaži različico" #: ../src/fr-application.c:298 ../src/fr-application.c:324 -#: ../src/fr-application.c:597 +#: ../src/fr-application.c:605 +msgctxt "Window title" msgid "Extract archive" msgstr "Odpakiraj arhiv" # G:3 K:7 O:0 -#: ../src/fr-application.c:477 +#: ../src/fr-application.c:485 msgid "- Create and modify an archive" msgstr "- Ustvari in spremeni arhiv" @@ -508,36 +494,36 @@ #: ../src/fr-application-menu.c:134 msgid "translator-credits" msgstr "" -"Matjaž Horvat \n" -"Matic Žgur \n" -"Andraž Tori \n" -"Matej Urbančič " +"Matej Urbančič \n" +"Matjaž Horvat\n" +"Matic Žgur\n" +"Andraž Tori" -#: ../src/fr-archive.c:1845 +#: ../src/fr-archive.c:1852 msgid "You don't have the right permissions." msgstr "Ni ustreznih dovoljenj." -#: ../src/fr-archive.c:1845 +#: ../src/fr-archive.c:1852 msgid "This archive type cannot be modified" msgstr "Te vrste arhiva ni mogoče spreminjati." -#: ../src/fr-archive.c:1859 ../src/fr-new-archive-dialog.c:474 +#: ../src/fr-archive.c:1866 ../src/fr-new-archive-dialog.c:475 msgid "You can't add an archive to itself." msgstr "Arhiva ni mogoče dodati samemu sebi." #. Translators: %s is a filename. #: ../src/fr-command-7z.c:297 ../src/fr-command-rar.c:425 -#: ../src/fr-command-tar.c:304 +#: ../src/fr-command-tar.c:307 #, c-format msgid "Adding \"%s\"" -msgstr "Dodajanje \"%s\"" +msgstr "Dodajanje »%s«" #. Translators: %s is a filename. #: ../src/fr-command-7z.c:449 ../src/fr-command-rar.c:557 -#: ../src/fr-command-tar.c:425 +#: ../src/fr-command-tar.c:428 #, c-format msgid "Extracting \"%s\"" -msgstr "Poteka odpakiranje \"%s\"" +msgstr "Poteka odpakiranje »%s«" #: ../src/fr-command.c:597 #, c-format @@ -545,25 +531,25 @@ msgstr "Arhiva ni mogoče najti" #. Translators: %s is a filename. -#: ../src/fr-command-rar.c:506 ../src/fr-command-tar.c:370 +#: ../src/fr-command-rar.c:506 ../src/fr-command-tar.c:373 #, c-format msgid "Removing \"%s\"" -msgstr "Odstranjevanje \"%s\"" +msgstr "Odstranjevanje »%s«" #: ../src/fr-command-rar.c:688 #, c-format msgid "Could not find the volume: %s" msgstr "Ni mogoče najti nosilca: %s" -#: ../src/fr-command-tar.c:380 +#: ../src/fr-command-tar.c:383 msgid "Deleting files from archive" msgstr "Brisanje datotek iz arhiva" -#: ../src/fr-command-tar.c:485 +#: ../src/fr-command-tar.c:488 msgid "Recompressing archive" msgstr "Ponovno stiskanje arhiva" -#: ../src/fr-command-tar.c:744 +#: ../src/fr-command-tar.c:767 msgid "Decompressing archive" msgstr "Odpakiranje arhiva" @@ -573,9 +559,9 @@ # G:1 K:0 O:0 #: ../src/fr-new-archive-dialog.c:349 ../src/fr-new-archive-dialog.c:368 -#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:432 -#: ../src/fr-new-archive-dialog.c:450 ../src/fr-new-archive-dialog.c:472 -#: ../src/fr-window.c:2990 +#: ../src/fr-new-archive-dialog.c:384 ../src/fr-new-archive-dialog.c:433 +#: ../src/fr-new-archive-dialog.c:451 ../src/fr-new-archive-dialog.c:473 +#: ../src/fr-window.c:2989 msgid "Could not create the archive" msgstr "Ni mogoče ustvariti arhiva" @@ -583,40 +569,39 @@ msgid "You have to specify an archive name." msgstr "Določiti je treba ime arhiva." -#: ../src/fr-new-archive-dialog.c:434 +#: ../src/fr-new-archive-dialog.c:435 msgid "You don't have permission to create an archive in this folder" msgstr "Ni dovoljenja za ustvarjanje arhiva v tej mapi" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-new-archive-dialog.c:452 ../src/fr-window.c:8142 +#: ../src/fr-new-archive-dialog.c:453 ../src/fr-window.c:8246 msgid "New name is the same as old one, please type other name." msgstr "Novo ime je enako staremu. Vtipkajte drugo ime." -#: ../src/fr-new-archive-dialog.c:495 +#: ../src/fr-new-archive-dialog.c:496 #, c-format msgid "A file named \"%s\" already exists. Do you want to replace it?" -msgstr "Datoteka z imenom \"%s\" že obstaja. Ali jo želite zamenjati?" +msgstr "Datoteka z imenom »%s« že obstaja. Ali jo želite zamenjati?" -#: ../src/fr-new-archive-dialog.c:496 +#: ../src/fr-new-archive-dialog.c:497 #, c-format msgid "" "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "" -"Datoteka že obstaja v mapi \"%s\". S prepisom bo izgubljena vsebina ciljne " +"Datoteka že obstaja v mapi »%s«. S prepisom bo izgubljena vsebina ciljne " "datoteke." -#: ../src/fr-new-archive-dialog.c:502 ../src/fr-window.c:6686 +#: ../src/fr-new-archive-dialog.c:503 ../src/fr-window.c:6692 msgid "_Replace" msgstr "_Zamenjaj" # G:1 K:0 O:0 -#: ../src/fr-new-archive-dialog.c:517 +#: ../src/fr-new-archive-dialog.c:518 msgid "Could not delete the old archive." msgstr "Ni mogoče izbrisati starega arhiva." -# G:10 K:6 O:0 -#: ../src/fr-window-actions-callbacks.c:289 ../src/fr-window.c:6234 -#: ../src/ui/menus.ui.h:1 +#: ../src/fr-window-actions-callbacks.c:289 +msgctxt "Window title" msgid "Open" msgstr "Odpri" @@ -638,91 +623,91 @@ msgstr "Mapa" # G:5 K:1 O:0 -#: ../src/fr-window.c:1980 +#: ../src/fr-window.c:1981 msgid "[read only]" msgstr "[le za branje]" -#: ../src/fr-window.c:2121 +#: ../src/fr-window.c:2122 #, c-format msgid "Could not display the folder \"%s\"" -msgstr "Ni mogoče prikazati mape \"%s\"" +msgstr "Ni mogoče prikazati mape »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2294 ../src/fr-window.c:2332 +#: ../src/fr-window.c:2295 ../src/fr-window.c:2333 #, c-format msgid "Creating \"%s\"" -msgstr "Ustvarjanje \"%s\"" +msgstr "Ustvarjanje »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2298 +#: ../src/fr-window.c:2299 #, c-format msgid "Loading \"%s\"" -msgstr "Nalaganje \"%s\"" +msgstr "Nalaganje »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2302 +#: ../src/fr-window.c:2303 #, c-format msgid "Reading \"%s\"" -msgstr "Branje \"%s\"" +msgstr "Branje »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2306 +#: ../src/fr-window.c:2307 #, c-format msgid "Deleting the files from \"%s\"" -msgstr "Brisanje datotek iz \"%s\"" +msgstr "Brisanje datotek iz »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2310 +#: ../src/fr-window.c:2311 #, c-format msgid "Testing \"%s\"" -msgstr "Preizkušanje \"%s\"" +msgstr "Preizkušanje »%s«" -#: ../src/fr-window.c:2313 +#: ../src/fr-window.c:2314 msgid "Getting the file list" msgstr "Pridobivanje seznama datotek" #. Translators: %s is a filename -#: ../src/fr-window.c:2317 +#: ../src/fr-window.c:2318 #, c-format msgid "Copying the files to add to \"%s\"" -msgstr "Kopiranje datotek za dodajanje v \"%s\"" +msgstr "Kopiranje datotek za dodajanje v »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2321 +#: ../src/fr-window.c:2322 #, c-format msgid "Adding the files to \"%s\"" -msgstr "Dodajanje datotek v \"%s\"" +msgstr "Dodajanje datotek v »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2325 +#: ../src/fr-window.c:2326 #, c-format msgid "Extracting the files from \"%s\"" -msgstr "Odpakiranje datotek iz \"%s\"" +msgstr "Odpakiranje datotek iz »%s«" -#: ../src/fr-window.c:2328 +#: ../src/fr-window.c:2329 msgid "Copying the extracted files to the destination" msgstr "Kopiranje odpakiranih datotek na ciljno mesto" #. Translators: %s is a filename -#: ../src/fr-window.c:2337 +#: ../src/fr-window.c:2338 #, c-format msgid "Saving \"%s\"" -msgstr "Shranjevanje \"%s\"" +msgstr "Shranjevanje »%s«" #. Translators: %s is a filename -#: ../src/fr-window.c:2344 +#: ../src/fr-window.c:2345 #, c-format msgid "Renaming the files in \"%s\"" -msgstr "Preimenovanje datotek v \"%s\"" +msgstr "Preimenovanje datotek v »%s«" # G:0 K:1 O:0 #. Translators: %s is a filename -#: ../src/fr-window.c:2348 +#: ../src/fr-window.c:2349 #, c-format msgid "Updating the files in \"%s\"" -msgstr "Posodabljanje datotek v \"%s\"" +msgstr "Posodabljanje datotek v »%s«" -#: ../src/fr-window.c:2637 +#: ../src/fr-window.c:2638 #, c-format msgid "%d file remaining" msgid_plural "%'d files remaining" @@ -731,92 +716,92 @@ msgstr[2] "%'d preostali datoteki" msgstr[3] "%'d preostale datoteke" -#: ../src/fr-window.c:2641 ../src/fr-window.c:3267 +#: ../src/fr-window.c:2642 ../src/fr-window.c:3266 msgid "Please wait…" msgstr "Počakajte ..." -#: ../src/fr-window.c:2759 +#: ../src/fr-window.c:2760 msgid "Extraction completed successfully" msgstr "Odpakiranje je bilo uspešno zaključeno." # G:4 K:6 O:0 -#: ../src/fr-window.c:2762 +#: ../src/fr-window.c:2763 msgid "_Show the Files" msgstr "_Pokaži datoteke" #. Translators: %s is a filename -#: ../src/fr-window.c:2779 ../src/fr-window.c:6220 +#: ../src/fr-window.c:2780 ../src/fr-window.c:6224 #, c-format msgid "\"%s\" created successfully" -msgstr "Datoteka \"%s\" je uspešno ustvarjena" +msgstr "Datoteka »%s« je uspešno ustvarjena" # G:1 K:0 O:0 -#: ../src/fr-window.c:2786 +#: ../src/fr-window.c:2787 msgid "_Open the Archive" msgstr "_Odpri arhiv" -#: ../src/fr-window.c:2874 ../src/fr-window.c:3046 +#: ../src/fr-window.c:2875 ../src/fr-window.c:3045 msgid "Command exited abnormally." msgstr "Ukaz se je zaključil z napako." # G:3 K:0 O:0 -#: ../src/fr-window.c:2995 +#: ../src/fr-window.c:2994 msgid "An error occurred while extracting files." msgstr "Prišlo je do napake med odpakiranjem datotek." -#: ../src/fr-window.c:3001 +#: ../src/fr-window.c:3000 #, c-format msgid "Could not open \"%s\"" -msgstr "Ni mogoče odpreti \"%s\"" +msgstr "Ni mogoče odpreti »%s«" -#: ../src/fr-window.c:3006 +#: ../src/fr-window.c:3005 msgid "An error occurred while loading the archive." msgstr "Prišlo je do napake med nalaganjem arhiva." -#: ../src/fr-window.c:3010 +#: ../src/fr-window.c:3009 msgid "An error occurred while deleting files from the archive." msgstr "Prišlo je do napake med brisanjem datotek iz arhiva." -#: ../src/fr-window.c:3016 +#: ../src/fr-window.c:3015 msgid "An error occurred while adding files to the archive." msgstr "Prišlo je do napake med dodajanjem datotek v arhiv." -#: ../src/fr-window.c:3020 +#: ../src/fr-window.c:3019 msgid "An error occurred while testing archive." msgstr "Prišlo je do napake med preizkušanjem arhiva." -#: ../src/fr-window.c:3025 +#: ../src/fr-window.c:3024 msgid "An error occurred while saving the archive." msgstr "Prišlo je do napake med shranjevanjem arhiva." # G:3 K:0 O:0 -#: ../src/fr-window.c:3029 +#: ../src/fr-window.c:3028 msgid "An error occurred while renaming the files." msgstr "Prišlo je do napake med preimenovanjem datotek." # G:3 K:0 O:0 -#: ../src/fr-window.c:3033 +#: ../src/fr-window.c:3032 msgid "An error occurred while updating the files." msgstr "Prišlo je do napake med posodabljanjem datotek." -#: ../src/fr-window.c:3037 +#: ../src/fr-window.c:3036 msgid "An error occurred." msgstr "Prišlo je do napake." -#: ../src/fr-window.c:3043 +#: ../src/fr-window.c:3042 msgid "Command not found." msgstr "Ukaza ni mogoče najti." -#: ../src/fr-window.c:3199 +#: ../src/fr-window.c:3198 msgid "Test Result" msgstr "Rezultat preizkusa" -#: ../src/fr-window.c:4166 ../src/fr-window.c:8821 ../src/fr-window.c:8855 -#: ../src/fr-window.c:9135 +#: ../src/fr-window.c:4169 ../src/fr-window.c:8930 ../src/fr-window.c:8964 +#: ../src/fr-window.c:9244 msgid "Could not perform the operation" msgstr "Ni mogoče izvesti opravila" -#: ../src/fr-window.c:4191 +#: ../src/fr-window.c:4194 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" @@ -824,192 +809,207 @@ "Ali želite dodati to datoteko trenutnemu arhivu ali pa jo želite odpreti kot " "nov arhiv?" -#: ../src/fr-window.c:4220 +#: ../src/fr-window.c:4223 msgid "Do you want to create a new archive with these files?" msgstr "Ali želite iz teh datotek ustvariti arhiv?" -#: ../src/fr-window.c:4223 +#: ../src/fr-window.c:4226 msgid "Create _Archive" msgstr "Ustvari _arhiv" -#: ../src/fr-window.c:4252 ../src/fr-window.c:7279 +#: ../src/fr-window.c:4255 ../src/fr-window.c:7383 msgid "New Archive" msgstr "Nov arhiv" # G:1 K:0 O:0 -#: ../src/fr-window.c:4963 +#: ../src/fr-window.c:4966 msgid "Folders" msgstr "Mape" -#: ../src/fr-window.c:5001 ../src/ui/file-selector.ui.h:7 +#: ../src/fr-window.c:5004 ../src/ui/file-selector.ui.h:7 msgctxt "File" msgid "Size" msgstr "Velikost" # G:26 K:23 O:0 -#: ../src/fr-window.c:5002 +#: ../src/fr-window.c:5005 msgctxt "File" msgid "Type" msgstr "Vrsta" -#: ../src/fr-window.c:5003 ../src/ui/file-selector.ui.h:8 +#: ../src/fr-window.c:5006 ../src/ui/file-selector.ui.h:8 msgctxt "File" msgid "Modified" msgstr "Spremenjeno" # G:1 K:0 O:0 -#: ../src/fr-window.c:5004 +#: ../src/fr-window.c:5007 msgctxt "File" msgid "Location" msgstr "Mesto" # G:6 K:8 O:0 -#: ../src/fr-window.c:5013 ../src/ui/file-selector.ui.h:6 +#: ../src/fr-window.c:5016 ../src/ui/file-selector.ui.h:6 msgctxt "File" msgid "Name" msgstr "Ime" -#: ../src/fr-window.c:5776 ../src/fr-window.c:5806 +#: ../src/fr-window.c:5771 ../src/ui/extract-dialog-options.ui.h:1 +msgctxt "Action" +msgid "Extract" +msgstr "Odpakiraj" + +#: ../src/fr-window.c:5775 +msgctxt "Action" +msgid "Add Files" +msgstr "Dodaj datoteke" + +#: ../src/fr-window.c:5780 ../src/fr-window.c:5810 msgid "Find files by name" msgstr "Najdi datoteke po imenu" -#: ../src/fr-window.c:5823 +#: ../src/fr-window.c:5827 msgid "Go to the previous visited location" msgstr "Pojdi na predhodno obiskano mesto" -#: ../src/fr-window.c:5828 +#: ../src/fr-window.c:5832 msgid "Go to the next visited location" msgstr "Pojdi na naslednje obiskano mesto" -#: ../src/fr-window.c:5838 +#: ../src/fr-window.c:5842 msgid "Go to the home location" msgstr "Pojdi domov" # G:1 K:0 O:0 #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5847 ../src/ui/file-selector.ui.h:4 +#: ../src/fr-window.c:5851 ../src/ui/file-selector.ui.h:4 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "_Mesto:" +#: ../src/fr-window.c:6238 ../src/ui/menus.ui.h:1 +msgctxt "Action" +msgid "Open" +msgstr "Odpri" + # G:4 K:6 O:0 -#: ../src/fr-window.c:6675 +#: ../src/fr-window.c:6681 #, c-format msgid "Replace file \"%s\"?" -msgstr "Ali naj se datoteka \"%s\" prepiše?" +msgstr "Ali naj se datoteka »%s« prepiše?" -#: ../src/fr-window.c:6678 +#: ../src/fr-window.c:6684 #, c-format msgid "Another file with the same name already exists in \"%s\"." -msgstr "Druga datoteka z enakim imenom že obstaja v \"%s\"." +msgstr "Druga datoteka z enakim imenom že obstaja v »%s«." -#: ../src/fr-window.c:6684 +#: ../src/fr-window.c:6690 msgid "Replace _All" msgstr "Zamenjaj _vse" -#: ../src/fr-window.c:6685 +#: ../src/fr-window.c:6691 msgid "_Skip" msgstr "Pre_skoči" -#: ../src/fr-window.c:7463 ../src/fr-window.c:7820 +#: ../src/fr-window.c:7567 ../src/fr-window.c:7924 #, c-format msgid "Could not save the archive \"%s\"" -msgstr "Ni mogoče shraniti arhiva \"%s\"" +msgstr "Ni mogoče shraniti arhiva »%s«" -#: ../src/fr-window.c:7590 +#: ../src/fr-window.c:7694 msgid "Save" msgstr "Shrani" -#: ../src/fr-window.c:7914 +#: ../src/fr-window.c:8018 msgid "Last Output" msgstr "Zadnji izpis" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8137 +#: ../src/fr-window.c:8241 msgid "New name is void, please type a name." msgstr "Novo ime je prazno. Vtipkajte ime." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:8147 +#: ../src/fr-window.c:8251 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " "characters: %s, please type other name." -msgstr "Ime \"%s\" ni veljavno, saj ime ne sme vsebovati znakov: %s." +msgstr "Ime »%s« ni veljavno, saj ime ne sme vsebovati znakov: %s." -#: ../src/fr-window.c:8183 +#: ../src/fr-window.c:8287 #, c-format msgid "" "A folder named \"%s\" already exists.\n" "\n" "%s" msgstr "" -"Mapa z imenom \"%s\" že obstaja.\n" +"Mapa z imenom »%s« že obstaja.\n" "\n" "%s" -#: ../src/fr-window.c:8183 ../src/fr-window.c:8185 +#: ../src/fr-window.c:8287 ../src/fr-window.c:8289 msgid "Please use a different name." msgstr "Uporabite drugačno ime." -#: ../src/fr-window.c:8185 +#: ../src/fr-window.c:8289 #, c-format msgid "" "A file named \"%s\" already exists.\n" "\n" "%s" msgstr "" -"Datoteka z imenom \"%s\" že obstaja.\n" +"Datoteka z imenom »%s« že obstaja.\n" "\n" "%s" -#: ../src/fr-window.c:8255 +#: ../src/fr-window.c:8359 msgid "Rename" msgstr "Preimenuj" -#: ../src/fr-window.c:8256 +#: ../src/fr-window.c:8360 msgid "_New folder name:" msgstr "_Novo ime mape:" -#: ../src/fr-window.c:8256 +#: ../src/fr-window.c:8360 msgid "_New file name:" msgstr "_Novo ime datoteke:" -#: ../src/fr-window.c:8260 +#: ../src/fr-window.c:8364 msgid "_Rename" msgstr "P_reimenuj" -#: ../src/fr-window.c:8277 ../src/fr-window.c:8295 +#: ../src/fr-window.c:8381 ../src/fr-window.c:8399 msgid "Could not rename the folder" msgstr "Ni mogoče preimenovati mape" # G:1 K:0 O:0 -#: ../src/fr-window.c:8277 ../src/fr-window.c:8295 +#: ../src/fr-window.c:8381 ../src/fr-window.c:8399 msgid "Could not rename the file" msgstr "Ni mogoče preimenovati datoteke" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8728 +#: ../src/fr-window.c:8837 #, c-format msgid "Moving the files from \"%s\" to \"%s\"" -msgstr "Premikanje datotek iz \"%s\" v \"%s\"" +msgstr "Premikanje datotek iz »%s« v »%s«" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8731 +#: ../src/fr-window.c:8840 #, c-format msgid "Copying the files from \"%s\" to \"%s\"" -msgstr "Kopiranje datotek iz \"%s\" v \"%s\"" +msgstr "Kopiranje datotek iz »%s« v »%s«" -#: ../src/fr-window.c:8782 +#: ../src/fr-window.c:8891 msgid "Paste Selection" msgstr "Prilepi izbor" # G:1 K:0 O:0 -#: ../src/fr-window.c:8783 +#: ../src/fr-window.c:8892 msgid "_Destination folder:" msgstr "_Ciljna mapa:" -#: ../src/fr-window.c:8787 ../src/ui/app-menubar.ui.h:12 +#: ../src/fr-window.c:8896 ../src/ui/app-menubar.ui.h:12 msgid "_Paste" msgstr "_Prilepi" @@ -1364,6 +1364,45 @@ msgid "S_elect the files you want to update:" msgstr "_Izberite datoteke za posodobitev:" +#~ msgid "Extract Here" +#~ msgstr "Odpakiraj v to mapo" + +#~ msgid "Extract the selected archive to the current position" +#~ msgstr "Odpakiraj vsebino izbranega arhiva na trenutno mesto" + +#~ msgid "Extract To..." +#~ msgstr "Odpakiraj vsebino v ..." + +#~ msgid "Extract the selected archive" +#~ msgstr "Odpakiraj vsebino izbranega arhiva" + +#~ msgid "Compress..." +#~ msgstr "Zapakiraj ..." + +#~ msgid "Create a compressed archive with the selected objects" +#~ msgstr "Ustvari zapakiran arhiv z izbranimi predmeti" + +# G:0 K:1 O:0 +#~ msgid "Add Files" +#~ msgstr "Dodaj datoteke" + +# G:1 K:0 O:0 +#~ msgid "Load Options" +#~ msgstr "Naloži možnosti" + +#~ msgid "Save Options" +#~ msgstr "Shrani možnosti" + +#~ msgid "Extract" +#~ msgstr "Odpakiraj" + +#~ msgid "Extract archive" +#~ msgstr "Odpakiraj arhiv" + +# G:10 K:6 O:0 +#~ msgid "Open" +#~ msgstr "Odpri" + #~ msgid "Password" #~ msgstr "Geslo" diff -Nru file-roller-3.22.2/src/fr-application.c file-roller-3.22.3/src/fr-application.c --- file-roller-3.22.2/src/fr-application.c 2016-10-09 06:21:13.000000000 +0000 +++ file-roller-3.22.3/src/fr-application.c 2017-02-18 08:26:39.000000000 +0000 @@ -296,7 +296,7 @@ g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation); fr_window_batch_new (FR_WINDOW (window), C_("Window title", "Extract archive")); - fr_window_batch__extract (FR_WINDOW (window), archive, destination); + fr_window_batch__extract (FR_WINDOW (window), archive, destination, use_progress_dialog); fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL); fr_window_batch_start (FR_WINDOW (window)); @@ -322,7 +322,7 @@ g_signal_connect (window, "ready", G_CALLBACK (window_ready_cb), invocation); fr_window_batch_new (FR_WINDOW (window), C_("Window title", "Extract archive")); - fr_window_batch__extract_here (FR_WINDOW (window), archive); + fr_window_batch__extract_here (FR_WINDOW (window), archive, use_progress_dialog); fr_window_batch_append_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL); fr_window_batch_start (FR_WINDOW (window)); @@ -604,13 +604,16 @@ fr_window_batch_new (FR_WINDOW (window), C_("Window title", "Extract archive")); while ((archive = remaining_args[i++]) != NULL) { - GFile *file; + GFile *file; + gboolean last_archive; file = g_application_command_line_create_file_for_arg (command_line, archive); + last_archive = (remaining_args[i] == NULL); + if (arg_extract_here == 1) - fr_window_batch__extract_here (FR_WINDOW (window), file); + fr_window_batch__extract_here (FR_WINDOW (window), file, arg_notify && last_archive); else - fr_window_batch__extract (FR_WINDOW (window), file, extraction_destination); + fr_window_batch__extract (FR_WINDOW (window), file, extraction_destination, arg_notify && last_archive); g_object_unref (file); } diff -Nru file-roller-3.22.2/src/fr-archive-libarchive.c file-roller-3.22.3/src/fr-archive-libarchive.c --- file-roller-3.22.2/src/fr-archive-libarchive.c 2016-08-17 13:52:17.000000000 +0000 +++ file-roller-3.22.3/src/fr-archive-libarchive.c 2017-02-18 08:26:39.000000000 +0000 @@ -321,7 +321,7 @@ char *msg; GError *error; - msg = g_locale_to_utf8 (s, -1, NULL, NULL, NULL); + msg = (s != NULL) ? g_locale_to_utf8 (s, -1, NULL, NULL, NULL) : NULL; if (msg == NULL) msg = g_strdup ("Fatal error"); error = g_error_new_literal (FR_ERROR, FR_ERROR_COMMAND_ERROR, msg); diff -Nru file-roller-3.22.2/src/fr-window.c file-roller-3.22.3/src/fr-window.c --- file-roller-3.22.2/src/fr-window.c 2016-10-31 07:31:37.000000000 +0000 +++ file-roller-3.22.3/src/fr-window.c 2017-02-18 08:26:39.000000000 +0000 @@ -6432,7 +6432,7 @@ ExtractData *edata; edata = g_new0 (ExtractData, 1); - edata->window = window; + edata->window = _g_object_ref (window); edata->file_list = _g_string_list_dup (file_list); edata->destination = _g_object_ref (destination); edata->skip_older = skip_older; @@ -6454,6 +6454,7 @@ _g_string_list_free (edata->file_list); _g_object_unref (edata->destination); + _g_object_unref (edata->window); g_free (edata->base_dir); g_free (edata); @@ -6597,6 +6598,29 @@ static void _fr_window_ask_overwrite_dialog (OverwriteData *odata); +static OverwriteData * +overwrite_data_new (FrWindow *window) +{ + OverwriteData *odata; + + odata = g_new0 (OverwriteData, 1); + odata->window = _g_object_ref (window); + odata->edata = NULL; + odata->current_file = NULL; + odata->extract_all = FALSE; + + return odata; +} + + +static void +overwrite_data_free (OverwriteData *odata) +{ + _g_object_unref (odata->window); + g_free (odata); +} + + /* remove the file from the list to extract */ static void overwrite_data_skip_current (OverwriteData *odata) @@ -6644,7 +6668,7 @@ if (do_not_extract) { fr_window_batch_stop (odata->window); - g_free (odata); + overwrite_data_free (odata); return; } @@ -6775,7 +6799,7 @@ fr_window_dnd_extraction_finished (odata->window, TRUE); } - g_free (odata); + overwrite_data_free (odata); } @@ -6903,8 +6927,7 @@ if (edata->overwrite == FR_OVERWRITE_ASK) { OverwriteData *odata; - odata = g_new0 (OverwriteData, 1); - odata->window = window; + odata = overwrite_data_new (window); odata->edata = edata; odata->extract_all = (edata->file_list == NULL) || (g_list_length (edata->file_list) == window->archive->files->len); if (edata->file_list == NULL) @@ -9796,7 +9819,8 @@ void fr_window_batch__extract_here (FrWindow *window, - GFile *archive) + GFile *archive, + gboolean ask_to_open_destination) { g_return_if_fail (window != NULL); g_return_if_fail (archive != NULL); @@ -9814,7 +9838,7 @@ FALSE, FR_OVERWRITE_ASK, FALSE, - _fr_window_get_ask_to_open_destination (window), + ask_to_open_destination, TRUE), (GFreeFunc) extract_data_free); fr_window_batch_append_action (window, @@ -9827,7 +9851,8 @@ void fr_window_batch__extract (FrWindow *window, GFile *archive, - GFile *destination) + GFile *destination, + gboolean ask_to_open_destination) { g_return_if_fail (window != NULL); g_return_if_fail (archive != NULL); @@ -9846,7 +9871,7 @@ FALSE, FR_OVERWRITE_ASK, FALSE, - _fr_window_get_ask_to_open_destination (window), + ask_to_open_destination, FALSE), (GFreeFunc) extract_data_free); else diff -Nru file-roller-3.22.2/src/fr-window.h file-roller-3.22.3/src/fr-window.h --- file-roller-3.22.2/src/fr-window.h 2015-12-20 17:50:13.000000000 +0000 +++ file-roller-3.22.3/src/fr-window.h 2017-02-18 08:26:39.000000000 +0000 @@ -306,10 +306,12 @@ gboolean fr_window_is_batch_mode (FrWindow *window); void fr_window_batch__extract (FrWindow *window, GFile *archive, - GFile *destination); + GFile *destination, + gboolean ask_to_open_destination); void fr_window_batch__extract_here (FrWindow *window, - GFile *archive); -void fr_window_batch__add_files (FrWindow *window, + GFile *archive, + gboolean ask_to_open_destination); +void fr_window_batch__add_files (FrWindow *window, GFile *archive, GList *file_list); void fr_window_destroy_with_error_dialog (FrWindow *window);