diff -Nru file-roller-3.6.0/ChangeLog file-roller-3.6.3/ChangeLog --- file-roller-3.6.0/ChangeLog 2012-09-24 19:32:37.000000000 +0000 +++ file-roller-3.6.3/ChangeLog 2012-11-27 21:16:48.000000000 +0000 @@ -1,6 +1,630 @@ +commit 7564065aa087deb9f228cbfaf01b08f020edede4 +Author: Paolo Bacchilega +Date: 2012-11-27 + + updated for version 3.6.3 + +M NEWS +M configure.ac + +commit 4c4ffa3524a10451450955733d53385199af8a7a +Author: Aurimas Černius +Date: 2012-11-27 + + Updated Lithuanian translation + +M po/lt.po + +commit 231fb6e1e528f25c1da3de3b55c1b5a9e0d996d9 +Author: Paolo Bacchilega +Date: 2012-11-27 + + desktop file: do not mark Keywords for translation in the stable + branch + +M data/file-roller.desktop.in.in + +commit f470aed90431805e2e2cb9fd360109a69bacdc30 +Author: Paolo Bacchilega +Date: 2012-11-27 + + Revert "help: typo fixes, bug 673128" + + This reverts commit ff37bbe28237ff91c581908b3e5132b6536ba2ed. + Do not change the help pages in the stable branch + +M help/C/archive-view.page +M help/C/password-protection.page + +commit ff37bbe28237ff91c581908b3e5132b6536ba2ed +Author: Ekaterina Gerasimova +Date: 2012-11-27 + + help: typo fixes, bug 673128 + +M help/C/archive-view.page +M help/C/password-protection.page + +commit 274a0a73d2004cce3165b031dc289d3e982a613f +Author: Paolo Bacchilega +Date: 2012-11-27 + + added the -- switch to mv to deal with files starting with -- + +M src/fr-command-tar.c +M src/fr-command.c + +commit dd418a2aeb9a3d9b605e5d54c4eba29f5f6dcb4e +Author: Paolo Bacchilega +Date: 2012-11-26 + + rar: show the links correctly + +M src/fr-command-rar.c + +commit 109cc79b4fe662469f47e95c08529a47f6fa2acc +Author: Paolo Bacchilega +Date: 2012-11-26 + + process: show the ignored error when DEBUG is active + +M src/fr-process.c + +commit 63639f43737c1c75a9bfa879e44eb27feae90061 +Author: Paolo Bacchilega +Date: 2012-11-26 + + fixed cut&paste for rar archives + + paste the files before cutting to deal with commands such as 'rar' + that delete the archive when all its content is deleted. + + [bug fixed] + +M src/fr-window.c + +commit 692fe3a9abd368eab35cd22fb0312b5cae392bec +Author: Paolo Bacchilega +Date: 2012-11-26 + + fixed file deleting from encrypted rar archives + + [bug fixed] + +M src/fr-command-rar.c + +commit d94804700e51c7d4eda5a590d74aa784f2550235 +Author: Paolo Bacchilega +Date: 2012-11-26 + + command: handle password errors when adding files as well + +M src/fr-command.c + +commit 9f4b95c927f01623ada620d16adadade48c71fa4 +Author: Paolo Bacchilega +Date: 2012-11-25 + + Crash when pasting a deleted file + + [bug #688627] + +M src/fr-window.c + +commit b0d2e62519530f334e2f06c0e5f42f5518921773 +Author: Paolo Bacchilega +Date: 2012-11-25 + + fixed indentation + +M src/fr-window.c + +commit 41500606491a70e427789828ffedb4b59404d85e +Author: Paolo Bacchilega +Date: 2012-11-25 + + The button 'next' is still activated when it should be greyed out + + remove from the history the paths not present in the archive + + [bug #688648] + +M src/fr-window.c + +commit 41f6f3253f39a2e627a830f3dd20494dbf7098d7 +Author: Paolo Bacchilega +Date: 2012-11-25 + + fixed identation + +M src/fr-window.c + +commit 3a02663aa180155c833018ecdbece3c0df8aafcd +Author: Paolo Bacchilega +Date: 2012-11-25 + + ignore other calls to fr_window_close for the same window + +M src/fr-window.c + +commit 963ca0e4e397196ff13076f368ec590fc8036902 +Author: Paolo Bacchilega +Date: 2012-11-25 + + process: print "ignore error" when the ignore_error flag is active + +M src/fr-process.c + +commit 308ab89a33ddf4b0396ce5dc1eb33eb84b8a1b18 +Author: Paolo Bacchilega +Date: 2012-11-25 + + fixed error when renaming a file in rar/arj/lhz archives + + if the command deletes the archive when deleting all the files + inside the + the archive an error occurs when the file/folder to rename is + the single + top-level element. + +M src/fr-archive.c +M src/fr-archive.h +M src/fr-command-arj.c +M src/fr-command-lha.c +M src/fr-command-rar.c +M src/fr-command.c + +commit 238b11888a6d88af70d056963257a7bf2cf4192c +Author: Paolo Bacchilega +Date: 2012-11-25 + + file-roller doesn't delete directories w/ files within + + consider '/path/to/dir' and '/path/to/dir/' the same path + + [bug #632339] + +M src/file-data.c +M src/fr-window.c + +commit a047c714d431857b89dc635f1927707ecec7195d +Author: Paolo Bacchilega +Date: 2012-11-25 + + fixed a segmentation fault when closing the window + + keep a ref of the main window when the update dialog is active + +M src/dlg-update.c + +commit c87b4b8e410f268c7b2a785db631b8a835ed7557 +Author: Paolo Bacchilega +Date: 2012-11-25 + + fixed a comment + +M src/dlg-delete.c + +commit 02e981a757509f4d9d40f448613f1ab54fbe7288 +Author: Paolo Bacchilega +Date: 2012-11-25 + + The properties panel shows an incorrect number of files after file + deletion + + [bug #688634] + +M src/fr-archive.c + +commit bd8807beb9a026be2441aa492815b65a6fc94429 +Author: Paolo Bacchilega +Date: 2012-11-25 + + match Nautilus behavior for back and forward buttons + + [bug #578837] + +M src/fr-window.c + +commit 0349b3fa011f0117d3b419559b614304e07e388f +Author: Piotr Drąg +Date: 2012-11-24 + + Updated Polish translation + +M po/pl.po + +commit fcb2c73f4be37b2ba9728808ac7ceb95a597216c +Author: Matthias Clasen +Date: 2012-10-27 + + Add keywords to the desktop file + + This makes gnome-shell search more satisfying. + +M data/file-roller.desktop.in.in + +commit 593fc52ab3165ef7efeff82565c65687aee72728 +Author: ManojKumar Giri +Date: 2012-11-19 + + Updated Odia Translation with FUEL implementation. + +M po/or.po + +commit b2b89297ff782971dc839ed4416c197c34c7bd71 +Author: Paolo Bacchilega +Date: 2012-11-15 + + added README_COMMANDLINE to explain how to use the command line + options + +M Makefile.am +A README_COMMANDLINE + +commit 2d2b0cf118aaa168d99d64c92538cc78edf960fd +Author: Paolo Bacchilega +Date: 2012-11-15 + + deleted the obsolete content of TODO + +M TODO + +commit 3ee400c1d41fb902e65aa90c6f4bd02e705b1fac +Author: Paolo Bacchilega +Date: 2012-11-15 + + respect the --default-dir option when creating an archive + +M src/dlg-add.c +M src/dlg-batch-add.c +M src/fr-window.c + +commit 2434158834117f4b3bbbf894ed2706561b7a61b1 +Author: Paolo Bacchilega +Date: 2012-11-15 + + use a GtkGrid instead of a GtkTable for the window layout + +M src/fr-window.c + +commit ee5c722cb1a473e133956f09e9db26adfff343ee +Author: Paolo Bacchilega +Date: 2012-11-15 + + honor the --notify option even when using --extract-here + +M src/fr-window.c +M src/fr-window.h + +commit 58f6691ccb9e447543a91b34fadb799581b5bac8 +Author: Paolo Bacchilega +Date: 2012-11-15 + + fixed the computation of the gresourse dependency list + +M src/Makefile.am + +commit f26f6593aa06bc6b4cc15d343745cc924d200b57 +Author: Paolo Bacchilega +Date: 2012-11-14 + + respect the --notify option when the extraction is complete + +M src/fr-window.c +M src/main.c + +commit a094eab661ce1c5cf414dd836bf893fdfedc08ee +Author: Paolo Bacchilega +Date: 2012-11-14 + + Fixed crash when using the --extract-to option + + [bug #686321] + +M src/main.c + +commit c1651e186f2f5af153a02276e7f4b7dc2c4706d0 +Author: Paolo Bacchilega +Date: 2012-11-12 + + updated for version 3.6.2 + +M NEWS +M configure.ac + +commit cd67f95f43101a61a97d60ba8a075579026f9a1d +Author: Christian Kirbach +Date: 2012-11-05 + + Updated German help translation + +M help/de/de.po + +commit f9b8a010e7fe5a9bec158dfc5bd8ef1e11bf3842 +Author: Paolo Bacchilega +Date: 2012-10-28 + + fails when tryings create zip files if is in "maximum" compression + level + + [bug #686655] + +M src/fr-command-7z.c + +commit 66b52fc6d38ddc39af6913a68b2df320279d15d5 +Author: Paolo Bacchilega +Date: 2012-10-17 + + updated for version 3.6.1.1 + +M NEWS +M configure.ac + +commit 7c9a39eb9da0bb339949798c8ca530567996a309 +Author: Bastien Nocera +Date: 2012-10-17 + + help: Fix Galician translation' tags + +M help/gl/gl.po + +commit f61523eda6b1d43fc6cd2e14ed3ebd862670c5fa +Author: Bastien Nocera +Date: 2012-10-17 + + help: Fix French documentation's tags + +M help/fr/fr.po + +commit 052f443974552651254083b6158917eba51c3b07 +Author: Bastien Nocera +Date: 2012-10-16 + + Add *.ar files as supported + + https://bugzilla.gnome.org/show_bug.cgi?id=686232 + +M data/file-roller.desktop.in.in + +commit 78d330c95a562f83769ace871b8c2671788842ba +Author: Paolo Bacchilega +Date: 2012-10-16 + + add a zero at the end of the buffer that contains the xml description + + attempt to fix bug #686230 + +M src/main.c + +commit 123919e9fc55b468af1a52cc4384441c7fcb119a +Author: Paolo Bacchilega +Date: 2012-10-16 + + do not crash if the introspection data is not loaded correctly + +M src/main.c + +commit a50ba6e449ce16b5b6bc7ae572424035a66137eb +Author: Paolo Bacchilega +Date: 2012-10-15 + + updated for version 3.6.1 + +M NEWS +M configure.ac + +commit 4b076208d19d32653a3dbd818064f0086fc743e5 +Author: Paolo Bacchilega +Date: 2012-10-13 + + libarchive: skip the data if the file type is not supported + +M src/fr-archive-libarchive.c + +commit 61366af46d6bfc5bc485ae3ca3569c4d6fb130eb +Author: Paolo Bacchilega +Date: 2012-10-13 + + libarchive: no need to set the symbolink link attributes + +M src/fr-archive-libarchive.c + +commit b56f70ee297bc6ba083cdecaffd946dc362e64dc +Author: Paolo Bacchilega +Date: 2012-10-13 + + libarchive: fixed creation of hard links + + Only works when extracting the files to a local destinations. + + [bug #686061] + +M src/fr-archive-libarchive.c + +commit 48c4116ed56eed814289d9cc86d0dd496d7d344d +Author: Peter Mráz +Date: 2012-10-12 + + Updated Slovak translation + +M po/sk.po + +commit a1496c4d25ef1fa2345384467e83076f3139e5cf +Author: Peter Mráz +Date: 2012-10-09 + + Updated Slovak translation + +M po/sk.po + +commit d17fff41a84996ebb7f2f993e3ca2b62866cf943 +Author: Martin Srebotnjak +Date: 2012-10-08 + + Updated Slovenian translation + +M help/sl/sl.po + +commit de187266bb77f1e029d2e6c3777ee3b95a5f859e +Author: Yuri Myasoedov +Date: 2012-10-04 + + Updated Russian translation + +M help/ru/ru.po + +commit dae5473d3b5492e2f5d7eb618db7b914d5518192 +Author: Milo Casagrande +Date: 2012-10-03 + + [l10n] Updated Italian translation. + +M po/it.po + +commit 8ab23e584401943be45fc3e4484e34170bd7d0c9 +Author: Paolo Bacchilega +Date: 2012-10-02 + + crash when opening multi-volumes rar archives + + [bug #685314] + +M src/fr-archive.c + +commit 35cb0b440fc5613d4cb6b51bfc3c873d283ed413 +Author: Paolo Bacchilega +Date: 2012-10-02 + + Compress dialog: fixed creation of encrypted archives + + [fixed bug] + +M src/dlg-batch-add.c + +commit 547c57e00d5e8585b129c95f9d5d2b1abd086d46 +Author: Paolo Bacchilega +Date: 2012-10-02 + + fixed creation of multi-volume archives + + [fixed bug] + +M src/fr-command.c + +commit 3302a3a50f4577d61c51b82f0c37b348776dd9e5 +Author: Tom Tryfonidis +Date: 2012-10-02 + + Fixed name of greek screenshot + +A help/el/figures/file-roller-main-window.png + +commit b5029e82ae4ee7b4f6edc57a5447e1988720bf92 +Author: Tom Tryfonidis +Date: 2012-10-02 + + Updated screenshot for Greek help translation + +M help/el/figures/file-roller_main_window.png + +commit d8419ec2d191dd150a0905eb2399af4e01f96045 +Author: Daniel Martinez Cucalon +Date: 2012-09-29 + + Updated Aragonese translation + +M po/an.po + +commit 1730f40db566e8ccf9a63861fb05f435105d7809 +Author: Mitsuya Shibata +Date: 2012-09-29 + + "Add Files" dialog crashes on i386 architecture + + Modified Order store GTimeVal.tv_sec[1]. GTimeVal.tv_sec is glong, + but ui file[2] specify size as gint64. Therefore no problem on 64bit, + on the other hand raise SEGV on 32bit by memory address boundary + problem. + + Finally invalid address which is index of GtkListStore is passed + to g_strdup() as memory address. + + This patch set same size storead size and allocated size. + + [1] see calling gtk_list_store_set() at get_folder_content_done_cb() + in src/fr-file-selector-dialog.c + [2] src/ui/file-selector.ui:296 + +M src/ui/file-selector.ui + +commit 5c37b1b0a0945a60b62492cf0deb0a9f4499038d +Author: Paolo Bacchilega +Date: 2012-09-28 + + ignore the theme changed signals while creating the file list + +M src/fr-window.c + +commit ceb3232be494ef6841e368928a6a3e58029a0f97 +Author: Paolo Bacchilega +Date: 2012-09-28 + + try to open the archive again if the current command doesn't support + reading + + this allows to have a command that can only write and another + command that can only read an archive type. + +M src/fr-window.c + +commit 7be9d3e3f5cc4fa315b483af9453d390813b2ca8 +Author: Paolo Bacchilega +Date: 2012-09-28 + + give priority to commands that can read and write when creating + an archive + +M src/fr-archive.c + +commit 75316754610fb99e61e3e76a895babfc05331ab5 +Author: Paolo Bacchilega +Date: 2012-09-28 + + use _g_file_load_buffer_async in fr_archive_open as well + +M src/fr-archive.c + +commit b1455f95c65b81cb0027af4ffb9b2586a86c2bcb +Author: Paolo Bacchilega +Date: 2012-09-28 + + fixed crash when the package installer is activated + + [bug #684941] + +M src/dlg-package-installer.c +M src/dlg-package-installer.h +M src/fr-archive.c +M src/fr-init.c +M src/fr-init.h +M src/fr-window.c +M src/gio-utils.c +M src/gio-utils.h +M src/glib-utils.c +M src/glib-utils.h + +commit 1c4d7016f83088591625a4b8ab457ffd1b6ffcc6 +Author: Mitsuya Shibata +Date: 2012-09-27 + + Adding file to archive, file-roller doesn't load location correctly + +M src/dlg-add.c + commit 485c3519ef64afea1223845dfabb15ee9cf2d06f Author: Paolo Bacchilega -Date: 2012-09-24 +Date: 2012-09-24 updated for version 3.6.0 diff -Nru file-roller-3.6.0/Makefile.am file-roller-3.6.3/Makefile.am --- file-roller-3.6.0/Makefile.am 2012-08-06 13:23:48.000000000 +0000 +++ file-roller-3.6.3/Makefile.am 2012-11-15 20:30:24.000000000 +0000 @@ -25,6 +25,7 @@ MAINTAINERS \ NEWS \ README \ + README_COMMANDLINE \ file-roller.spec \ file-roller.spec.in \ intltool-merge.in \ diff -Nru file-roller-3.6.0/Makefile.in file-roller-3.6.3/Makefile.in --- file-roller-3.6.0/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -324,6 +324,7 @@ MAINTAINERS \ NEWS \ README \ + README_COMMANDLINE \ file-roller.spec \ file-roller.spec.in \ intltool-merge.in \ diff -Nru file-roller-3.6.0/NEWS file-roller-3.6.3/NEWS --- file-roller-3.6.0/NEWS 2012-09-24 19:11:52.000000000 +0000 +++ file-roller-3.6.3/NEWS 2012-11-27 20:57:52.000000000 +0000 @@ -1,3 +1,67 @@ +version 3.6.3 +------------- + + Bugs fixed: + + * Crash when pasting a deleted file. (#688627) + * Fixed the 'next' button still activated when it should not. (#688648) + * zip archives: file-roller doesn't delete directories. (#632339) + * The properties panel shows an incorrect number of files. (#688634) + * Match Nautilus behavior for back and forward buttons. (#578837) + * Fixed crash when using the --extract-to option. (#686321) + * Fixed cut & paste for rar/arj/lhz archives when cutting all the + files in the archive. + * Fixed file deletion for encrypted rar archives. + * Fixed renaming for files starting with '--'. + + New or updated application translations: + + * Oriya (Manoj Kumar Giri) + * Polish (Piotr Drąg) + +version 3.6.2 +------------- + + Bugs fixed: + + * Fails when tryings create zip files if is in "maximum" compression + level (#686655) + + New or updated manual translations: + + * Deutsch (Christian Kirbach) + +version 3.6.1.1 +--------------- + + Bugs fixed: + + * Fixed crash on startup. (#686230, #685108) + * Register .ar files as supported. (Bastien Nocera) + * Fixed Galician and French documentation's tags. (Bastien Nocera) + +version 3.6.1 +------------- + + Bugs fixed: + + * Fixed creation of hard links when using libarchive. (#686061) + * Fixed crash when opening multi-volumes rar archives. (#685314) + * Fixed crash when the package installer is activated. (#684941) + * Fixed creation of encrypted archives. + * Fixed creation of multi-volume archives. + + New or updated application translations: + + * Aragonés (Daniel Martinez) + * Italian (Milo Casagrande) + * Slovak (Peter Mráz) + + New or updated manual translations: + + * Slovenian (Martin Srebotnjak) + * Russian (Yuri Myasoedov) + version 3.6.0 ------------- diff -Nru file-roller-3.6.0/README_COMMANDLINE file-roller-3.6.3/README_COMMANDLINE --- file-roller-3.6.0/README_COMMANDLINE 1970-01-01 00:00:00.000000000 +0000 +++ file-roller-3.6.3/README_COMMANDLINE 2012-11-15 08:58:39.000000000 +0000 @@ -0,0 +1,54 @@ +This files contains some instructions on how to use the command line arguments. + + +Extraction +---------- + +1) Extract an archive to a specified directory: + + file-roller --extract-to=/path/to/dir archive.tgz + + create the destination folder without asking the user to confirm + + file-roller --force --extract-to=/path/to/dir archive.tgz + +2) Extract an archive letting the user choose the destination directory: + + file-roller --extract archive.tgz + + set the directory to show in the folder chooser dialog: + + file-roller --default-dir=/path/to/show --extract archive.tgz + +3) Extract an archive in its parent folder creating a subfolder if the archive + contains more than one top level object (that is avoiding the tar-bombing). + This is the same command used in the Nautilus context menu to extract + archives. + + file-roller --extract-here archive.tgz + +Use the --notify option to show a dialog that notifies the user that the +operation has completed successfully and allows to open the destination folder. + +You can extract a series of archives with a single command. + + +Compression +----------- + +1) Compress a series of files specifing the archive name: + + file-roller --add-to=/path/to/archive.tgz file1 file2 .. + + the archive is created if it doesn't exit. + +2) Compress a series of files letting the user choose the archive name: + + file-roller --add file1 file2 .. + + set the directory to show in the folder chooser dialog: + + file-roller --default-dir=/path/to/show --add file1 file2 .. + +Use the --notify option to show a dialog that notifies the user that the +operation has completed successfully and allows to open the created archive. diff -Nru file-roller-3.6.0/TODO file-roller-3.6.3/TODO --- file-roller-3.6.0/TODO 2011-08-04 07:46:36.000000000 +0000 +++ file-roller-3.6.3/TODO 2012-11-15 20:36:50.000000000 +0000 @@ -1,47 +0,0 @@ -== Pending == - -[ ] #547727 – file-roller crashed with SIGSEGV in strlen() - -== ToDo == - -[ ] #525274 – File roller seems to be unable to create zipfiles without .zip extension - -[ ] #512825 – Fails extraction of files within directories named '.' - -[ ] #508737 – can't add file to the archive if archive name is without extension - -[ ] #482560 – totem-like plugin installer for file-roller - -[ ] Progress bar should not be file based, but content size based. - Related to bug #153281 - -[ ] #543225 – File-Roller is unable to open gzip-compressed files like pci.ids if they are missing an .gz extension - -[ ] It's not possible to load, modify, extract remote multi-volume archives. - -[?] #501660 – File-roller nautilus extension creates tarbombs - -[ ] #306403 – filenames in non-UTF-8 encodings are not handled correctly - -[ ] #547982 – Failure dialog for file extraction should be more useful - -[x] #350640 – sending an empty folder doesn't work - -[x] LP#26662: file-roller fails to open .Z files - -== DONE == - -[x] optimization of the add_folder operation: if the command supports all the - requested options add the folder directly instead of reading the folder - and adding the content in chunks. - - Partially fixed for the commands that allow to specify the file list - in a file, that is: tar, rar, 7zip. - -[x] #153281 – Progress bar should be exact - - This is command dependent: fixed for tar, zip, 7zip, rar. - -[x] #503940 – Various Archive Manager documentation mistakes - -[x] http://ubuntuforums.org/showthread.php?t=882771 diff -Nru file-roller-3.6.0/aclocal.m4 file-roller-3.6.3/aclocal.m4 --- file-roller-3.6.0/aclocal.m4 2012-09-24 19:08:12.000000000 +0000 +++ file-roller-3.6.3/aclocal.m4 2012-11-27 20:58:34.000000000 +0000 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.12.4 -*- Autoconf -*- +# generated automatically by aclocal 1.12.5 -*- Autoconf -*- # Copyright (C) 1996-2012 Free Software Foundation, Inc. @@ -546,7 +546,7 @@ [am__api_version='1.12' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.12.4], [], +m4_if([$1], [1.12.5], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -562,7 +562,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.12.4])dnl +[AM_AUTOMAKE_VERSION([1.12.5])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) diff -Nru file-roller-3.6.0/configure file-roller-3.6.3/configure --- file-roller-3.6.0/configure 2012-09-24 19:08:13.000000000 +0000 +++ file-roller-3.6.3/configure 2012-11-27 20:58:37.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.6.0. +# Generated by GNU Autoconf 2.69 for file-roller 3.6.3. # # Report bugs to . # @@ -591,8 +591,8 @@ # Identity of this package. PACKAGE_NAME='file-roller' PACKAGE_TARNAME='file-roller' -PACKAGE_VERSION='3.6.0' -PACKAGE_STRING='file-roller 3.6.0' +PACKAGE_VERSION='3.6.3' +PACKAGE_STRING='file-roller 3.6.3' PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller' PACKAGE_URL='' @@ -1427,7 +1427,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.6.0 to adapt to many kinds of systems. +\`configure' configures file-roller 3.6.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1497,7 +1497,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of file-roller 3.6.0:";; + short | recursive ) echo "Configuration of file-roller 3.6.3:";; esac cat <<\_ACEOF @@ -1641,7 +1641,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -file-roller configure 3.6.0 +file-roller configure 3.6.3 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1919,7 +1919,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.6.0, which was +It was created by file-roller $as_me 3.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2743,7 +2743,7 @@ # Define the identity of the package. PACKAGE='file-roller' - VERSION='3.6.0' + VERSION='3.6.3' cat >>confdefs.h <<_ACEOF @@ -14305,7 +14305,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.6.0, which was +This file was extended by file-roller $as_me 3.6.3, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14371,7 +14371,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.6.0 +file-roller config.status 3.6.3 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -Nru file-roller-3.6.0/configure.ac file-roller-3.6.3/configure.ac --- file-roller-3.6.0/configure.ac 2012-09-24 19:08:02.000000000 +0000 +++ file-roller-3.6.3/configure.ac 2012-11-27 20:57:52.000000000 +0000 @@ -2,7 +2,7 @@ AC_PREREQ([2.68]) -AC_INIT([file-roller],[3.6.0],[http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller],[file-roller]) +AC_INIT([file-roller],[3.6.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.6.0/copy-n-paste/Makefile.in file-roller-3.6.3/copy-n-paste/Makefile.in --- file-roller-3.6.0/copy-n-paste/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/copy-n-paste/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/Makefile.in file-roller-3.6.3/data/Makefile.in --- file-roller-3.6.0/data/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/data/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/file-roller.desktop file-roller-3.6.3/data/file-roller.desktop --- file-roller-3.6.0/data/file-roller.desktop 2012-09-24 19:09:24.000000000 +0000 +++ file-roller-3.6.3/data/file-roller.desktop 2012-11-27 20:58:43.000000000 +0000 @@ -198,6 +198,7 @@ Comment[zh_HK]=建立及更改壓縮檔 Comment[zh_TW]=建立及更改壓縮檔 Comment[zu]=Dala futhi ulungise ingobo yomlando +Keywords=zip;tar;extract;unpack; TryExec=file-roller Exec=file-roller %U StartupNotify=true @@ -205,9 +206,9 @@ Type=Application Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive; X-GNOME-DocPath=file-roller/file-roller.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.6.0 +X-GNOME-Bugzilla-Version=3.6.3 diff -Nru file-roller-3.6.0/data/file-roller.desktop.in file-roller-3.6.3/data/file-roller.desktop.in --- file-roller-3.6.0/data/file-roller.desktop.in 2012-09-24 19:09:18.000000000 +0000 +++ file-roller-3.6.3/data/file-roller.desktop.in 2012-11-27 20:58:40.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] _Name=Archive Manager _Comment=Create and modify an archive +Keywords=zip;tar;extract;unpack; TryExec=file-roller Exec=file-roller %U StartupNotify=true @@ -8,9 +9,9 @@ Type=Application Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive; X-GNOME-DocPath=file-roller/file-roller.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller X-GNOME-Bugzilla-Component=general -X-GNOME-Bugzilla-Version=3.6.0 +X-GNOME-Bugzilla-Version=3.6.3 diff -Nru file-roller-3.6.0/data/file-roller.desktop.in.in file-roller-3.6.3/data/file-roller.desktop.in.in --- file-roller-3.6.0/data/file-roller.desktop.in.in 2011-08-04 07:46:36.000000000 +0000 +++ file-roller-3.6.3/data/file-roller.desktop.in.in 2012-11-27 20:35:41.000000000 +0000 @@ -1,6 +1,7 @@ [Desktop Entry] _Name=Archive Manager _Comment=Create and modify an archive +Keywords=zip;tar;extract;unpack; TryExec=file-roller Exec=file-roller %U StartupNotify=true @@ -8,7 +9,7 @@ Type=Application Icon=file-roller Categories=GTK;GNOME;Utility;Archiving;Compression; -MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip; +MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive; X-GNOME-DocPath=file-roller/file-roller.xml X-GNOME-Bugzilla-Bugzilla=GNOME X-GNOME-Bugzilla-Product=file-roller diff -Nru file-roller-3.6.0/data/icons/16x16/Makefile.in file-roller-3.6.3/data/icons/16x16/Makefile.in --- file-roller-3.6.0/data/icons/16x16/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/data/icons/16x16/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/16x16/actions/Makefile.in file-roller-3.6.3/data/icons/16x16/actions/Makefile.in --- file-roller-3.6.0/data/icons/16x16/actions/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/data/icons/16x16/actions/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/16x16/apps/Makefile.in file-roller-3.6.3/data/icons/16x16/apps/Makefile.in --- file-roller-3.6.0/data/icons/16x16/apps/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/data/icons/16x16/apps/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/22x22/Makefile.in file-roller-3.6.3/data/icons/22x22/Makefile.in --- file-roller-3.6.0/data/icons/22x22/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/data/icons/22x22/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/22x22/apps/Makefile.in file-roller-3.6.3/data/icons/22x22/apps/Makefile.in --- file-roller-3.6.0/data/icons/22x22/apps/Makefile.in 2012-09-24 19:08:14.000000000 +0000 +++ file-roller-3.6.3/data/icons/22x22/apps/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/24x24/Makefile.in file-roller-3.6.3/data/icons/24x24/Makefile.in --- file-roller-3.6.0/data/icons/24x24/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/24x24/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/24x24/actions/Makefile.in file-roller-3.6.3/data/icons/24x24/actions/Makefile.in --- file-roller-3.6.0/data/icons/24x24/actions/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/24x24/actions/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/24x24/apps/Makefile.in file-roller-3.6.3/data/icons/24x24/apps/Makefile.in --- file-roller-3.6.0/data/icons/24x24/apps/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/24x24/apps/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/256x256/Makefile.in file-roller-3.6.3/data/icons/256x256/Makefile.in --- file-roller-3.6.0/data/icons/256x256/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/256x256/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/256x256/apps/Makefile.in file-roller-3.6.3/data/icons/256x256/apps/Makefile.in --- file-roller-3.6.0/data/icons/256x256/apps/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/256x256/apps/Makefile.in 2012-11-27 20:58:35.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/32x32/Makefile.in file-roller-3.6.3/data/icons/32x32/Makefile.in --- file-roller-3.6.0/data/icons/32x32/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/32x32/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/32x32/apps/Makefile.in file-roller-3.6.3/data/icons/32x32/apps/Makefile.in --- file-roller-3.6.0/data/icons/32x32/apps/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/32x32/apps/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/48x48/Makefile.in file-roller-3.6.3/data/icons/48x48/Makefile.in --- file-roller-3.6.0/data/icons/48x48/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/48x48/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/48x48/apps/Makefile.in file-roller-3.6.3/data/icons/48x48/apps/Makefile.in --- file-roller-3.6.0/data/icons/48x48/apps/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/48x48/apps/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/data/icons/Makefile.in file-roller-3.6.3/data/icons/Makefile.in --- file-roller-3.6.0/data/icons/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/data/icons/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/debian/changelog file-roller-3.6.3/debian/changelog --- file-roller-3.6.0/debian/changelog 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/changelog 2013-01-17 14:21:23.000000000 +0000 @@ -1,3 +1,81 @@ +file-roller (3.6.3-1ubuntu2~andre1) quantal; urgency=low + + * Backport from Ubuntu / Debian without changes + + -- Andre Klitzing Thu, 17 Jan 2013 15:21:23 +0100 + +file-roller (3.6.3-1ubuntu2) raring; urgency=low + + * debian/control.in: lower "unar" Recommends to a Suggests, + the package is not in main and depends on the gnustep stack + + -- Sebastien Bacher Thu, 06 Dec 2012 11:45:36 +0100 + +file-roller (3.6.3-1ubuntu1) raring; urgency=low + + * Merge from Debian experimental. Remaining changes: + - Use the Ubuntu epoch number for the nautilus depends + - Depend on zip and unzip instead of p7zip which is in universe + - Recommend sessioninstaller + * Drop genisoimage dependency (supported through libarchive). + + -- Benjamin Drung Wed, 05 Dec 2012 20:17:54 +0100 + +file-roller (3.6.3-1) experimental; urgency=low + + [ Benjamin Drung ] + * Team upload. + * New upstream release. + * Drop 11_search_as_you_type.patch (fixed upstream). + * Replace build-depends on gnome-doc-utils with yelp-tools. + * Build-Depends on libarchive-dev and libnotify-dev. + * Recommend unar instead of non-free unrar | p7zip-rar (Closes: #620650, + LP: #965757, #1025588). + * Build depend on libjson-glib-dev (needed for unar support). + * Drop suggesting binutils (for ar) and cpio. libarchive is used instead. + * Document support for .cab and .xar (through libarchive). + * debian/patches/git_handle_cab.patch: List vnd.ms-cab-compressed as + supported type, thanks Mantas Kriaučiūnas (LP: #1064377) + + [ Jeremy Bicha ] + * debian/control.in: + - Drop scrollkeeper build-depends + - Recommend yelp + + -- Benjamin Drung Wed, 05 Dec 2012 15:46:34 +0100 + +file-roller (3.6.3-0ubuntu2) raring; urgency=low + + * debian/patches/git_handle_cab.patch: list vnd.ms-cab-compressed as + supported type, thanks Mantas Kriaučiūnas (lp: #1064377) + + -- Sebastien Bacher Thu, 29 Nov 2012 11:26:49 +0100 + +file-roller (3.6.3-0ubuntu1) raring; urgency=low + + * New upstream release + * debian/patches/git_extract_segfault.patch: + * debian/patches/git_extract_progress_fix.patch: + - Applied upstream + + -- Robert Ancell Wed, 28 Nov 2012 11:25:04 +1300 + +file-roller (3.6.1.1-0ubuntu1.1) quantal-proposed; urgency=low + + * debian/patches/git_extract_segfault.patch: don't segfault when + using --extract-to, thanks Maarten Baert (lp: #978789) + * debian/patches/git_extract_progress_fix.patch: + - backport another patch to complete the previous commit + + -- Sebastien Bacher Fri, 16 Nov 2012 15:57:49 +0100 + +file-roller (3.6.1.1-0ubuntu1) quantal-proposed; urgency=low + + * New upstream bugfix release (LP: #1069443) + * Dropped git patches that have been applied in new version + + -- Jeremy Bicha Sun, 21 Oct 2012 12:00:46 -0400 + file-roller (3.6.0-0ubuntu3) quantal; urgency=low * debian/patches/git_add_files_i386.patch: diff -Nru file-roller-3.6.0/debian/control file-roller-3.6.3/debian/control --- file-roller-3.6.0/debian/control 2012-10-05 15:06:03.000000000 +0000 +++ file-roller-3.6.3/debian/control 2013-01-17 14:21:28.000000000 +0000 @@ -10,38 +10,35 @@ Uploaders: Debian GNOME Maintainers , Jeremy Bicha Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), - dh-autoreconf, + gettext, gnome-pkg-tools (>= 0.12), + intltool (>= 0.40.0), + libarchive-dev (>= 3), libglib2.0-dev (>= 2.29.14), libgtk-3-dev (>= 3.4.0), + libjson-glib-dev (>= 0.14), libmagic-dev, libnautilus-extension-dev (>= 1:2.91.0), - libjson-glib-dev (>= 0.14.0), - gettext, - intltool (>= 0.40.0), - yelp-tools, - libarchive-dev (>= 3.0), - libnotify-dev + libnotify-dev (>= 0.4.3), + yelp-tools Standards-Version: 3.9.3 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/file-roller/ubuntu Homepage: http://fileroller.sourceforge.net/ Package: file-roller Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - bzip2, - zip | p7zip-full, +Depends: bzip2, + nautilus-data (>= 1:3.0), unzip | p7zip-full, - genisoimage, - nautilus-data (>= 1:3.0) + zip | p7zip-full, + ${misc:Depends}, + ${shlibs:Depends} Replaces: gnome-icon-theme (<< 2.14) Recommends: gnome-icon-theme (>= 2.18), gvfs, - sessioninstaller | packagekit + sessioninstaller | packagekit, + yelp Suggests: arj, - binutils, - cpio, lha, lzip, lzma, @@ -52,7 +49,7 @@ sharutils, unace, unalz, - unrar | p7zip-rar, + unar, unzip, xz-utils, zip, @@ -75,8 +72,15 @@ * 7z archives (.7z) * iso9660 CD images (.iso) * Lha archives (.lzh) + * Archiver archives (.ar) + * Comic book archives (.cbz) * Single files compressed with gzip (.gz), bzip (.bz), bzip2 (.bz2), compress (.Z), lzip (.lz), lzop (.lzo), lzma (.lzma) and xz (.xz) . + File-roller can extract following formats: + * Cabinet archives (.cab) + * Debian binary packages (.deb) + * Xar archives (.xar) + . File-roller doesn't perform archive operations by itself, but relies on standard tools for this. diff -Nru file-roller-3.6.0/debian/control.in file-roller-3.6.3/debian/control.in --- file-roller-3.6.0/debian/control.in 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/control.in 2012-12-06 10:46:05.000000000 +0000 @@ -6,38 +6,35 @@ Uploaders: @GNOME_TEAM@ Build-Depends: cdbs (>= 0.4.41), debhelper (>= 8), - dh-autoreconf, + gettext, gnome-pkg-tools (>= 0.12), + intltool (>= 0.40.0), + libarchive-dev (>= 3), libglib2.0-dev (>= 2.29.14), libgtk-3-dev (>= 3.4.0), + libjson-glib-dev (>= 0.14), libmagic-dev, libnautilus-extension-dev (>= 1:2.91.0), - libjson-glib-dev (>= 0.14.0), - gettext, - intltool (>= 0.40.0), - yelp-tools, - libarchive-dev (>= 3.0), - libnotify-dev + libnotify-dev (>= 0.4.3), + yelp-tools Standards-Version: 3.9.3 Vcs-Bzr: https://code.launchpad.net/~ubuntu-desktop/file-roller/ubuntu Homepage: http://fileroller.sourceforge.net/ Package: file-roller Architecture: any -Depends: ${shlibs:Depends}, - ${misc:Depends}, - bzip2, - zip | p7zip-full, +Depends: bzip2, + nautilus-data (>= 1:3.0), unzip | p7zip-full, - genisoimage, - nautilus-data (>= 1:3.0) + zip | p7zip-full, + ${misc:Depends}, + ${shlibs:Depends} Replaces: gnome-icon-theme (<< 2.14) Recommends: gnome-icon-theme (>= 2.18), gvfs, - sessioninstaller | packagekit + sessioninstaller | packagekit, + yelp Suggests: arj, - binutils, - cpio, lha, lzip, lzma, @@ -48,7 +45,7 @@ sharutils, unace, unalz, - unrar | p7zip-rar, + unar, unzip, xz-utils, zip, @@ -71,8 +68,15 @@ * 7z archives (.7z) * iso9660 CD images (.iso) * Lha archives (.lzh) + * Archiver archives (.ar) + * Comic book archives (.cbz) * Single files compressed with gzip (.gz), bzip (.bz), bzip2 (.bz2), compress (.Z), lzip (.lz), lzop (.lzo), lzma (.lzma) and xz (.xz) . + File-roller can extract following formats: + * Cabinet archives (.cab) + * Debian binary packages (.deb) + * Xar archives (.xar) + . File-roller doesn't perform archive operations by itself, but relies on standard tools for this. diff -Nru file-roller-3.6.0/debian/copyright file-roller-3.6.3/debian/copyright --- file-roller-3.6.0/debian/copyright 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/copyright 2012-12-06 10:46:05.000000000 +0000 @@ -50,4 +50,3 @@ . 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.6.0/debian/file-roller.1 file-roller-3.6.3/debian/file-roller.1 --- file-roller-3.6.0/debian/file-roller.1 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/file-roller.1 2012-12-06 10:46:05.000000000 +0000 @@ -45,7 +45,7 @@ Extract archives using the archive name as destination folder and quit the program .TP .B \-\-default\-dir=FOLDER -Default folder to use for the '--add' and '--extract' commands +Default folder to use for the '\-\-add' and '\-\-extract' commands .TP .B \-\-force Create destination folder without asking confirmation diff -Nru file-roller-3.6.0/debian/patches/01_package_names.patch file-roller-3.6.3/debian/patches/01_package_names.patch --- file-roller-3.6.0/debian/patches/01_package_names.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/01_package_names.patch 2012-12-06 10:46:05.000000000 +0000 @@ -1,8 +1,9 @@ -Index: file-roller-3.2.1/data/packages.match -=================================================================== ---- file-roller-3.2.1.orig/data/packages.match 2011-11-13 22:16:29.224463195 +0100 -+++ file-roller-3.2.1/data/packages.match 2011-11-13 22:29:40.556431917 +0100 -@@ -15,7 +15,7 @@ +Description: Fix PackageKit package name matches for xz and rpm files. +Author: Jordi Mallach + +--- a/data/packages.match ++++ b/data/packages.match +@@ -16,16 +16,16 @@ p7zip-full= p7zip-rar= rar= @@ -11,7 +12,9 @@ rzip= tar= unace= -@@ -23,7 +23,7 @@ + unalz= +-unarchiver= ++unarchiver=unar unrar= unstaff= unzip= diff -Nru file-roller-3.6.0/debian/patches/99_ltmain_as-needed.patch file-roller-3.6.3/debian/patches/99_ltmain_as-needed.patch --- file-roller-3.6.0/debian/patches/99_ltmain_as-needed.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/99_ltmain_as-needed.patch 2012-12-06 10:46:05.000000000 +0000 @@ -1,10 +1,8 @@ Bug-Debian: http://bugs.debian.org/347650 Last-Update: 2011-06-14 -Index: file-roller-3.3.92/ltmain.sh -=================================================================== ---- file-roller-3.3.92.orig/ltmain.sh 2012-03-20 00:21:26.000000000 +0100 -+++ file-roller-3.3.92/ltmain.sh 2012-03-20 07:34:47.462360486 +0100 +--- a/ltmain.sh ++++ b/ltmain.sh @@ -5800,6 +5800,11 @@ arg=$func_stripname_result ;; diff -Nru file-roller-3.6.0/debian/patches/git_add_files_i386.patch file-roller-3.6.3/debian/patches/git_add_files_i386.patch --- file-roller-3.6.0/debian/patches/git_add_files_i386.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_add_files_i386.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,35 +0,0 @@ -From 1730f40db566e8ccf9a63861fb05f435105d7809 Mon Sep 17 00:00:00 2001 -From: Mitsuya Shibata -Date: Sat, 29 Sep 2012 07:26:58 +0000 -Subject: "Add Files" dialog crashes on i386 architecture - -Modified Order store GTimeVal.tv_sec[1]. GTimeVal.tv_sec is glong, -but ui file[2] specify size as gint64. Therefore no problem on 64bit, -on the other hand raise SEGV on 32bit by memory address boundary -problem. - -Finally invalid address which is index of GtkListStore is passed -to g_strdup() as memory address. - -This patch set same size storead size and allocated size. - -[1] see calling gtk_list_store_set() at get_folder_content_done_cb() - in src/fr-file-selector-dialog.c -[2] src/ui/file-selector.ui:296 ---- -diff --git a/src/ui/file-selector.ui b/src/ui/file-selector.ui -index 5241e36..fd0f2c0 100644 ---- a/src/ui/file-selector.ui -+++ b/src/ui/file-selector.ui -@@ -293,7 +293,7 @@ - - - -- -+ - - - --- -cgit v0.9.0.2 - diff -Nru file-roller-3.6.0/debian/patches/git_correct_location.patch file-roller-3.6.3/debian/patches/git_correct_location.patch --- file-roller-3.6.0/debian/patches/git_correct_location.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_correct_location.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,29 +0,0 @@ -From 1c4d7016f83088591625a4b8ab457ffd1b6ffcc6 Mon Sep 17 00:00:00 2001 -From: Mitsuya Shibata -Date: Thu, 27 Sep 2012 18:31:26 +0000 -Subject: Adding file to archive, file-roller doesn't load location correctly - ---- -diff --git a/src/dlg-add.c b/src/dlg-add.c -index 8e6cb9a..547c046 100644 ---- a/src/dlg-add.c -+++ b/src/dlg-add.c -@@ -412,12 +412,13 @@ dlg_add_folder_load_last_options (DialogData *data) - char *exclude_folders = NULL; - gboolean update; - gboolean no_follow_symlinks; -- GFile *folder; -+ GFile *folder = NULL; - int i; - - base_dir = g_settings_get_string (data->settings, PREF_ADD_CURRENT_FOLDER); - uris = g_settings_get_strv (data->settings, PREF_ADD_SELECTED_FILES); -- folder = g_file_new_for_uri (base_dir); -+ if (g_strcmp0 (base_dir, "") != 0) -+ folder = g_file_new_for_uri (base_dir); - include_files = g_settings_get_string (data->settings, PREF_ADD_INCLUDE_FILES); - exclude_files = g_settings_get_string (data->settings, PREF_ADD_EXCLUDE_FILES); - exclude_folders = g_settings_get_string (data->settings, PREF_ADD_EXCLUDE_FOLDERS); --- -cgit v0.9.0.2 - diff -Nru file-roller-3.6.0/debian/patches/git_fix_encrypted_archive.patch file-roller-3.6.3/debian/patches/git_fix_encrypted_archive.patch --- file-roller-3.6.0/debian/patches/git_fix_encrypted_archive.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_fix_encrypted_archive.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,26 +0,0 @@ -From 35cb0b440fc5613d4cb6b51bfc3c873d283ed413 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Tue, 02 Oct 2012 18:38:51 +0000 -Subject: Compress dialog: fixed creation of encrypted archives - -[fixed bug] ---- -diff --git a/src/dlg-batch-add.c b/src/dlg-batch-add.c -index bc96fe4..3c82c7f 100644 ---- a/src/dlg-batch-add.c -+++ b/src/dlg-batch-add.c -@@ -43,7 +43,11 @@ dialog_response_cb (GtkDialog *dialog, - if (file == NULL) - return; - -+ fr_window_set_password (window, fr_new_archive_dialog_get_password (FR_NEW_ARCHIVE_DIALOG (dialog))); -+ fr_window_set_encrypt_header (window, fr_new_archive_dialog_get_encrypt_header (FR_NEW_ARCHIVE_DIALOG (dialog))); -+ fr_window_set_volume_size (window, fr_new_archive_dialog_get_volume_size (FR_NEW_ARCHIVE_DIALOG (dialog))); - fr_window_create_archive_and_continue (window, file, mime_type, NULL); -+ - g_object_unref (file); - } - else --- -cgit v0.9.0.2 - diff -Nru file-roller-3.6.0/debian/patches/git_handle_cab.patch file-roller-3.6.3/debian/patches/git_handle_cab.patch --- file-roller-3.6.0/debian/patches/git_handle_cab.patch 1970-01-01 00:00:00.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_handle_cab.patch 2012-12-06 10:46:05.000000000 +0000 @@ -0,0 +1,23 @@ +From c9b2bef7fb1526992e6d709f04cfd9306e0cfc77 Mon Sep 17 00:00:00 2001 +From: Mantas Kriaučiūnas +Date: Wed, 28 Nov 2012 14:58:20 +0000 +Subject: Add Microsoft Cabinet to the supported mime types + +[bug #689205] +--- +diff --git a/data/file-roller.desktop.in.in b/data/file-roller.desktop.in.in +index 8ae10d9..4298805 100644 +--- a/data/file-roller.desktop.in.in ++++ b/data/file-roller.desktop.in.in +@@ -9,7 +9,7 @@ Terminal=false + Type=Application + Icon=file-roller + Categories=GTK;GNOME;Utility;Archiving;Compression; +-MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive; ++MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-ar;application/x-arj;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/x-deb;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lhz;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/zip;application/x-archive;application/vnd.ms-cab-compressed; + X-GNOME-DocPath=file-roller/file-roller.xml + X-GNOME-Bugzilla-Bugzilla=GNOME + X-GNOME-Bugzilla-Product=file-roller +-- +cgit v0.9.0.2 + diff -Nru file-roller-3.6.0/debian/patches/git_ignore_theme_change.patch file-roller-3.6.3/debian/patches/git_ignore_theme_change.patch --- file-roller-3.6.0/debian/patches/git_ignore_theme_change.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_ignore_theme_change.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -From 5c37b1b0a0945a60b62492cf0deb0a9f4499038d Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Fri, 28 Sep 2012 10:59:03 +0000 -Subject: ignore the theme changed signals while creating the file list - ---- -diff --git a/src/fr-window.c b/src/fr-window.c -index 324f433..f1edda9 100644 ---- a/src/fr-window.c -+++ b/src/fr-window.c -@@ -314,6 +314,7 @@ struct _FrWindowPrivate { - gboolean stoppable; - gboolean closing; - gboolean notify; -+ gboolean populating_file_list; - - FrClipboardData *clipboard_data; - FrClipboardData *copy_data; -@@ -824,6 +825,7 @@ fr_window_init (FrWindow *window) - window->priv->cancellable = g_cancellable_new (); - window->priv->compression = FR_COMPRESSION_NORMAL; - window->priv->window_group = gtk_window_group_new (); -+ window->priv->populating_file_list = FALSE; - gtk_window_group_add_window (window->priv->window_group, GTK_WINDOW (window)); - - window->archive = NULL; -@@ -1531,6 +1533,7 @@ fr_window_populate_file_list (FrWindow *window, - return; - } - -+ window->priv->populating_file_list = TRUE; - gtk_list_store_clear (window->priv->list_store); - - gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (window->priv->list_store), -@@ -1626,6 +1629,8 @@ fr_window_populate_file_list (FrWindow *window, - sort_column_id, - order); - -+ window->priv->populating_file_list = FALSE; -+ - _fr_window_stop_activity_mode (window); - } - -@@ -5048,6 +5053,9 @@ static void - theme_changed_cb (GtkIconTheme *theme, - FrWindow *window) - { -+ if (window->priv->populating_file_list) -+ return; -+ - gth_icon_cache_clear (window->priv->list_icon_cache); - gth_icon_cache_clear (window->priv->tree_icon_cache); - --- -cgit v0.9.0.2 - diff -Nru file-roller-3.6.0/debian/patches/git_installer_segfault.patch file-roller-3.6.3/debian/patches/git_installer_segfault.patch --- file-roller-3.6.0/debian/patches/git_installer_segfault.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_installer_segfault.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,694 +0,0 @@ -From b1455f95c65b81cb0027af4ffb9b2586a86c2bcb Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Fri, 28 Sep 2012 09:34:16 +0000 -Subject: fixed crash when the package installer is activated - -[bug #684941] ---- -diff --git a/src/dlg-package-installer.c b/src/dlg-package-installer.c -index 4f4e281..6fa8b4c 100644 ---- a/src/dlg-package-installer.c -+++ b/src/dlg-package-installer.c -@@ -25,23 +25,28 @@ - #include - #include - #include "dlg-package-installer.h" -+#include "gio-utils.h" -+#include "glib-utils.h" - #include "gtk-utils.h" - #include "fr-init.h" - - -+#define BUFFER_SIZE_FOR_PRELOAD 32 -+ -+ - typedef struct { -- FrWindow *window; -- FrArchive *archive; -- FrAction action; -- const char *packages; -+ FrWindow *window; -+ FrAction action; -+ GCancellable *cancellable; -+ const char *packages; - } InstallerData; - - - static void - installer_data_free (InstallerData *idata) - { -- g_object_unref (idata->archive); - g_object_unref (idata->window); -+ _g_object_ref (idata->cancellable); - g_free (idata); - } - -@@ -159,7 +164,7 @@ install_packages (InstallerData *idata) - GDBusConnection *connection; - GError *error = NULL; - -- connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); -+ connection = g_bus_get_sync (G_BUS_TYPE_SESSION, idata->cancellable, &error); - if (connection != NULL) { - GdkWindow *window; - GDBusProxy *proxy; -@@ -180,7 +185,7 @@ install_packages (InstallerData *idata) - "org.freedesktop.PackageKit", - "/org/freedesktop/PackageKit", - "org.freedesktop.PackageKit.Modify", -- NULL, -+ idata->cancellable, - &error); - - if (proxy != NULL) { -@@ -204,7 +209,7 @@ install_packages (InstallerData *idata) - "hide-confirm-search,hide-finished,hide-warning"), - G_DBUS_CALL_FLAGS_NONE, - G_MAXINT, -- NULL, -+ idata->cancellable, - packagekit_install_package_names_ready_cb, - idata); - -@@ -248,30 +253,50 @@ confirm_search_dialog_response_cb (GtkDialog *dialog, - #endif /* ENABLE_PACKAGEKIT */ - - --void --dlg_package_installer (FrWindow *window, -- FrArchive *archive, -- FrAction action) -+static void -+file_buffer_ready_cb (GObject *source_object, -+ GAsyncResult *result, -+ gpointer user_data) - { -- InstallerData *idata; -- GType archive_type; -- FrArchive *preferred_archive; -+ InstallerData *idata = user_data; -+ GFile *file; -+ char *buffer; -+ gsize buffer_size; -+ GError *error = NULL; -+ char *uri; -+ const char *mime_type; -+ gboolean result_uncertain; -+ GType archive_type; -+ FrArchive *preferred_archive; -+ -+ file = G_FILE (source_object); -+ if (! _g_file_load_buffer_finish (file, result, &buffer, &buffer_size, &error)) { -+ package_installer_terminated (idata, FR_ERROR_GENERIC, error->message); -+ g_error_free (error); -+ return; -+ } - -- idata = g_new0 (InstallerData, 1); -- idata->window = g_object_ref (window); -- idata->archive = g_object_ref (archive); -- idata->action = action; -+ uri = g_file_get_uri (file); -+ mime_type = g_content_type_guess (uri, (guchar *) buffer, buffer_size, &result_uncertain); -+ if (result_uncertain) { -+ mime_type = _g_mime_type_get_from_content (buffer, buffer_size); -+ if (mime_type == NULL) -+ mime_type = _g_mime_type_get_from_filename (file); -+ } - -- archive_type = get_preferred_archive_for_mime_type (idata->archive->mime_type, FR_ARCHIVE_CAN_READ_WRITE); -+ g_free (uri); -+ g_free (buffer); -+ -+ archive_type = get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ_WRITE); - if (archive_type == 0) -- archive_type = get_preferred_archive_for_mime_type (idata->archive->mime_type, FR_ARCHIVE_CAN_READ); -+ archive_type = get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ); - if (archive_type == 0) { - package_installer_terminated (idata, FR_ERROR_GENERIC, _("Archive type not supported.")); - return; - } - - preferred_archive = g_object_new (archive_type, 0); -- idata->packages = fr_archive_get_packages (preferred_archive, idata->archive->mime_type); -+ idata->packages = fr_archive_get_packages (preferred_archive, mime_type); - g_object_unref (preferred_archive); - - if (idata->packages == NULL) { -@@ -286,7 +311,7 @@ dlg_package_installer (FrWindow *window, - GtkWidget *dialog; - - secondary_text = g_strdup_printf (_("There is no command installed for %s files.\nDo you want to search for a command to open this file?"), -- g_content_type_get_description (idata->archive->mime_type)); -+ g_content_type_get_description (mime_type)); - dialog = _gtk_message_dialog_new (GTK_WINDOW (idata->window), - GTK_DIALOG_MODAL, - GTK_STOCK_DIALOG_ERROR, -@@ -307,3 +332,24 @@ dlg_package_installer (FrWindow *window, - - #endif /* ENABLE_PACKAGEKIT */ - } -+ -+ -+void -+dlg_package_installer (FrWindow *window, -+ GFile *file, -+ FrAction action, -+ GCancellable *cancellable) -+{ -+ InstallerData *idata; -+ -+ idata = g_new0 (InstallerData, 1); -+ idata->window = g_object_ref (window); -+ idata->action = action; -+ idata->cancellable = _g_object_ref (cancellable); -+ -+ _g_file_load_buffer_async (file, -+ BUFFER_SIZE_FOR_PRELOAD, -+ cancellable, -+ file_buffer_ready_cb, -+ idata); -+} -diff --git a/src/dlg-package-installer.h b/src/dlg-package-installer.h -index 16405f4..c82ec0a 100644 ---- a/src/dlg-package-installer.h -+++ b/src/dlg-package-installer.h -@@ -24,8 +24,9 @@ - - #include "fr-window.h" - --void dlg_package_installer (FrWindow *window, -- FrArchive *archive, -- FrAction action); -+void dlg_package_installer (FrWindow *window, -+ GFile *file, -+ FrAction action, -+ GCancellable *cancellable); - - #endif /* DLG_PACKAGE_INSTALLER_H */ -diff --git a/src/fr-archive.c b/src/fr-archive.c -index 25f09fc..c44be18 100644 ---- a/src/fr-archive.c -+++ b/src/fr-archive.c -@@ -547,24 +547,6 @@ fr_archive_set_stoppable (FrArchive *archive, - /* -- fr_archive_new_for_creating -- */ - - --static const char * --get_mime_type_from_filename (GFile *file) --{ -- const char *mime_type = NULL; -- char *uri; -- -- if (file == NULL) -- return NULL; -- -- uri = g_file_get_uri (file); -- mime_type = get_mime_type_from_extension (_g_filename_get_extension (uri)); -- -- g_free (uri); -- -- return mime_type; --} -- -- - static FrArchive * - create_archive_for_mime_type (GType archive_type, - GFile *file, -@@ -599,7 +581,7 @@ fr_archive_create (GFile *file, - GFile *parent; - - if (mime_type == NULL) -- mime_type = get_mime_type_from_filename (file); -+ mime_type = _g_mime_type_get_from_filename (file); - archive_type = get_archive_type_from_mime_type (mime_type, FR_ARCHIVE_CAN_WRITE); - - archive = create_archive_for_mime_type (archive_type, -@@ -659,75 +641,6 @@ open_data_complete_with_error (OpenData *load_data, - } - - --static const char * --get_mime_type_from_magic_numbers (char *buffer, -- gsize buffer_size) --{ --#if ENABLE_MAGIC -- -- static magic_t magic = NULL; -- -- if (magic == NULL) { -- magic = magic_open (MAGIC_MIME_TYPE); -- if (magic != NULL) -- magic_load (magic, NULL); -- else -- g_warning ("unable to open magic database"); -- } -- -- if (magic != NULL) { -- const char * mime_type; -- -- mime_type = magic_buffer (magic, buffer, buffer_size); -- if (mime_type) -- return mime_type; -- -- g_warning ("unable to detect filetype from magic: %s", magic_error (magic)); -- } -- --#else -- -- static const struct magic { -- const unsigned int off; -- const unsigned int len; -- const char * const id; -- const char * const mime_type; -- } -- magic_ids [] = { -- /* magic ids taken from magic/Magdir/archive from the file-4.21 tarball */ -- { 0, 6, "7z\274\257\047\034", "application/x-7z-compressed" }, -- { 7, 7, "**ACE**", "application/x-ace" }, -- { 0, 2, "\x60\xea", "application/x-arj" }, -- { 0, 3, "BZh", "application/x-bzip2" }, -- { 0, 2, "\037\213", "application/x-gzip" }, -- { 0, 4, "LZIP", "application/x-lzip" }, -- { 0, 9, "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a", "application/x-lzop", }, -- { 0, 4, "Rar!", "application/x-rar" }, -- { 0, 4, "RZIP", "application/x-rzip" }, -- { 0, 6, "\3757zXZ\000", "application/x-xz" }, -- { 20, 4, "\xdc\xa7\xc4\xfd", "application/x-zoo", }, -- { 0, 4, "PK\003\004", "application/zip" }, -- { 0, 8, "PK00PK\003\004", "application/zip" }, -- { 0, 4, "LRZI", "application/x-lrzip" }, -- }; -- -- int i; -- -- for (i = 0; i < G_N_ELEMENTS (magic_ids); i++) { -- const struct magic * const magic = &magic_ids[i]; -- -- if ((magic->off + magic->len) > buffer_size) -- g_warning ("buffer underrun for mime-type '%s' magic", magic->mime_type); -- else if (! memcmp (buffer + magic->off, magic->id, magic->len)) -- return magic->mime_type; -- } -- --#endif -- -- return NULL; --} -- -- - static FrArchive * - create_archive_to_load_archive (GFile *file, - const char *mime_type) -@@ -808,10 +721,10 @@ open_archive_stream_ready_cb (GObject *source_object, - archive = create_archive_to_load_archive (open_data->file, mime_type); - } - if (archive == NULL) { -- mime_type = get_mime_type_from_magic_numbers (open_data->buffer, open_data->buffer_size); -+ mime_type = _g_mime_type_get_from_content (open_data->buffer, open_data->buffer_size); - archive = create_archive_to_load_archive (open_data->file, mime_type); - if (archive == NULL) { -- mime_type = get_mime_type_from_filename (open_data->file); -+ mime_type = _g_mime_type_get_from_filename (open_data->file); - archive = create_archive_to_load_archive (open_data->file, mime_type); - if (archive == NULL) { - error = g_error_new_literal (FR_ERROR, -@@ -2250,9 +2163,9 @@ _g_file_is_archive (GFile *file) - uri = g_file_get_uri (file); - mime_type = g_content_type_guess (uri, (guchar *) buffer, buffer_size, &result_uncertain); - if (result_uncertain) { -- mime_type = get_mime_type_from_magic_numbers (buffer, buffer_size); -+ mime_type = _g_mime_type_get_from_content (buffer, buffer_size); - if (mime_type == NULL) -- mime_type = get_mime_type_from_filename (file); -+ mime_type = _g_mime_type_get_from_filename (file); - } - - if (mime_type != NULL) { -diff --git a/src/fr-init.c b/src/fr-init.c -index 8f0d022..f4a7c83 100644 ---- a/src/fr-init.c -+++ b/src/fr-init.c -@@ -447,7 +447,7 @@ update_registered_archives_capabilities (void) - - - const char * --get_mime_type_from_extension (const char *ext) -+_g_mime_type_get_from_extension (const char *ext) - { - int i; - -@@ -466,6 +466,24 @@ get_mime_type_from_extension (const char *ext) - - - const char * -+_g_mime_type_get_from_filename (GFile *file) -+{ -+ const char *mime_type = NULL; -+ char *uri; -+ -+ if (file == NULL) -+ return NULL; -+ -+ uri = g_file_get_uri (file); -+ mime_type = _g_mime_type_get_from_extension (_g_filename_get_extension (uri)); -+ -+ g_free (uri); -+ -+ return mime_type; -+} -+ -+ -+const char * - get_archive_filename_extension (const char *filename) - { - const char *ext; -diff --git a/src/fr-init.h b/src/fr-init.h -index 1e88458..0de0c7c 100644 ---- a/src/fr-init.h -+++ b/src/fr-init.h -@@ -62,7 +62,8 @@ GType get_archive_type_from_mime_type (const char *mime_type, - GType get_preferred_archive_for_mime_type (const char *mime_type, - FrArchiveCaps requested_capabilities); - void update_registered_archives_capabilities (void); --const char * get_mime_type_from_extension (const char *ext); -+const char * _g_mime_type_get_from_extension (const char *ext); -+const char * _g_mime_type_get_from_filename (GFile *file); - const char * get_archive_filename_extension (const char *uri); - int get_mime_type_index (const char *mime_type); - void sort_mime_types_by_extension (int *a); -diff --git a/src/fr-window.c b/src/fr-window.c -index e6f54a4..856e8d0 100644 ---- a/src/fr-window.c -+++ b/src/fr-window.c -@@ -2776,7 +2776,10 @@ _handle_archive_operation_error (FrWindow *window, - - case FR_ERROR_UNSUPPORTED_FORMAT: - close_progress_dialog (window, TRUE); -- dlg_package_installer (window, archive, action); -+ dlg_package_installer (window, -+ window->priv->archive_file, -+ action, -+ window->priv->cancellable); - if (opens_dialog) *opens_dialog = TRUE; - break; - -diff --git a/src/gio-utils.c b/src/gio-utils.c -index 1fd7a21..f8452f1 100644 ---- a/src/gio-utils.c -+++ b/src/gio-utils.c -@@ -1306,3 +1306,179 @@ g_load_file_in_buffer (GFile *file, - return (n >= 0); - } - -+ -+/* -- _g_file_load_buffer_async -- */ -+ -+ -+#define MAX_BUFFER_SIZE_FOR_TMP_BUFFER 4096 -+ -+ -+typedef struct { -+ GFile *file; -+ GCancellable *cancellable; -+ GSimpleAsyncResult *result; -+ gsize requested_buffer_size; -+ char *buffer; -+ gchar *tmp_buffer; -+ gsize tmp_buffer_size; -+ GInputStream *stream; -+ gsize buffer_size; -+} LoadBufferData; -+ -+ -+static void -+load_buffer_data_free (LoadBufferData *load_data) -+{ -+ _g_object_unref (load_data->file); -+ _g_object_unref (load_data->cancellable); -+ _g_object_unref (load_data->result); -+ g_free (load_data->buffer); -+ g_free (load_data->tmp_buffer); -+ _g_object_unref (load_data->stream); -+ g_free (load_data); -+} -+ -+ -+static void -+load_buffer_data_complete_with_error (LoadBufferData *load_data, -+ GError *error) -+{ -+ GSimpleAsyncResult *result; -+ -+ result = g_object_ref (load_data->result); -+ g_simple_async_result_set_from_error (result, error); -+ g_simple_async_result_complete_in_idle (result); -+ -+ g_object_unref (result); -+} -+ -+ -+static void -+load_buffer_stream_read_ready_cb (GObject *source_object, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ LoadBufferData *load_data = user_data; -+ GError *error = NULL; -+ gssize count; -+ -+ count = g_input_stream_read_finish (load_data->stream, result, &error); -+ if (count < 0) { -+ load_buffer_data_complete_with_error (load_data, error); -+ return; -+ } -+ -+ if (count > 0) { -+ load_data->buffer = g_realloc (load_data->buffer, load_data->buffer_size + count + 1); -+ memcpy (load_data->buffer + load_data->buffer_size, load_data->tmp_buffer, count); -+ load_data->buffer_size += count; -+ } -+ -+ if ((count == 0) || ((load_data->requested_buffer_size > 0) && (load_data->buffer_size >= load_data->requested_buffer_size))) { -+ if (load_data->buffer != NULL) -+ ((char *)load_data->buffer)[load_data->buffer_size] = 0; -+ g_simple_async_result_complete_in_idle (load_data->result); -+ return; -+ } -+ -+ g_input_stream_read_async (load_data->stream, -+ load_data->tmp_buffer, -+ load_data->tmp_buffer_size, -+ G_PRIORITY_DEFAULT, -+ load_data->cancellable, -+ load_buffer_stream_read_ready_cb, -+ load_data); -+} -+ -+ -+static void -+load_buffer_read_ready_cb (GObject *source_object, -+ GAsyncResult *result, -+ gpointer user_data) -+{ -+ LoadBufferData *load_data = user_data; -+ GError *error = NULL; -+ -+ load_data->stream = (GInputStream *) g_file_read_finish (G_FILE (source_object), result, &error); -+ if (load_data->stream == NULL) { -+ load_buffer_data_complete_with_error (load_data, error); -+ return; -+ } -+ -+ g_input_stream_read_async (load_data->stream, -+ load_data->tmp_buffer, -+ load_data->tmp_buffer_size, -+ G_PRIORITY_DEFAULT, -+ load_data->cancellable, -+ load_buffer_stream_read_ready_cb, -+ load_data); -+} -+ -+ -+void -+_g_file_load_buffer_async (GFile *file, -+ gsize requested_size, -+ GCancellable *cancellable, -+ GAsyncReadyCallback callback, -+ gpointer user_data) -+{ -+ LoadBufferData *load_data; -+ -+ g_return_if_fail (file != NULL); -+ -+ load_data = g_new0 (LoadBufferData, 1); -+ load_data->file = g_object_ref (file); -+ load_data->cancellable = _g_object_ref (cancellable); -+ load_data->result = g_simple_async_result_new (G_OBJECT (file), -+ callback, -+ user_data, -+ _g_file_load_buffer_async); -+ load_data->requested_buffer_size = requested_size; -+ load_data->buffer = NULL; -+ load_data->buffer_size = 0; -+ if ((requested_size > 0) && (requested_size < MAX_BUFFER_SIZE_FOR_TMP_BUFFER)) -+ load_data->tmp_buffer_size = requested_size; -+ else -+ load_data->tmp_buffer_size = MAX_BUFFER_SIZE_FOR_TMP_BUFFER; -+ load_data->tmp_buffer = g_new (char, load_data->tmp_buffer_size); -+ g_simple_async_result_set_op_res_gpointer (load_data->result, -+ load_data, -+ (GDestroyNotify) load_buffer_data_free); -+ -+ /* load a few bytes to guess the archive type */ -+ -+ g_file_read_async (load_data->file, -+ G_PRIORITY_DEFAULT, -+ load_data->cancellable, -+ load_buffer_read_ready_cb, -+ load_data); -+} -+ -+ -+gboolean -+_g_file_load_buffer_finish (GFile *file, -+ GAsyncResult *result, -+ char **buffer, -+ gsize *buffer_size, -+ GError **error) -+{ -+ GSimpleAsyncResult *simple; -+ LoadBufferData *load_data; -+ -+ g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (file), _g_file_load_buffer_async), FALSE); -+ -+ simple = G_SIMPLE_ASYNC_RESULT (result); -+ -+ if (g_simple_async_result_propagate_error (simple, error)) -+ return FALSE; -+ -+ load_data = g_simple_async_result_get_op_res_gpointer (simple); -+ if (buffer != NULL) { -+ *buffer = load_data->buffer; -+ load_data->buffer = NULL; -+ } -+ if (buffer_size != NULL) -+ *buffer_size = load_data->buffer_size; -+ -+ return TRUE; -+} -diff --git a/src/gio-utils.h b/src/gio-utils.h -index ee363af..f784c41 100644 ---- a/src/gio-utils.h -+++ b/src/gio-utils.h -@@ -167,5 +167,15 @@ gboolean g_load_file_in_buffer (GFile *file, - void *buffer, - gsize size, - GError **error); -+void _g_file_load_buffer_async (GFile *file, -+ gsize requested_size, -+ GCancellable *cancellable, -+ GAsyncReadyCallback callback, -+ gpointer user_data); -+gboolean _g_file_load_buffer_finish (GFile *file, -+ GAsyncResult *result, -+ char **buffer, -+ gsize *buffer_size, -+ GError **error); - - #endif /* _GIO_UTILS_H */ -diff --git a/src/glib-utils.c b/src/glib-utils.c -index 8affc97..119edf4 100644 ---- a/src/glib-utils.c -+++ b/src/glib-utils.c -@@ -1078,6 +1078,75 @@ _g_mime_type_matches (const char *mime_type, - } - - -+const char * -+_g_mime_type_get_from_content (char *buffer, -+ gsize buffer_size) -+{ -+#if ENABLE_MAGIC -+ -+ static magic_t magic = NULL; -+ -+ if (magic == NULL) { -+ magic = magic_open (MAGIC_MIME_TYPE); -+ if (magic != NULL) -+ magic_load (magic, NULL); -+ else -+ g_warning ("unable to open magic database"); -+ } -+ -+ if (magic != NULL) { -+ const char * mime_type; -+ -+ mime_type = magic_buffer (magic, buffer, buffer_size); -+ if (mime_type) -+ return mime_type; -+ -+ g_warning ("unable to detect filetype from magic: %s", magic_error (magic)); -+ } -+ -+#else -+ -+ static const struct magic { -+ const unsigned int off; -+ const unsigned int len; -+ const char * const id; -+ const char * const mime_type; -+ } -+ magic_ids [] = { -+ /* magic ids taken from magic/Magdir/archive from the file-4.21 tarball */ -+ { 0, 6, "7z\274\257\047\034", "application/x-7z-compressed" }, -+ { 7, 7, "**ACE**", "application/x-ace" }, -+ { 0, 2, "\x60\xea", "application/x-arj" }, -+ { 0, 3, "BZh", "application/x-bzip2" }, -+ { 0, 2, "\037\213", "application/x-gzip" }, -+ { 0, 4, "LZIP", "application/x-lzip" }, -+ { 0, 9, "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a", "application/x-lzop", }, -+ { 0, 4, "Rar!", "application/x-rar" }, -+ { 0, 4, "RZIP", "application/x-rzip" }, -+ { 0, 6, "\3757zXZ\000", "application/x-xz" }, -+ { 20, 4, "\xdc\xa7\xc4\xfd", "application/x-zoo", }, -+ { 0, 4, "PK\003\004", "application/zip" }, -+ { 0, 8, "PK00PK\003\004", "application/zip" }, -+ { 0, 4, "LRZI", "application/x-lrzip" }, -+ }; -+ -+ int i; -+ -+ for (i = 0; i < G_N_ELEMENTS (magic_ids); i++) { -+ const struct magic * const magic = &magic_ids[i]; -+ -+ if ((magic->off + magic->len) > buffer_size) -+ g_warning ("buffer underrun for mime-type '%s' magic", magic->mime_type); -+ else if (! memcmp (buffer + magic->off, magic->id, magic->len)) -+ return magic->mime_type; -+ } -+ -+#endif -+ -+ return NULL; -+} -+ -+ - /* GFile */ - - -diff --git a/src/glib-utils.h b/src/glib-utils.h -index a69bc74..c409ea1 100644 ---- a/src/glib-utils.h -+++ b/src/glib-utils.h -@@ -146,6 +146,8 @@ char * _g_filename_get_random (int random_ - const char *suffix); - gboolean _g_mime_type_matches (const char *type, - const char *pattern); -+const char * _g_mime_type_get_from_content (char *buffer, -+ gsize buffer_size); - - /* GFile */ - --- -cgit v0.9.0.2 diff -Nru file-roller-3.6.0/debian/patches/git_multi_file_segfault.patch file-roller-3.6.3/debian/patches/git_multi_file_segfault.patch --- file-roller-3.6.0/debian/patches/git_multi_file_segfault.patch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/git_multi_file_segfault.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,69 +0,0 @@ -From 8ab23e584401943be45fc3e4484e34170bd7d0c9 Mon Sep 17 00:00:00 2001 -From: Paolo Bacchilega -Date: Tue, 02 Oct 2012 19:07:30 +0000 -Subject: crash when opening multi-volumes rar archives - -[bug #685314] ---- -diff --git a/src/fr-archive.c b/src/fr-archive.c -index e90ce84..55efebe 100644 ---- a/src/fr-archive.c -+++ b/src/fr-archive.c -@@ -127,7 +127,8 @@ static guint fr_archive_signals[LAST_SIGNAL] = { 0 }; - - static void - _fr_archive_set_file (FrArchive *self, -- GFile *file) -+ GFile *file, -+ gboolean reset_mime_type) - { - if (self->priv->file != NULL) { - g_object_unref (self->priv->file); -@@ -136,7 +137,8 @@ _fr_archive_set_file (FrArchive *self, - if (file != NULL) - self->priv->file = g_object_ref (file); - -- self->mime_type = NULL; -+ if (reset_mime_type) -+ self->mime_type = NULL; - - g_object_notify (G_OBJECT (self), "file"); - } -@@ -149,7 +151,7 @@ _fr_archive_set_uri (FrArchive *self, - GFile *file; - - file = (uri != NULL) ? g_file_new_for_uri (uri) : NULL; -- _fr_archive_set_file (self, file); -+ _fr_archive_set_file (self, file, TRUE); - - _g_object_unref (file); - } -@@ -167,7 +169,7 @@ fr_archive_set_property (GObject *object, - - switch (property_id) { - case PROP_FILE: -- _fr_archive_set_file (self, g_value_get_object (value)); -+ _fr_archive_set_file (self, g_value_get_object (value), TRUE); - break; - case PROP_MIME_TYPE: - fr_archive_set_mime_type (self, g_value_get_string (value)); -@@ -1910,7 +1912,7 @@ fr_archive_set_multi_volume (FrArchive *self, - GFile *file) - { - self->multi_volume = TRUE; -- _fr_archive_set_file (self, file); -+ _fr_archive_set_file (self, file, FALSE); - } - - -@@ -1926,7 +1928,7 @@ fr_archive_change_name (FrArchive *archive, - - parent = g_file_get_parent (archive->priv->file); - file = g_file_get_child (parent, name);; -- _fr_archive_set_file (archive, file); -+ _fr_archive_set_file (archive, file, FALSE); - - g_object_unref (parent); - g_object_unref (file); --- -cgit v0.9.0.2 diff -Nru file-roller-3.6.0/debian/patches/series file-roller-3.6.3/debian/patches/series --- file-roller-3.6.0/debian/patches/series 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/patches/series 2012-12-06 10:46:05.000000000 +0000 @@ -1,8 +1,3 @@ 01_package_names.patch 99_ltmain_as-needed.patch -git_correct_location.patch -git_ignore_theme_change.patch -git_installer_segfault.patch -git_add_files_i386.patch -git_fix_encrypted_archive.patch -git_multi_file_segfault.patch +git_handle_cab.patch diff -Nru file-roller-3.6.0/debian/rules file-roller-3.6.3/debian/rules --- file-roller-3.6.0/debian/rules 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/rules 2012-12-06 10:46:05.000000000 +0000 @@ -1,6 +1,5 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk @@ -16,9 +15,3 @@ binary-install/file-roller:: rm -f debian/file-roller/usr/lib/nautilus/extensions-*/*.a rm -f debian/file-roller/usr/lib/nautilus/extensions-*/*.la - -clean:: - rm -f src/fr-marshal.? src/fr-enum-types.? - if [ -f configure.in ] && [ ! -f gnome-doc-utils.make ]; then \ - cp /usr/share/gnome-doc-utils/gnome-doc-utils.make . ; \ - fi diff -Nru file-roller-3.6.0/debian/watch file-roller-3.6.3/debian/watch --- file-roller-3.6.0/debian/watch 2012-10-05 15:06:01.000000000 +0000 +++ file-roller-3.6.3/debian/watch 2012-12-06 10:46:05.000000000 +0000 @@ -1,2 +1,2 @@ version=3 -http://ftp.gnome.org/pub/gnome/sources/file-roller/([\d\.]+\d)/file-roller-([\d\.]+)\.tar\.xz +http://ftp.gnome.org/pub/gnome/sources/file-roller/([\d\.]+[02468])/file-roller-([\d\.]+)\.tar\.xz diff -Nru file-roller-3.6.0/file-roller.spec file-roller-3.6.3/file-roller.spec --- file-roller-3.6.0/file-roller.spec 2012-09-24 19:09:18.000000000 +0000 +++ file-roller-3.6.3/file-roller.spec 2012-11-27 20:58:40.000000000 +0000 @@ -1,7 +1,7 @@ %define release 6 %define prefix /usr %define name file-roller -%define version 3.6.0 +%define version 3.6.3 Summary: An archive manager for GNOME. Name: %{name} diff -Nru file-roller-3.6.0/help/Makefile.in file-roller-3.6.3/help/Makefile.in --- file-roller-3.6.0/help/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/help/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/help/de/archive-create.page file-roller-3.6.3/help/de/archive-create.page --- file-roller-3.6.0/help/de/archive-create.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/archive-create.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/archive-edit.page file-roller-3.6.3/help/de/archive-edit.page --- file-roller-3.6.0/help/de/archive-edit.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/archive-edit.page 2012-11-27 20:26:56.000000000 +0000 @@ -34,7 +34,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/archive-extract-advanced-options.page file-roller-3.6.3/help/de/archive-extract-advanced-options.page --- file-roller-3.6.0/help/de/archive-extract-advanced-options.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/archive-extract-advanced-options.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 @@ -65,11 +65,11 @@

Im Dateiwählerdialog können Sie Folgendes angeben:

- <gui>Keep directory structure</gui> + <gui>Ordnerstruktur erhalten</gui>

Aktivieren Sie diese Option, wenn Sie die Ordnerstruktur erhalten wollen, so wie sie in Ihrem Archiv vorhanden ist.

 - <gui>Do not overwrite newer files</gui> + <gui>Neuere Dateien nicht überschreiben</gui>

Diese Option sorgt dafür, dass keine vorhandenen Dateien gleichen Namens überschrieben werden, die laut Änderungszeitpunkt neuer sind als jene im Archiv.

 diff -Nru file-roller-3.6.0/help/de/archive-extract.page file-roller-3.6.3/help/de/archive-extract.page --- file-roller-3.6.0/help/de/archive-extract.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/archive-extract.page 2012-11-27 20:26:56.000000000 +0000 @@ -36,7 +36,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/archive-open.page file-roller-3.6.3/help/de/archive-open.page --- file-roller-3.6.0/help/de/archive-open.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/archive-open.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/archive-view.page file-roller-3.6.3/help/de/archive-view.page --- file-roller-3.6.0/help/de/archive-view.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/archive-view.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/de.po file-roller-3.6.3/help/de/de.po --- file-roller-3.6.0/help/de/de.po 2012-09-03 18:34:24.000000000 +0000 +++ file-roller-3.6.3/help/de/de.po 2012-11-12 18:50:38.000000000 +0000 @@ -1,22 +1,23 @@ # German translation of the file-roller manual. # Jan Arne Petersen , 2006. # Mario Blättermann , 2008, 2009, 2011, 2012. -# Christian Kirbach , 2011. +# Christian Kirbach , 2011, 2012. # msgid "" msgstr "" "Project-Id-Version: file-roller help master\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-08-09 21:35+0000\n" -"PO-Revision-Date: 2012-09-02 19:48+0100\n" -"Last-Translator: Mario Blättermann \n" -"Language-Team: German \n" +"POT-Creation-Date: 2012-10-04 11:06+0000\n" +"PO-Revision-Date: 2012-10-06 09:42+0200\n" +"Last-Translator: Christian Kirbach \n" +"Language-Team: Deutsch \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "X-Poedit-Language: German\n" "X-Poedit-Country: GERMANY\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" #: C/index.page:5(page/title) msgid "Archive Manager Help" @@ -40,7 +41,7 @@ msgstr "" "Jan Arne Petersen , 2006\n" "Mario Blättermann , 2008, 2009, 2011, 2012\n" -"Christian Kirbach , 2011" +"Christian Kirbach , 2011, 2012" #: C/archive-create.page:10(credit/name) C/archive-edit.page:11(credit/name) #: C/archive-extract.page:13(credit/name) @@ -92,7 +93,8 @@ #: C/archive-create.page:25(page/p) msgid "" -"Create a new archive with Archive Manager by following these steps:" +"Create a new archive with Archive Manager by following these " +"steps:" msgstr "" "Erstellen Sie ein neues Archiv mit dem Archivmanager wie folgt:" @@ -132,18 +134,19 @@ "and specifying the volume for each part in MB." msgstr "" "Durch Anklicken von Erweiterte Einstellungen können Sie ein " -"Passwort festlegen oder Ihr neues Archiv in ḱleinere Dateien zerlegen. Wählen " -"Sie hierzu die entsprechende Option aus und geben Sie die Größe für jeden " -"Teil in MB an." +"Passwort festlegen oder Ihr neues Archiv in ḱleinere Dateien zerlegen. " +"Wählen Sie hierzu die entsprechende Option aus und geben Sie die Größe für " +"jeden Teil in MB an." #: C/archive-create.page:49(item/p) msgid "" "Add the desired files to your archive by clicking the Add files to the " "archive toolbar button, or by clicking Edit Add files. Archive " -"Manager also allows you to add whole folders by clicking the Add a " -"folder to the archive toolbar button, or selecting Edit Add a folder." +"Manager also allows you to add whole folders by clicking the Add " +"a folder to the archive toolbar button, or selecting Edit Add a folder." msgstr "" "Fügen Sie die gewünschten Dateien zu Ihrem Archiv hinzu, indem Sie auf das " "Symbol Dateien zum Archiv hinzufügen in der Werkzeugleiste " @@ -155,7 +158,8 @@ "\">Einen Ordner hinzufügen …." #: C/archive-create.page:57(note/p) -msgid "When you add a folder to your archive, you will be offered some options:" +msgid "" +"When you add a folder to your archive, you will be offered some options:" msgstr "" "Beim Hinzufügen eines Ordners zu Ihrem Archiv stehen Ihnen folgende Optionen " "zur Verfügung:" @@ -177,8 +181,8 @@ msgid "" "Not all archive file formats support folders — if the file format that you " "are using does not, you will not be warned. If the file format that you are " -"using does not support folders, the files from the folders will be added, but " -"not the folder itself." +"using does not support folders, the files from the folders will be added, " +"but not the folder itself." msgstr "" "Nicht alle Archivformate unterstützen Ordner. Falls das für das von Ihnen " "verwendete Dateiformat zutrifft, werden Sie gewarnt." @@ -188,8 +192,8 @@ "Once you finish adding files, the archive is ready; you do not need to save " "it." msgstr "" -"Sobald Sie mit dem Hinzufügen von Dateien fertig sind, ist Ihr Archiv fertig, " -"ein Speichern ist nicht notwendig." +"Sobald Sie mit dem Hinzufügen von Dateien fertig sind, ist Ihr Archiv " +"fertig, ein Speichern ist nicht notwendig." #: C/archive-edit.page:21(info/desc) msgid "Change the content of your archive." @@ -206,8 +210,8 @@ "folders in the same way as with files." msgstr "" "Der Archivmanager ermöglicht die Bearbeitung vorhandener Archive " -"durch Hinzufügen und Entfernen von Dateien oder durch Ändern der Namen. Gehen " -"Sie mit Ordnern genauso um wie mit Dateien." +"durch Hinzufügen und Entfernen von Dateien oder durch Ändern der Namen. " +"Gehen Sie mit Ordnern genauso um wie mit Dateien." #: C/archive-edit.page:32(item/title) msgid "Add files" @@ -215,8 +219,8 @@ #: C/archive-edit.page:33(item/p) msgid "" -"Add files to an existing archive by following the instructions for creating an archive." +"Add files to an existing archive by following the instructions for creating an archive." msgstr "" "Fügen Sie Dateien einem bestehenden Archiv hinzu, indem Sie den Anweisungen " "auf der Seite folgen." @@ -317,9 +321,9 @@ "link>, Archive Manager will request it. Type in the password and " "click OK." msgstr "" -"Falls das Archiv durch ein Passwort " -"geschützt ist, wird der Archivmanager Sie danach fragen. Geben Sie " -"das Passwort ein und klicken Sie auf OK." +"Falls das Archiv durch ein Passwort geschützt ist, wird der Archivmanager Sie danach fragen. " +"Geben Sie das Passwort ein und klicken Sie auf OK." #: C/archive-extract.page:58(item/p) msgid "" @@ -332,7 +336,8 @@ #: C/archive-extract.page:63(item/p) msgid "Quit to close Archive Manager." -msgstr "Beenden - dadurch wird der Archivmanager beendet." +msgstr "" +"Beenden - dadurch wird der Archivmanager beendet." #: C/archive-extract.page:66(item/p) msgid "" @@ -384,10 +389,10 @@ #: C/archive-extract-advanced-options.page:39(note/p) msgid "" -"You need to select the files that you wish to extract before before you click " -"Archive Extract. Do this by clicking on the file name. Use Ctrl and " -"Shift keys, to select more than one file." +"You need to select the files that you wish to extract before before you " +"click Archive Extract. Do this by clicking on the file name. Use " +"Ctrl and Shift keys, to select more than one file." msgstr "" "Wählen Sie die Dateien aus, bevor Sie ArchivEntpacken … wählen. Klicken Sie " @@ -413,45 +418,31 @@ "txt files, type *.txt." msgstr "" "Dem Dateinamen muss eine Dateinamenerweiterung angehängt werden. Sie können " -"zum Beispiel alle .txt-Dateien entpacken, indem Sie *.txt eingeben." +"zum Beispiel alle .txt-Dateien entpacken, indem Sie *." +"txt eingeben." #: C/archive-extract-advanced-options.page:58(page/p) msgid "You can specify in the file chooser dialog whether you want to:" msgstr "Im Dateiwählerdialog können Sie Folgendes angeben:" #: C/archive-extract-advanced-options.page:61(item/title) -msgid "Re-create folders" -msgstr "Ordner neu anlegen" +msgid "Keep directory structure" +msgstr "Ordnerstruktur erhalten" #: C/archive-extract-advanced-options.page:62(item/p) msgid "" -"Tick this option if you want to keep the directory structure as it is in your " -"archive." +"Tick this option if you want to keep the directory structure as it is in " +"your archive." msgstr "" "Aktivieren Sie diese Option, wenn Sie die Ordnerstruktur erhalten wollen, so " "wie sie in Ihrem Archiv vorhanden ist." #: C/archive-extract-advanced-options.page:66(item/title) -msgid "Overwrite existing files" -msgstr "Vorhandene Dateien ersetzen" +msgid "Do not overwrite newer files" +msgstr "Neuere Dateien nicht überschreiben" #: C/archive-extract-advanced-options.page:67(item/p) msgid "" -"If your archive contains files with the same name as those in the destination " -"folder, then Archive Manager will overwrite them during extraction " -"if this option is enabled." -msgstr "" -"Falls Ihr Archiv Dateien enthält, deren Namen im Zielordner bereits vorhanden " -"sind, dann überschreibt der Archivmanager diese Dateien beim " -"entpacken, falls diese Option aktiviert ist." - -#: C/archive-extract-advanced-options.page:72(item/title) -msgid "Do not extract older files" -msgstr "Keine älteren Dateien entpacken" - -#: C/archive-extract-advanced-options.page:73(item/p) -msgid "" "This option will not overwrite existing files with the same name, which have " "a more recent modification date than those which are in the archive." msgstr "" @@ -459,19 +450,11 @@ "überschrieben werden, die laut Änderungszeitpunkt neuer sind als jene im " "Archiv." -#: C/archive-extract-advanced-options.page:79(page/p) +#: C/archive-extract-advanced-options.page:73(page/p) msgid "These Actions are listed at the bottom of the dialog." msgstr "" "Diese Aktionen werden am unteren Rand des Dialogs aufgelistet." -#: C/archive-extract-advanced-options.page:82(note/p) -msgid "" -"The option Do not extract older files is only available when the " -"option Overwrite existing files has been enabled." -msgstr "" -"Die Option Keine älteren Dateien entpacken ist nur verfügbar, wenn " -"die Option Vorhandene Dateien ersetzen aktiviert ist." - #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to #. update your localized copy. The msgstr is not used at all. Set it to @@ -516,8 +499,8 @@ #: C/archive-open.page:41(item/p) msgid "" "clicking the Open a recently used archive toolbar button " -"and selecting a file" +"roller-open-recent.png\"> Open a recently used archive toolbar " +"button and selecting a file" msgstr "" "Klicken Sie auf den Werkzeugleistenknopf Ein zuletzt geöffnetes " @@ -535,9 +518,9 @@ #: C/archive-open.page:53(note/p) msgid "" "If Archive Manager cannot open your recently used archive and " -"shows the error message The file doesn't exist, it may be that the " -"location of the archive file has changed. You can try using the Open option to search for it." +"shows the error message The file doesn't exist, it may be that " +"the location of the archive file has changed. You can try using the " +"Open option to search for it." msgstr "" "Wenn der Archivmanager Ihre zuletzt geöffneten Archive nicht " "öffnen kann und die Fehlermeldung Die Datei ist nicht vorhanden " @@ -567,16 +550,17 @@ "the archive. You will see their names, sizes, types, dates of the last " "modification and locations." msgstr "" -"Klicken Sie auf AnsichtAlle Dateien anzeigen, um diese Ansicht zu verwenden. Der " -"Archivmanager listet daraufhin alle Dateien des Archivs auf. Die " -"Namen, Dateigrößen, Typen, letzten Änderungsdaten und Orte werden angezeigt." +"Klicken Sie auf AnsichtAlle Dateien anzeigen, um diese Ansicht zu " +"verwenden. Der Archivmanager listet daraufhin alle Dateien des " +"Archivs auf. Die Namen, Dateigrößen, Typen, letzten Änderungsdaten und Orte " +"werden angezeigt." #: C/archive-view.page:35(note/p) msgid "" "You may use the column headings mentioned above (name, size…) to sort the " -"files in your archive. Do this by clicking on them; you can toggle to sort in " -"reverse order." +"files in your archive. Do this by clicking on them; you can toggle to sort " +"in reverse order." msgstr "" "Verwenden Sie die zuvor genannten Spaltenbeschriftungen (Name, Größe usw.), " "um die Dateien in Ihrem Archiv zu sortieren. Klicken Sie dazu auf die " @@ -598,10 +582,10 @@ #: C/archive-view.page:46(note/p) msgid "" -"While viewing your archive in this way, you can press F9, or click " -"View Folders option, to see a tree view of the folders in the side pane. It allows " -"you to navigate easily between folders." +"While viewing your archive in this way, you can press F9, or " +"click View Folders option, to see a tree view of the folders in the " +"side pane. It allows you to navigate easily between folders." msgstr "" "Drücken Sie beim Anzeigen Ihres Archivs F9 oder " "wählen Sie AnsichtÖffnen mit." #: C/archive-view.page:72(item/p) -msgid "Select the application that you want to use and click Select." +msgid "" +"Select the application that you want to use and click Select." msgstr "" -"Wählen Sie die gewünschte Option aus und klicken Sie auf Auswählen." +"Wählen Sie die gewünschte Option aus und klicken Sie auf Auswählen." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -676,10 +662,10 @@ #: C/introduction.page:31(note/p) msgid "" -"An archive consists of one or more files and folders, along with metadata. It " -"may be encrypted in part or as a whole. Archive files are useful for storing " -"data and transferring it between computers as they allow you to collect " -"multiple files into one." +"An archive consists of one or more files and folders, along with metadata. " +"It may be encrypted in part or as a whole. Archive files are useful for " +"storing data and transferring it between computers as they allow you to " +"collect multiple files into one." msgstr "" "Ein Archiv besteht aus einer oder mehreren Dateien sowie Metadaten. Es kann " "teilweise oder als Ganzes verschlüsselt werden. Durch Zusammenfassen von " @@ -728,8 +714,8 @@ #: C/keyboard-shortcuts.page:25(page/p) msgid "" -"Using keyboard shortcuts can help speed up work-flow. In the table below is a " -"list of shortcuts which can be used in Archive Manager." +"Using keyboard shortcuts can help speed up work-flow. In the table below is " +"a list of shortcuts which can be used in Archive Manager." msgstr "" "Mit Tastenkombinationen können Sie Ihre Arbeitsabläufe beschleunigen. In der " "nachfolgenden Tabelle werden Tastenkombinationen aufgelistet, die Sie im " @@ -897,9 +883,9 @@ msgstr "" "Sie können ein Archiv mit einem Passwort verschlüsseln, so dass nur Sie und " "diejenigen, an die Sie Ihr Passwort weitergeben, Zugriff darauf erhalten. " -"Bedenken Sie, dass das Passwort immer noch erraten werden könnte, so dass Sie " -"für höchstmögliche Sicherheit ein gutes Passwort verwenden sollten." #: C/password-protection.page:33(note/p) @@ -913,7 +899,8 @@ #: C/password-protection.page:37(page/p) msgid "" "Set a password to encrypt data in a new archive by following these steps:" -msgstr "Gehen Sie wie folgt vor, um die Daten in einem Archiv zu verschlüsseln:" +msgstr "" +"Gehen Sie wie folgt vor, um die Daten in einem Archiv zu verschlüsseln:" #: C/password-protection.page:42(item/p) msgid "Start creating a new archive." @@ -931,12 +918,13 @@ #: C/password-protection.page:49(note/p) msgid "" -"You may not be able to type a password, because not all archive types support " -"encryption, so it is better to choose a file format before setting a password." -msgstr "" -"Möglicherweise können Sie kein Passwort eingeben, weil nicht alle Archivtypen " -"dafür geeignet sind. Daher ist es besser, wenn Sie vor dem Festlegen eines " -"Passworts zunächst ein entsprechendes Dateiformat wählen." +"You may not be able to type a password, because not all archive types " +"support encryption, so it is better to choose a file format before setting a " +"password." +msgstr "" +"Möglicherweise können Sie kein Passwort eingeben, weil nicht alle " +"Archivtypen dafür geeignet sind. Daher ist es besser, wenn Sie vor dem " +"Festlegen eines Passworts zunächst ein entsprechendes Dateiformat wählen." #: C/password-protection.page:55(item/p) msgid "" @@ -955,8 +943,8 @@ #: C/password-protection.page:66(item/p) msgid "" -"Click EditPassword." +"Click EditPassword." msgstr "" "Klicken Sie auf BearbeitenPasswort." @@ -967,11 +955,11 @@ #: C/password-protection.page:72(note/p) msgid "" -"If you want to encrypt the list of files tick Encrypt the file list too." +"If you want to encrypt the list of files tick Encrypt the file list " +"too." msgstr "" -"Falls Sie die Dateiliste verschlüsseln wollen, aktivieren Sie Dateiliste " -"ebenfalls verschlüsseln." +"Falls Sie die Dateiliste verschlüsseln wollen, aktivieren Sie " +"Dateiliste ebenfalls verschlüsseln." #: C/password-protection.page:77(item/p) msgid "Click OK to continue." @@ -979,8 +967,8 @@ #: C/password-protection.page:79(note/p) msgid "" -"Archive Manager will encrypt only new files which will be added to " -"the archive!" +"Archive Manager will encrypt only new files which will be added " +"to the archive!" msgstr "" "Der Archivmanager verschlüsselt nur Dateien, die neu zum Archiv " "hinzugefügt werden!" @@ -995,8 +983,8 @@ msgstr "Unterstützte Dateiformate" #: C/supported-formats.page:25(page/p) -msgid "File formats that are support by Archive Manager include:" -msgstr "Die vom Archivmanager unterstützten Formate sind u.a.:" +msgid "File formats that are supported by Archive Manager include:" +msgstr "Die vom Archivmanager unterstützten Dateiformate sind u.a.:" #: C/supported-formats.page:28(item/p) msgid "Archive only" @@ -1088,9 +1076,9 @@ #: C/test-integrity.page:25(page/p) msgid "" -"Archive Manager allows you to check whether the compressed data in " -"an archive contains any errors. Do this by clicking Archive Test Integrity." +"Archive Manager allows you to check whether the compressed data " +"in an archive contains any errors. Do this by clicking Archive Test Integrity." msgstr "" "Mit dem Archivmanager können Sie überprüfen, ob die in einem " "Archiv enthaltenen gepackten Daten fehlerhaft sind. Wählen Sie hierzu " @@ -1099,8 +1087,8 @@ #: C/test-integrity.page:30(page/p) msgid "" -"The dialog with the Test Result will pop up. You will see the list " -"of tested files and, at the bottom, there will also be the test summary." +"The dialog with the Test Result will pop up. You will see the " +"list of tested files and, at the bottom, there will also be the test summary." msgstr "" "Der Dialog mit dem Testergebnis wird geöffnet. Sie sehen eine " "Liste der getesteten Dateien sowie am unteren Rand eine Zusammenfassung des " @@ -1120,8 +1108,8 @@ #: C/troubleshooting-archive-open.page:27(page/p) msgid "" -"If you cannot open an existing archive with Archive Manager, check " -"the format of your file. Some types of archive may require additional " +"If you cannot open an existing archive with Archive Manager, " +"check the format of your file. Some types of archive may require additional " "plugins; the installation process for these varies between different " "distributions." msgstr "" @@ -1134,12 +1122,13 @@ msgid "" "If Archive Manager cannot open a recently used archive, it may be " "that the location of this archive file has changed. See the help page about " -"opening an archive for further information." +"opening an archive for further " +"information." msgstr "" "Wenn der Archivmanager Ihre zuletzt geöffneten Archive nicht " "öffnen kann, so hat sich gegebenenfalls der Ort des Archivs geändert. In der " -"Hilfeseite zum Öffnen eines Archivs finden " -"Sie weitere Informationen." +"Hilfeseite zum Öffnen eines Archivs " +"finden Sie weitere Informationen." #: C/troubleshooting-password.page:21(info/desc) msgid "I have set a password, but it does not protect the whole archive." @@ -1163,3 +1152,24 @@ "folgen Sie den Anweisungen in der Seite Passwortschutz." +#~ msgid "Re-create folders" +#~ msgstr "Ordner neu anlegen" + +#~ msgid "Overwrite existing files" +#~ msgstr "Vorhandene Dateien ersetzen" + +#~ msgid "" +#~ "If your archive contains files with the same name as those in the " +#~ "destination folder, then Archive Manager will overwrite them " +#~ "during extraction if this option is enabled." +#~ msgstr "" +#~ "Falls Ihr Archiv Dateien enthält, deren Namen im Zielordner bereits " +#~ "vorhanden sind, dann überschreibt der Archivmanager diese " +#~ "Dateien beim entpacken, falls diese Option aktiviert ist." + +#~ msgid "" +#~ "The option Do not extract older files is only available when " +#~ "the option Overwrite existing files has been enabled." +#~ msgstr "" +#~ "Die Option Keine älteren Dateien entpacken ist nur verfügbar, " +#~ "wenn die Option Vorhandene Dateien ersetzen aktiviert ist." diff -Nru file-roller-3.6.0/help/de/introduction.page file-roller-3.6.3/help/de/introduction.page --- file-roller-3.6.0/help/de/introduction.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/introduction.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/keyboard-shortcuts.page file-roller-3.6.3/help/de/keyboard-shortcuts.page --- file-roller-3.6.0/help/de/keyboard-shortcuts.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/keyboard-shortcuts.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/password-protection.page file-roller-3.6.3/help/de/password-protection.page --- file-roller-3.6.0/help/de/password-protection.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/password-protection.page 2012-11-27 20:26:56.000000000 +0000 @@ -35,7 +35,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/supported-formats.page file-roller-3.6.3/help/de/supported-formats.page --- file-roller-3.6.0/help/de/supported-formats.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/supported-formats.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,13 +33,13 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 Unterstützte Dateiformate -

File formats that are supported by Archive Manager include:

+

Die vom Archivmanager unterstützten Dateiformate sind u.a.:

Nur archivieren

diff -Nru file-roller-3.6.0/help/de/test-integrity.page file-roller-3.6.3/help/de/test-integrity.page --- file-roller-3.6.0/help/de/test-integrity.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/test-integrity.page 2012-11-27 20:26:56.000000000 +0000 @@ -33,7 +33,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/troubleshooting-archive-open.page file-roller-3.6.3/help/de/troubleshooting-archive-open.page --- file-roller-3.6.0/help/de/troubleshooting-archive-open.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/troubleshooting-archive-open.page 2012-11-27 20:26:56.000000000 +0000 @@ -35,7 +35,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/de/troubleshooting-password.page file-roller-3.6.3/help/de/troubleshooting-password.page --- file-roller-3.6.0/help/de/troubleshooting-password.page 2012-09-17 20:22:19.000000000 +0000 +++ file-roller-3.6.3/help/de/troubleshooting-password.page 2012-11-27 20:26:56.000000000 +0000 @@ -34,7 +34,7 @@ Christian Kirbach Christian.Kirbach@googlemail.com - 2011 + 2011, 2012 diff -Nru file-roller-3.6.0/help/fr/archive-edit.page file-roller-3.6.3/help/fr/archive-edit.page --- file-roller-3.6.0/help/fr/archive-edit.page 2012-09-17 20:22:22.000000000 +0000 +++ file-roller-3.6.3/help/fr/archive-edit.page 2012-11-27 20:26:59.000000000 +0000 @@ -69,8 +69,7 @@ Ajouter des fichiers -

Add files to an existing archive by following the instructions for - creating an archive.

+

Ajoutez des fichiers à une archive existante en suivant les instructions de la page créer une archive.

 Supprimer des fichiers diff -Nru file-roller-3.6.0/help/fr/fr.po file-roller-3.6.3/help/fr/fr.po --- file-roller-3.6.0/help/fr/fr.po 2012-09-17 20:20:17.000000000 +0000 +++ file-roller-3.6.3/help/fr/fr.po 2012-10-17 13:22:00.000000000 +0000 @@ -237,7 +237,7 @@ "xref=\"archive-create\">creating an archive." msgstr "" "Ajoutez des fichiers à une archive existante en suivant les instructions de " -"la page créer une archive." +"la page créer une archive." #: C/archive-edit.page:37(item/title) msgid "Remove files" diff -Nru file-roller-3.6.0/help/gl/archive-extract.page file-roller-3.6.3/help/gl/archive-extract.page --- file-roller-3.6.0/help/gl/archive-extract.page 2012-09-24 19:09:40.000000000 +0000 +++ file-roller-3.6.3/help/gl/archive-extract.page 2012-11-27 20:26:59.000000000 +0000 @@ -49,10 +49,7 @@

Prema Extraer.

 -

If an archive is protected by a - password, Archive - Manager will request it. Type in the password and click - OK.

+

Se un arquivo está protexido con contrasinal, o Xestor de arquivos solicitaralla. Escriba o contrasinal e prema Aceptar.

O aplicativo mostrará a barra de progreso no diálogo novo. Se a extracción remata correctamente, preguntaráselle se quere:

diff -Nru file-roller-3.6.0/help/gl/gl.po file-roller-3.6.3/help/gl/gl.po --- file-roller-3.6.0/help/gl/gl.po 2012-09-24 18:44:43.000000000 +0000 +++ file-roller-3.6.3/help/gl/gl.po 2012-10-17 13:22:00.000000000 +0000 @@ -369,7 +369,7 @@ "click OK." msgstr "" "Se un arquivo está protexido con contrasinalcontrasinal, o Xestor de arquivos " +"protection\">contrasinal, o Xestor de arquivos " "solicitaralla. Escriba o contrasinal e prema Aceptar." #: C/archive-extract.page:58(item/p) diff -Nru file-roller-3.6.0/help/ru/archive-create.page file-roller-3.6.3/help/ru/archive-create.page --- file-roller-3.6.0/help/ru/archive-create.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/archive-create.page 2012-11-27 20:27:02.000000000 +0000 @@ -49,10 +49,7 @@

Откроется диалог выбора файлов. Дайте имя новому архивному файлу и выберите его расположение, затем нажмите Создать.

В этом диалоговом окне также можно выбрать тип формата файла (доступные расширения будут перечислены ниже). Если вы не выберите формат файла, новый архив будет иметь расширение tar.gz.

-

By clicking Other Options you can set a password, or - split your new archive into smaller, individual files by selecting the - relevant option and specifying the volume for each part in - MB.

+

Нажав Другие параметры, вы можете установить пароль или разбить новый архив на несколько более маленьких архивов, выбрав соответствующий параметр и указав объём тома в МБ для каждой части.

 @@ -64,10 +61,7 @@

Выберите файлы, которые должны быть включены.

Выберите вложенные папки или файлы для исключения.

 -

Not all archive file formats support folders — if the file format - that you are using does not, you will not be warned. If the file format - that you are using does not support folders, the files from the folders - will be added, but not the folder itself.

+

Не все архивные форматы поддерживают папки, если файловый формат не поддерживает папки, вы не получите предупреждения. Если файловый формат не поддерживает папки, файлы из папок будут добавлены, но сама папка добавлена не будет.

diff -Nru file-roller-3.6.0/help/ru/archive-extract-advanced-options.page file-roller-3.6.3/help/ru/archive-extract-advanced-options.page --- file-roller-3.6.0/help/ru/archive-extract-advanced-options.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/archive-extract-advanced-options.page 2012-11-27 20:27:02.000000000 +0000 @@ -39,49 +39,38 @@ Дополнительные опции распаковки архивов -

Archive Manager offers different options for extracting an - archive. You can see these options in the file chooser dialog, that is used - for choosing the location for the extracted files. At the bottom of this - dialog, you can decide if you want to extract:

+

Менеджер архивов предлагает различные параметры при извлечении содержимого архива. Их можно увидеть в диалоговом окне выбора файлов, которое используется для выбора места для размещения извлекаемых файлов. Внизу этого диалогового окна можно выбрать, что нужно извлечь:

<gui>Все файлы</gui> -

All the files and folders in the archive will be extracted.

+

Будут извлечены все файлы и папки, хранящиеся в архиве.

 <gui>Выделенные файлы</gui> -

Archive Manager extracts only the selected files.

+

Менеджер архивов извлечёт только выделенные файлы.

-

You need to select the files that you wish to extract before before - you click Archive - Extract. Do this by clicking on - the file name. Use Ctrl and Shift keys, to select - more than one file.

+

Сначала нужно выделить файлы, а потом выбрать в меню АрхивРаспаковать. Для этого нажмите на имя файла. Удерживайте Ctrl или Shift, чтобы выбрать несколько файлов.

 <gui>Файлы</gui> -

You can type in the names of the files that you want to extract. - Separate individual files using a semicolon (;)

+

Вы можете ввести имена файлов, которые нужно извлечь. Имена файлов отделяются друг от друга символом точки с запятой (;)

-

The file name needs to be followed by a file extension. You can use - the asterisk (*) as a wild card. For example, to select all - .txt files, type *.txt.

+

Имя файла должно быть указано с расширением. Вы можете использовать символ звёздочки (*) в качестве шаблона. Например, чтобы извлечь все файлы .txt, введите *.txt.

 -

You can specify in the file chooser dialog whether you want to:

+

Также можно указать в диалоговом окне выбора файлов, нужно ли:

- <gui>Keep directory structure</gui> -

Tick this option if you want to keep the directory structure as it - is in your archive.

+ <gui>Сохранять структуру каталогов</gui> +

Включите этот параметр, если вы хотите сохранить структуру каталогов в том виде, в каком она хранилась архиве.

 - <gui>Do not overwrite newer files</gui> -

При включении этой опции не будут перезаписываться существующие файлы с теми же именами, если они имеют более свежую дату изменения, чем содержащиеся в архиве.

+ <gui>Пропускать устаревшие файлы</gui> +

При включении этого параметра существующие файлы не будут перезаписываться, если они имеют более свежую дату изменения, чем содержащиеся в архиве.

 diff -Nru file-roller-3.6.0/help/ru/archive-extract.page file-roller-3.6.3/help/ru/archive-extract.page --- file-roller-3.6.0/help/ru/archive-extract.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/archive-extract.page 2012-11-27 20:27:02.000000000 +0000 @@ -19,7 +19,7 @@

Creative Commons Share Alike 3.0

 - Extract files or folders from your archive. + Распаковка файлов или папок из архива. Юрий Мясоедов @@ -67,14 +67,13 @@

Приложение будет показывать в новом диалоговом окне индикатор прогресса. Если распаковка завершилась успешно, появится вопрос о том, что нужно делать дальше:

-

Quit to close Archive Manager.

+

Выход — данная кнопка закроет Менеджер архивов.

 -

Show the files to view the destination folder with - Files.

+

Показать файлы — после нажатия на эту кнопку, целевая папка будет открыта в Nautilus.

 -

Close the dialog.

+

Закрыть диалог.

 diff -Nru file-roller-3.6.0/help/ru/archive-open.page file-roller-3.6.3/help/ru/archive-open.page --- file-roller-3.6.0/help/ru/archive-open.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/archive-open.page 2012-11-27 20:27:02.000000000 +0000 @@ -39,37 +39,30 @@ Открытие архива -

You can open an existing archive with Archive Manager by:

+

Чтобы открыть существующий архив в Менеджере архивов, выполните следующее:

-

clicking the Open toolbar button

+

нажмите кнопку Открыть в панели инструментов

 -

clicking Archive - Open

+

выберите Архив Открыть

 -

You may also use the Open Recent option by:

+

Также можно воспользоваться функцией Открыть недавние:

-

clicking the Open a recently used - archive toolbar button and selecting a file

+

нажмите кнопку панели инструментов Открыть недавно использованный архив и выберите файл

 -

clicking Archive - Open Recent to see the list of - recently used archives

+

выберите Архив Открыть недавние, чтобы увидеть список недавно использованных архивов

 -

If Archive Manager cannot open your recently used archive and - shows the error message The file doesn't exist, it may be that - the location of the archive file has changed. You can try using the - Open option to search for it.

+

Если Менеджер архивов не сможет открыть недавно использованный архив, он покажет сообщение об ошибке «Файл не существует». Причина может быть в изменении местоположения файла архива. В таком случае выберите Открыть, чтобы найти файл.

 diff -Nru file-roller-3.6.0/help/ru/archive-view.page file-roller-3.6.3/help/ru/archive-view.page --- file-roller-3.6.0/help/ru/archive-view.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/archive-view.page 2012-11-27 20:27:02.000000000 +0000 @@ -39,53 +39,40 @@ Просмотр архива -

There are two ways to view an archive:

+

Существует два режима просмотра архива:

Просмотр всех файлов -

Click ViewView - All Files. Archive Manager will list all files - inside the archive. You will see their names, sizes, types, dates of the - last modification and locations.

+

Выберите Вид Показывать всё содержимое. Менеджер архивов покажет список всех файлов, содержащихся в архиве. Будут показаны их имена, размеры, типы, местоположения и даты последнего изменения.

-

You may use the column headings mentioned above (name, size…) to - sort the files in your archive. Do this by clicking on them; you can - toggle to sort in reverse order.

+

Вышеуказанные заголовки столбцов (имя, размер…) можно использовать для сортировки файлов в архиве. Для этого нажмите на заголовок. Чтобы выполнить сортировку в обратном порядке, нажмите по нему ещё раз.

 Просмотр в виде папки

В этом режиме отображается классическая структура каталогов. Чтобы переключиться в него, выберите Вид Показывать текущую папку.

-

While viewing your archive in this way, you can press F9, - or click View - Folders option, to see a tree - view of the folders in the side pane. It allows you to navigate easily - between folders.

+

При просмотре архива в этом режиме нажмите F9 или выберите Вид Папки. В боковой панели будет отображена древовидная структура папок, позволяющая легко перемещаться между отдельными папками.
Открытие файлов в архиве -

Open files which are in your archive by double-clicking on the file name, or by - right-clicking on the file name and selecting Open. - Archive Manager will open the file with the default application - for that file type.

+

Чтобы открыть содержащиеся в архиве файлы, выполните двойной щелчок на имени файла или щёлкните правой кнопкой на имени файла и выберите Открыть. Менеджер архивов откроет файл в приложении, используемом по умолчанию для данного типа файла.

-

Open the file with a different application by following these steps:

+

Открыть файл в другом приложении можно следующим образом:

-

Right click on the file.

+

Щёлкните правой кнопкой мыши по файлу.

 -

Click Open With.

+

Нажмите кнопку Открыть с помощью.

 -

Select the application that you want to use and click - Select.

+

Выберите приложение, которое хотите использовать, и нажмите Выбрать.

 diff -Nru file-roller-3.6.0/help/ru/introduction.page file-roller-3.6.3/help/ru/introduction.page --- file-roller-3.6.0/help/ru/introduction.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/introduction.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,7 +16,7 @@

Creative Commons Share Alike 3.0

 - Introduction to the GNOME Archive Manager. + Введение в Менеджер архивов GNOME. Юрий Мясоедов @@ -39,31 +39,25 @@ Введение -

Archive Manager is an application for managing archive files, - for example, .zip or .tar files; it is designed to - be easy to use. Archive Manager provides all the tools that are - necessary for creating, modifying and extracting archives.

+

Менеджер архивов — это простое приложение для управления архивными файлами, например, .zip или .tar. Менеджер архивов предоставляет все необходимые инструменты для создания, изменения архивов, а также извлечения из них данных.

-

An archive consists of one or more files and folders, along with - metadata. It may be encrypted in part or as a whole. Archive files are - useful for storing data and transferring it between computers as they allow - you to collect multiple files into one.

+

Архив состоит из одного или нескольких файлов, папок, а также из метаданных. Архив может быть частично или полностью зашифрован. Архивные файлы удобно использовать для хранения и передачи данных между компьютерами.

 -

With Archive Manager you can:

+

С помощью Менеджера архивов можно:

-

create a new archive

 -

view the content of an existing archive

 -

view a file contained in an archive

 -

modify existing archives

 -

extract files from an archive

 +

создавать новые архивы;

 +

просматривать содержимое существующего архива;

 +

просматривать файлы, содержащиеся в архиве;

 +

изменять существующие архивы;

 +

извлекать файлы из архива.
- Viewing an archive with <gui>Archive Manager</gui> + Просмотр архива в <gui>Менеджере архивов</gui> -

Screenshot of the Archive Manager main window.

+

Снимок главного окна Менеджера архивов.
diff -Nru file-roller-3.6.0/help/ru/keyboard-shortcuts.page file-roller-3.6.3/help/ru/keyboard-shortcuts.page --- file-roller-3.6.0/help/ru/keyboard-shortcuts.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/keyboard-shortcuts.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,7 +16,7 @@

Creative Commons Share Alike 3.0

 - The list of shortcuts in Archive Manager. + Список комбинаций клавиш в Менеджере архивов. Юрий Мясоедов @@ -39,8 +39,7 @@ Комбинации клавиш -

Using keyboard shortcuts can help speed up work-flow. In the table below - is a list of shortcuts which can be used in Archive Manager.

+

Использование комбинаций клавиш может помочь ускорить работу. В таблице ниже приведён список комбинаций клавиш, который можно использовать в Менеджере архивов.

@@ -57,10 +56,10 @@ - + - + @@ -116,7 +115,7 @@ - +

Показать свойства архива

AltReturn

AltEnter

Close

Закрыть

CtrlW

CtrlR

View help

Открыть справку

F1
diff -Nru file-roller-3.6.0/help/ru/password-protection.page file-roller-3.6.3/help/ru/password-protection.page --- file-roller-3.6.0/help/ru/password-protection.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/password-protection.page 2012-11-27 20:27:02.000000000 +0000 @@ -41,57 +41,47 @@ Защита паролем -

You can encrypt an archive with a password so that only you and those with - whom you choose to share the password are able to access it. Note that the - password can still be guessed, so for highest security, use - a good password.

+

Вы можете зашифровать архив с помощью пароля, чтобы к архиву могли получить доступ только вы и те люди, которым вы дадите пароль. Учтите, что пароль может быть угадан, поэтому для большей безопасности используйте стойкий пароль.

-

Archive Manager allows you to encrypt an archive with a - password only in specific circumstances.

+

Менеджер архивов позволяет зашифровать архив с использованием пароля лишь в определённых случаях.

Чтобы задать пароль шифрования данных в новом архиве, выполните следующее:

-

Start creating a new archive.

+

Начните создание нового архива.

 -

At the bottom of the file chooser dialog you can choose a - File Format and enter a password into the Password - field in Other Options.

+

Внизу этого диалогового окна можно выбрать Формат файла и Другие параметры, где можно задать пароль.

-

You may not be able to type a password, because not all archive types - support encryption, so it is better to choose a file format before - setting a password.

+

Поле ввода пароля может оказаться недоступным, так как эта возможность поддерживается не для всех типов архивных файлов. Поэтому лучше выбрать формат файла перед установкой пароля.

 -

Continue with creating a new - archive.

+

Продолжайте создание нового архива.

Защита уже существующего архива установкой пароля:

-

Open an archive.

+

Откройте архив.

 -

Click EditPassword.

+

Выберите Правка Пароль.

 -

Type a password into the password field.

+

Введите пароль в поле ввода пароля.

Если нужно зашифровать и список файлов, включите флажок Также зашифровать список файлов.

 -

Click OK to continue.

+

Нажмите кнопку OK для продолжения.

-

Archive Manager will encrypt only new files which will be - added to the archive!

+

Менеджер архивов зашифрует только новые файлы, которые будут добавлены в архив!

 diff -Nru file-roller-3.6.0/help/ru/ru.po file-roller-3.6.3/help/ru/ru.po --- file-roller-3.6.0/help/ru/ru.po 2012-08-20 19:21:08.000000000 +0000 +++ file-roller-3.6.3/help/ru/ru.po 2012-10-12 15:49:49.000000000 +0000 @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: file-roller help HEAD\n" -"POT-Creation-Date: 2012-08-06 00:47+0000\n" -"PO-Revision-Date: 2012-08-17 11:12+0400\n" +"POT-Creation-Date: 2012-09-15 15:36+0000\n" +"PO-Revision-Date: 2012-10-04 15:04+0400\n" "Last-Translator: Yuri Myasoedov \n" "Language-Team: русский \n" "Language: ru\n" @@ -19,7 +19,6 @@ "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n" #: C/index.page:5(page/title) -#| msgid "File Roller Archive Manager Help" msgid "Archive Manager Help" msgstr "Справка по менеджеру архивов" @@ -84,7 +83,6 @@ msgstr "Creative Commons Share Alike 3.0" #: C/archive-create.page:20(info/desc) -#| msgid "Add files or folders to your new archive." msgid "Add files or folders to a new archive." msgstr "Добавить файлы или папки в новый архив." @@ -93,9 +91,6 @@ msgstr "Создать новый архив" #: C/archive-create.page:25(page/p) -#| msgid "" -#| "Create a new archive with File Roller, by following these " -#| "steps:" msgid "" "Create a new archive with Archive Manager by following these " "steps:" @@ -104,10 +99,6 @@ "следующее:" #: C/archive-create.page:30(item/p) -#| msgid "" -#| "Click the Create a new archive toolbar button, or click " -#| "ArchiveNew…" msgid "" "Click the Create a new archive toolbar button, or click " "Archive NewСоздать." #: C/archive-create.page:35(item/p) -#| msgid "" -#| "The file chooser will open. Use it to name your new archive file and " -#| "choose its location, and click Create." msgid "" "The file chooser will open: name your new archive file and choose the " "location for it to be saved to, then click Create to continue." @@ -129,12 +117,6 @@ "его расположение, затем нажмите Создать." #: C/archive-create.page:39(note/p) -#| msgid "" -#| "In this dialog you may also choose the type of the file format that you " -#| "want to use, available extensions should be listed below. By clicking " -#| "Other options you can set a password, or split your new " -#| "archive into smaller parts. You should specify the size of the volume in " -#| "MB." msgid "" "In this dialog, you may also choose the file format that you want to use: " "available extensions are listed at the bottom. If you do not choose a file " @@ -150,16 +132,11 @@ "new archive into smaller, individual files by selecting the relevant option " "and specifying the volume for each part in MB." msgstr "" +"Нажав Другие параметры, вы можете установить пароль или разбить " +"новый архив на несколько более маленьких архивов, выбрав соответствующий " +"параметр и указав объём тома в МБ для каждой части." #: C/archive-create.page:49(item/p) -#| msgid "" -#| "Add the desired files to your archive by clicking the Add files to " -#| "the archive toolbar button, or by clicking Edit Add files…. " -#| "File Roller also allows you to add whole folders. To do this, " -#| "click the Add a folder to the archive toolbar button, or " -#| "select Edit Add " -#| "a folder…" msgid "" "Add the desired files to your archive by clicking the Add files to the " "archive toolbar button, or by clicking File Roller you can edit an existing archive by adding " -#| "new files, removing unwanted ones or by changing their names. You can " -#| "work with folders in the same way as with files." msgid "" "With Archive Manager you can edit an existing archive by adding " "new files, removing unwanted ones or by renaming them. You can work with " @@ -242,9 +215,6 @@ msgstr "Добавление файлов" #: C/archive-edit.page:33(item/p) -#| msgid "" -#| "Add files to an existing archive by following the instructions on page." msgid "" "Add files to an existing archive by following the instructions for creating an archive." @@ -253,7 +223,6 @@ "xref=\"archive-create\">создание архива." #: C/archive-edit.page:37(item/title) -#| msgid "Remove files" msgid "Remove files" msgstr "Удаление файлов" @@ -272,15 +241,10 @@ "файлу и выберите Удалить." #: C/archive-edit.page:46(item/title) -#| msgid "Rename files" msgid "Rename files" msgstr "Переименование файлов" #: C/archive-edit.page:49(item/p) -#| msgid "" -#| "Click Edit Rename…, or right-click on the selected file, and " -#| "choose Rename…." msgid "" "Click Edit Rename, or right-click on the selected file, and choose RenameПереименовать." #: C/archive-edit.page:52(item/p) -#| msgid "" -#| "A dialog will open. Enter the new file name into the text entry field." msgid "Enter the new file name into the dialog which has opened." msgstr "Введите новое имя файла в открывшемся диалоговом окне." @@ -301,19 +263,15 @@ msgstr "Подтвердите действие, нажав Переименовать." #: C/archive-extract.page:23(info/desc) -#, fuzzy #| msgid "Extract files or folders from your archive" msgid "Extract files or folders from your archive." -msgstr "Распаковать файлы или папки из архива." +msgstr "Распаковка файлов или папок из архива." #: C/archive-extract.page:26(page/title) C/keyboard-shortcuts.page:38(td/p) msgid "Extract an archive" msgstr "Распаковка архива" #: C/archive-extract.page:28(page/p) -#| msgid "" -#| "Extract files from archive using File Roller by following " -#| "these steps:" msgid "" "Extract files from an archive using Archive Manager by following " "these steps:" @@ -326,9 +284,6 @@ msgstr "Откройте архив." #: C/archive-extract.page:36(item/p) -#| msgid "" -#| "Click Archive Extract… or click the Extract toolbar button." msgid "" "Click Archive Extract or click Extract in the toolbar button." @@ -338,9 +293,6 @@ "панели инструментов." #: C/archive-extract.page:41(item/p) -#| msgid "" -#| "Choose the location in the file chooser, into which the files should be " -#| "extracted. This will be the destination folder." msgid "" "Choose where you want the archive to be extracted to in the file chooser. " "This will be the destination folder." @@ -349,10 +301,6 @@ "Выбранное место будет целевой папкой." #: C/archive-extract.page:44(note/p) -#| msgid "" -#| "There are additional options in this dialog. See advanced options for extracting archives." msgid "" "See advanced options for " "extracting archives for more extraction options." @@ -365,9 +313,6 @@ msgstr "Нажмите кнопку Распаковать." #: C/archive-extract.page:52(item/p) -#| msgid "" -#| "If an archive is protected by a password, File Roller will " -#| "request it. Type the password and click OK." msgid "" "If an archive is protected by a password, Archive Manager will request it. Type in the password and " @@ -386,13 +331,11 @@ "дальше:" #: C/archive-extract.page:63(item/p) -#, fuzzy #| msgid "Quit - this option closes File Roller" msgid "Quit to close Archive Manager." -msgstr "Выход — данная опция закроет File Roller" +msgstr "Выход — данная кнопка закроет Менеджер архивов." #: C/archive-extract.page:66(item/p) -#, fuzzy #| msgid "" #| "Show the files - after clicking this the destination folder " #| "will be open in Nautilus" @@ -401,11 +344,11 @@ "app>." msgstr "" "Показать файлы — после нажатия на эту кнопку, целевая папка будет " -"открыта в Nautilus" +"открыта в Nautilus." #: C/archive-extract.page:70(item/p) msgid "Close the dialog." -msgstr "" +msgstr "Закрыть диалог." #: C/archive-extract-advanced-options.page:20(info/desc) msgid "Specify your preferences for archive extraction." @@ -416,7 +359,6 @@ msgstr "Дополнительные опции распаковки архивов" #: C/archive-extract-advanced-options.page:25(page/p) -#, fuzzy #| msgid "" #| "File Roller offers different options while extracting an " #| "archive. You can see these options in the file chooser dialog, which you " @@ -428,33 +370,30 @@ "for choosing the location for the extracted files. At the bottom of this " "dialog, you can decide if you want to extract:" msgstr "" -"File Roller предлагает различные опции при извлечении содержимого " -"архива. Их можно увидеть в диалоговом окне выбора файлов, которое " -"используется для выбора места для размещения извлекаемых файлов. Внизу этого " -"диалогового окна можно выбрать, что нужно извлечь:" +"Менеджер архивов предлагает различные параметры при извлечении " +"содержимого архива. Их можно увидеть в диалоговом окне выбора файлов, " +"которое используется для выбора места для размещения извлекаемых файлов. " +"Внизу этого диалогового окна можно выбрать, что нужно извлечь:" #: C/archive-extract-advanced-options.page:32(item/title) msgid "All files" msgstr "Все файлы" #: C/archive-extract-advanced-options.page:33(item/p) -#, fuzzy #| msgid "the whole archive will be extracted" msgid "All the files and folders in the archive will be extracted." -msgstr "будет извлечено всё содержимое архива" +msgstr "Будут извлечены все файлы и папки, хранящиеся в архиве." #: C/archive-extract-advanced-options.page:36(item/title) msgid "Selected files" msgstr "Выделенные файлы" #: C/archive-extract-advanced-options.page:37(item/p) -#, fuzzy #| msgid "File Roller extracts only the chosen files" msgid "Archive Manager extracts only the selected files." -msgstr "File Roller извлечёт только выделенные файлы" +msgstr "Менеджер архивов извлечёт только выделенные файлы." #: C/archive-extract-advanced-options.page:39(note/p) -#, fuzzy #| msgid "" #| "Select them before you click Archive " #| "Extract…. Do this by clicking on " @@ -466,25 +405,25 @@ "\">Extract. Do this by clicking on the file name. Use " "Ctrl and Shift keys, to select more than one file." msgstr "" -"Файлы нужно выделить перед выбором АрхивРаспаковать…. Для этого нажмите " -"на имя файла. Удерживайте нажатыми Ctrl или Shift, " -"чтобы выбрать несколько файлов." +"Сначала нужно выделить файлы, а потом выбрать в меню АрхивРаспаковать. Для " +"этого нажмите на имя файла. Удерживайте Ctrl или Shift, чтобы выбрать несколько файлов." #: C/archive-extract-advanced-options.page:47(item/title) msgid "Files" msgstr "Файлы" #: C/archive-extract-advanced-options.page:48(item/p) -#, fuzzy #| msgid "you can type the names of the files that you want to extract" msgid "" "You can type in the names of the files that you want to extract. Separate " "individual files using a semicolon (;)" -msgstr "будут извлечены файлы с заданным именем" +msgstr "" +"Вы можете ввести имена файлов, которые нужно извлечь. Имена файлов " +"отделяются друг от друга символом точки с запятой (;)" #: C/archive-extract-advanced-options.page:51(note/p) -#, fuzzy #| msgid "" #| "The file name needs to be followed by a file extension. You can extract, " #| "for example, all .txt files, by typing *.txt." @@ -493,21 +432,20 @@ "asterisk (*) as a wild card. For example, to select all ." "txt files, type *.txt." msgstr "" -"Имя файла нужно указывать с расширением. Например, можно извлечь все файлы " -".txt, набрав *.txt." +"Имя файла должно быть указано с расширением. Вы можете использовать символ " +"звёздочки (*) в качестве шаблона. Например, чтобы извлечь все " +"файлы .txt, введите *.txt." #: C/archive-extract-advanced-options.page:58(page/p) -#, fuzzy #| msgid "You can specify in the file chooser dialog whether you want:" msgid "You can specify in the file chooser dialog whether you want to:" msgstr "Также можно указать в диалоговом окне выбора файлов, нужно ли:" #: C/archive-extract-advanced-options.page:61(item/title) -msgid "Re-create folders" -msgstr "Воссоздавать каталоги" +msgid "Keep directory structure" +msgstr "Сохранять структуру каталогов" #: C/archive-extract-advanced-options.page:62(item/p) -#, fuzzy #| msgid "" #| "Tick this option if you want to keep the directory structure, as it was " #| "in your archive" @@ -515,57 +453,26 @@ "Tick this option if you want to keep the directory structure as it is in " "your archive." msgstr "" -"Включите эту опцию, если нужно сохранить структуру каталогов такой, какой " -"она была в архиве" +"Включите этот параметр, если вы хотите сохранить структуру каталогов в том " +"виде, в каком она хранилась архиве." #: C/archive-extract-advanced-options.page:66(item/title) -msgid "Overwrite existing files" -msgstr "Перезаписывать существующие файлы" - -#: C/archive-extract-advanced-options.page:67(item/p) -#, fuzzy -#| msgid "" -#| "If your archive contains files with the same name as those in the " -#| "destination folder, then File Roller will overwrite them " -#| "during extraction if this option is enabled" -msgid "" -"If your archive contains files with the same name as those in the " -"destination folder, then Archive Manager will overwrite them " -"during extraction if this option is enabled." -msgstr "" -"Если архив содержит файлы с именами, которые уже есть в целевой папке, то " -"File Roller перезапишет существующие файлы во время распаковки, " -"если эта опция включена" - -#: C/archive-extract-advanced-options.page:72(item/title) -msgid "Do not extract older files" +#| msgid "Do not extract older files" +msgid "Do not overwrite newer files" msgstr "Пропускать устаревшие файлы" -#: C/archive-extract-advanced-options.page:73(item/p) +#: C/archive-extract-advanced-options.page:67(item/p) msgid "" "This option will not overwrite existing files with the same name, which have " "a more recent modification date than those which are in the archive." msgstr "" -"При включении этой опции не будут перезаписываться существующие файлы с теми " -"же именами, если они имеют более свежую дату изменения, чем содержащиеся в " -"архиве." +"При включении этого параметра существующие файлы не будут перезаписываться, " +"если они имеют более свежую дату изменения, чем содержащиеся в архиве." -#: C/archive-extract-advanced-options.page:79(page/p) +#: C/archive-extract-advanced-options.page:73(page/p) msgid "These Actions are listed at the bottom of the dialog." msgstr "Данные опции перечислены в нижней части диалогового окна." -#: C/archive-extract-advanced-options.page:82(note/p) -#, fuzzy -#| msgid "" -#| "The option Do not extract older files is only avaiable when " -#| "the option Overwrite existing files has been enabled." -msgid "" -"The option Do not extract older files is only available when the " -"option Overwrite existing files has been enabled." -msgstr "" -"Опция Пропускать устаревшие файлы доступна только если включена " -"опция Перезаписывать существующие файлы." - #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to #. update your localized copy. The msgstr is not used at all. Set it to @@ -588,24 +495,20 @@ msgstr "Открытие архива" #: C/archive-open.page:25(page/p) -#, fuzzy #| msgid "" #| "Open an existing archive with File Roller in the following " #| "ways:" msgid "You can open an existing archive with Archive Manager by:" msgstr "" -"Чтобы открыть существующий архив в File Roller, выполните " +"Чтобы открыть существующий архив в Менеджере архивов, выполните " "следующее:" #: C/archive-open.page:29(item/p) -#, fuzzy #| msgid "Click on the Open toolbar button." msgid "clicking the Open toolbar button" -msgstr "" -"Нажмите на кнопку Открыть на панели инструментов." +msgstr "нажмите кнопку Открыть в панели инструментов" #: C/archive-open.page:32(item/p) -#, fuzzy #| msgid "" #| "Click Archive Open…" @@ -613,20 +516,16 @@ "clicking Archive Open" msgstr "" -"Выберите Архив Открыть…" +"выберите Архив Открыть" #: C/archive-open.page:37(page/p) -#, fuzzy #| msgid "" #| "You may also use the Open Recent option in the following ways:" msgid "You may also use the Open Recent option by:" -msgstr "" -"Также можно воспользоваться командой Открыть недавние одним из " -"следующих способов:" +msgstr "Также можно воспользоваться функцией Открыть недавние:" #: C/archive-open.page:41(item/p) -#, fuzzy #| msgid "" #| "Click the Open a recently used archive toolbar " @@ -636,12 +535,11 @@ "roller-open-recent.png\"> Open a recently used archive toolbar " "button and selecting a file" msgstr "" -"Нажмите кнопку панели инструментов Открыть недавно использованный " -"архив и выберите файл." +"архив и выберите файл" #: C/archive-open.page:46(item/p) -#, fuzzy #| msgid "" #| "Click Archive Open Recent to see the list of recently used archives." @@ -649,12 +547,11 @@ "clicking Archive Open Recent to see the list of recently used archives" msgstr "" -"Выберите Архив Архив Открыть недавние, чтобы увидеть список недавно " -"использованных архивов." +"использованных архивов" #: C/archive-open.page:53(note/p) -#, fuzzy #| msgid "" #| "If File Roller cannot open your recently used archive, and " #| "shows the error message The file doesn't exist, it may be that " @@ -666,10 +563,10 @@ "the location of the archive file has changed. You can try using the " "Open option to search for it." msgstr "" -"Если File Roller не сможет открыть недавно использованный архив, " -"он покажет сообщение об ошибке «Архив не найден». Причина может " -"быть в изменении местоположения файла архива. В таком случае выберите " -"Открыть, чтобы найти его." +"Если Менеджер архивов не сможет открыть недавно использованный " +"архив, он покажет сообщение об ошибке «Файл не существует». " +"Причина может быть в изменении местоположения файла архива. В таком случае " +"выберите Открыть, чтобы найти файл." #: C/archive-view.page:20(info/desc) msgid "View an existing archive and its content." @@ -680,7 +577,6 @@ msgstr "Просмотр архива" #: C/archive-view.page:25(page/p) -#, fuzzy #| msgid "There are two ways of viewing the archive:" msgid "There are two ways to view an archive:" msgstr "Существует два режима просмотра архива:" @@ -690,7 +586,6 @@ msgstr "Просмотр всех файлов" #: C/archive-view.page:30(item/p) -#, fuzzy #| msgid "" #| "To use this view, click View View All Files. File Roller will " @@ -702,14 +597,12 @@ "the archive. You will see their names, sizes, types, dates of the last " "modification and locations." msgstr "" -"Чтобы использовать этот режим, выберите Вид Показывать всё содержимое. " -"File Roller покажет список всех файлов, содержащихся в архиве. " -"Будут отображены их имена, размеры, типы, местоположения и даты последнего " -"изменения." +"Выберите Вид Показывать всё содержимое. Менеджер архивов " +"покажет список всех файлов, содержащихся в архиве. Будут показаны их имена, " +"размеры, типы, местоположения и даты последнего изменения." #: C/archive-view.page:35(note/p) -#, fuzzy #| msgid "" #| "You may use these column headings mentioned above (name, size…) to sort " #| "the files in your archive. Do this by clicking on them, and click the " @@ -720,8 +613,8 @@ "in reverse order." msgstr "" "Вышеуказанные заголовки столбцов (имя, размер…) можно использовать для " -"сортировки файлов в архиве. Для этого нажмите на заголовок. Также, чтобы " -"выполнить сортировку в обратном порядке, нажмите по нему ещё раз." +"сортировки файлов в архиве. Для этого нажмите на заголовок. Чтобы выполнить " +"сортировку в обратном порядке, нажмите по нему ещё раз." #: C/archive-view.page:41(item/title) msgid "View as a folder" @@ -738,7 +631,6 @@ "style=\"menuitem\">Показывать текущую папку." #: C/archive-view.page:46(note/p) -#, fuzzy #| msgid "" #| "While viewing your archive in this way, press F9, or click " #| "View FoldersF9 или выберите " -"Вид Дерево папок. В боковой панели будет отображена древовидная структура " -"папок, позволяющая легко перемещаться между отдельными папками." +"Вид Папки. В боковой панели будет отображена древовидная структура папок, " +"позволяющая легко перемещаться между отдельными папками." #: C/archive-view.page:56(section/title) msgid "Open files in your archive" msgstr "Открытие файлов в архиве" #: C/archive-view.page:57(section/p) -#, fuzzy #| msgid "" #| "Open files, which are in you archive by double-clicking the file name, or " #| "right-click on the file name and select Open. File " @@ -774,33 +665,31 @@ msgstr "" "Чтобы открыть содержащиеся в архиве файлы, выполните двойной щелчок на имени " "файла или щёлкните правой кнопкой на имени файла и выберите Открыть. File Roller откроет файл в приложении, используемом по " +"gui>. Менеджер архивов откроет файл в приложении, используемом по " "умолчанию для данного типа файла." #: C/archive-view.page:63(note/p) -#, fuzzy #| msgid "Open the file with different application by following these steps:" msgid "Open the file with a different application by following these steps:" msgstr "Открыть файл в другом приложении можно следующим образом:" #: C/archive-view.page:66(item/p) -#, fuzzy #| msgid "Right-click on the archive in a file manager window." msgid "Right click on the file." -msgstr "Нажмите правой кнопкой мыши на архиве в окне менеджера файлов." +msgstr "Щёлкните правой кнопкой мыши по файлу." #: C/archive-view.page:69(item/p) -#, fuzzy #| msgid "Click Open With…" msgid "Click Open With." -msgstr "Нажмите кнопку Открыть с помощью…" +msgstr "Нажмите кнопку Открыть с помощью." #: C/archive-view.page:72(item/p) -#, fuzzy #| msgid "Select the files that you want to delete." msgid "" "Select the application that you want to use and click Select." -msgstr "Выберите файлы, которые Вы хотите удалить." +msgstr "" +"Выберите приложение, которое хотите использовать, и нажмите Выбрать." #. This is a reference to an external file such as an image or video. When #. the file changes, the md5 hash will change to let you know you need to @@ -816,18 +705,16 @@ "md5='133c50bfcf2ac220d3c2c61180f339db'" #: C/introduction.page:20(info/desc) -#, fuzzy #| msgid "" #| "Introduction to the File Roller archive managing application." msgid "Introduction to the GNOME Archive Manager." -msgstr "Введение в приложение управления архивами File Roller." +msgstr "Введение в Менеджер архивов GNOME." #: C/introduction.page:23(page/title) msgid "Introduction" msgstr "Введение" #: C/introduction.page:25(page/p) -#, fuzzy #| msgid "" #| "File Roller is an application for managing archives, designed " #| "to be easy to use. It provides all the tools necessary for creating, " @@ -838,12 +725,12 @@ "easy to use. Archive Manager provides all the tools that are " "necessary for creating, modifying and extracting archives." msgstr "" -"File Roller — это простое в использовании приложение для " -"управления архивами. Оно предоставляет все необходимые инструменты для " +"Менеджер архивов — это простое приложение для управления " +"архивными файлами, например, .zip или .tar. " +"Менеджер архивов предоставляет все необходимые инструменты для " "создания, изменения архивов, а также извлечения из них данных." #: C/introduction.page:31(note/p) -#, fuzzy #| msgid "" #| "An archive is composed of one or more files, along with metadata. It may " #| "be encrypted in part or as a whole. By collecting multiple data files " @@ -855,68 +742,59 @@ "storing data and transferring it between computers as they allow you to " "collect multiple files into one." msgstr "" -"Архив состоит из одного или нескольких файлов, а также из метаданных. Архив " -"может быть частично или полностью зашифрован. Архивные файлы удобно " +"Архив состоит из одного или нескольких файлов, папок, а также из метаданных. " +"Архив может быть частично или полностью зашифрован. Архивные файлы удобно " "использовать для хранения и передачи данных между компьютерами." #: C/introduction.page:37(page/p) -#, fuzzy #| msgid "With File Roller you can:" msgid "With Archive Manager you can:" -msgstr "С помощью File Roller можно:" +msgstr "С помощью Менеджера архивов можно:" #: C/introduction.page:39(item/p) -#, fuzzy #| msgid "Create a new archive" msgid "create a new archive" -msgstr "Создать новый архив" +msgstr "создавать новые архивы;" #: C/introduction.page:40(item/p) -#, fuzzy #| msgid "View the content of the existing archive" msgid "view the content of an existing archive" -msgstr "Просматривать содержимое существующего архива" +msgstr "просматривать содержимое существующего архива;" #: C/introduction.page:41(item/p) -#, fuzzy #| msgid "View a file contained in the archive" msgid "view a file contained in an archive" -msgstr "Просматривать файлы, содержащиеся в архиве" +msgstr "просматривать файлы, содержащиеся в архиве;" #: C/introduction.page:42(item/p) -#, fuzzy #| msgid "Modify existing archives" msgid "modify existing archives" -msgstr "Изменять существующие архивы" +msgstr "изменять существующие архивы;" #: C/introduction.page:43(item/p) -#, fuzzy #| msgid "Extract files from archive" msgid "extract files from an archive" -msgstr "Извлекать файлы из архива" +msgstr "извлекать файлы из архива." #: C/introduction.page:47(figure/title) msgid "Viewing an archive with Archive Manager" -msgstr "" +msgstr "Просмотр архива в Менеджере архивов" #: C/introduction.page:49(media/p) -#, fuzzy #| msgid "Screenshot of the File Roller main window." msgid "Screenshot of the Archive Manager main window." -msgstr "Снимок главного окна File Roller" +msgstr "Снимок главного окна Менеджера архивов." #: C/keyboard-shortcuts.page:20(info/desc) -#, fuzzy #| msgid "The list of shortcuts in File Roller." msgid "The list of shortcuts in Archive Manager." -msgstr "Список комбинаций клавиш в File Roller." +msgstr "Список комбинаций клавиш в Менеджере архивов." #: C/keyboard-shortcuts.page:23(page/title) msgid "Keyboard shortcuts" msgstr "Комбинации клавиш" #: C/keyboard-shortcuts.page:25(page/p) -#, fuzzy #| msgid "" #| "Using keyboard shortcuts can help speed up work-flow. In the table below " #| "is a list of shortcuts which can be used in File Roller." @@ -925,8 +803,8 @@ "a list of shortcuts which can be used in Archive Manager." msgstr "" "Использование комбинаций клавиш может помочь ускорить работу. В таблице ниже " -"приведён список комбинаций клавиш, который можно использовать в File " -"Roller." +"приведён список комбинаций клавиш, который можно использовать в " +"Менеджере архивов." #: C/keyboard-shortcuts.page:30(td/p) msgid "Create new archive" @@ -950,11 +828,11 @@ #: C/keyboard-shortcuts.page:43(td/p) msgid "AltReturn" -msgstr "" +msgstr "AltEnter" #: C/keyboard-shortcuts.page:46(td/p) msgid "Close" -msgstr "Close" +msgstr "Закрыть" #: C/keyboard-shortcuts.page:47(td/p) msgid "CtrlW" @@ -1065,10 +943,9 @@ msgstr "CtrlR" #: C/keyboard-shortcuts.page:102(td/p) -#, fuzzy #| msgid "View help content" msgid "View help" -msgstr "Показать содержание справки" +msgstr "Открыть справку" #: C/keyboard-shortcuts.page:103(td/p) msgid "F1" @@ -1090,9 +967,13 @@ "\"http://library.gnome.org/users/gnome-help/stable/user-goodpassword.html\" " "xref=\"help:gnome-help/user-goodpassword\">good password." msgstr "" +"Вы можете зашифровать архив с помощью пароля, чтобы к архиву могли получить " +"доступ только вы и те люди, которым вы дадите пароль. Учтите, что пароль " +"может быть угадан, поэтому для большей безопасности используйте стойкий пароль." #: C/password-protection.page:33(note/p) -#, fuzzy #| msgid "" #| "File Roller allows you to encrypt an archive with a password " #| "only in specific circumstances." @@ -1100,8 +981,8 @@ "Archive Manager allows you to encrypt an archive with a password " "only in specific circumstances." msgstr "" -"File Roller позволяет зашифровать архив с использованием пароля " -"лишь в определённых случаях." +"Менеджер архивов позволяет зашифровать архив с использованием " +"пароля лишь в определённых случаях." #: C/password-protection.page:37(page/p) msgid "" @@ -1110,13 +991,11 @@ "Чтобы задать пароль шифрования данных в новом архиве, выполните следующее:" #: C/password-protection.page:42(item/p) -#, fuzzy #| msgid "Start creating a new archive" msgid "Start creating a new archive." -msgstr "Начните создание нового архива" +msgstr "Начните создание нового архива." #: C/password-protection.page:45(item/p) -#, fuzzy #| msgid "" #| "At the bottom of this dialog you can choose the File Format " #| "and Other Options, where you can set a password" @@ -1126,10 +1005,9 @@ "Options." msgstr "" "Внизу этого диалогового окна можно выбрать Формат файла и " -"Другие параметры, где можно задать пароль" +"Другие параметры, где можно задать пароль." #: C/password-protection.page:49(note/p) -#, fuzzy #| msgid "" #| "You may not be able to type password, because File Roller does " #| "not allow this option to be used for all types of archive files, so it is " @@ -1139,31 +1017,28 @@ "support encryption, so it is better to choose a file format before setting a " "password." msgstr "" -"Поле ввода пароля может оказаться недоступным, так как File Roller поддерживает эту возможность не для всех типов архивных файлов. Поэтому " -"лучше выбрать формат файла перед установкой пароля." +"Поле ввода пароля может оказаться недоступным, так как эта возможность " +"поддерживается не для всех типов архивных файлов. Поэтому лучше выбрать " +"формат файла перед установкой пароля." #: C/password-protection.page:55(item/p) -#, fuzzy #| msgid "" #| "Continue with creating a new archive" msgid "" "Continue with creating a new archive." msgstr "" -"Продолжайте создание нового архива" +"Продолжайте создание нового архива." #: C/password-protection.page:60(page/p) msgid "Protect an existing archive by setting a password:" msgstr "Защита уже существующего архива установкой пароля:" #: C/password-protection.page:63(item/p) -#, fuzzy #| msgid "Open an archive" msgid "Open an archive." -msgstr "Откройте архив" +msgstr "Откройте архив." #: C/password-protection.page:66(item/p) -#, fuzzy #| msgid "" #| "Click Edit Password…" @@ -1172,13 +1047,12 @@ "\">Password." msgstr "" "Выберите Правка Пароль…" +"\">Пароль." #: C/password-protection.page:70(item/p) -#, fuzzy #| msgid "Type password into the password field" msgid "Type a password into the password field." -msgstr "Введите пароль в поле ввода пароля" +msgstr "Введите пароль в поле ввода пароля." #: C/password-protection.page:72(note/p) msgid "" @@ -1189,13 +1063,11 @@ "зашифровать список файлов." #: C/password-protection.page:77(item/p) -#, fuzzy #| msgid "Click OK to continue" msgid "Click OK to continue." -msgstr "Нажмите кнопку OK для продолжения" +msgstr "Нажмите кнопку OK для продолжения." #: C/password-protection.page:79(note/p) -#, fuzzy #| msgid "" #| "File Roller will encrypt only new files which will be added to " #| "the archive!" @@ -1203,25 +1075,24 @@ "Archive Manager will encrypt only new files which will be added " "to the archive!" msgstr "" -"File Roller зашифрует только новые файлы, которые будут добавлены " -"в архив!" +"Менеджер архивов зашифрует только новые файлы, которые будут " +"добавлены в архив!" #: C/supported-formats.page:20(info/desc) -#, fuzzy #| msgid "File Roller has the ability to use various file formats." msgid "" "Archive Manager works with a number of different file formats." -msgstr "File Roller может использовать различные форматы файлов." +msgstr "" +"Менеджер архивов может использовать различные форматы файлов." #: C/supported-formats.page:23(page/title) msgid "Supported file formats" msgstr "Поддерживаемые форматы файлов" #: C/supported-formats.page:25(page/p) -#, fuzzy #| msgid "The formats support by File Roller include:" -msgid "File formats that are support by Archive Manager include:" -msgstr "Форматы, поддерживаемые File Roller:" +msgid "File formats that are supported by Archive Manager include:" +msgstr "Форматы, поддерживаемые Менеджером архивов:" #: C/supported-formats.page:28(item/p) msgid "Archive only" @@ -1296,7 +1167,6 @@ msgstr "Сжатый архив ZOO (.zoo)" #: C/supported-formats.page:59(note/p) -#, fuzzy #| msgid "" #| "For some file formats, File Roller may require additional " #| "plugins." @@ -1304,19 +1174,18 @@ "For some file formats, Archive Manager may require additional " "plugins." msgstr "" -"Для некоторых форматов файлов File Roller могут потребоваться " -"дополнительные модули." +"Для некоторых форматов файлов Менеджеру архивов могут " +"потребоваться дополнительные модули." #: C/test-integrity.page:20(info/desc) msgid "Check the archive for errors." -msgstr "" +msgstr "Проверка архива на ошибки." #: C/test-integrity.page:23(page/title) msgid "Test integrity" msgstr "Проверка целостности" #: C/test-integrity.page:25(page/p) -#, fuzzy #| msgid "" #| "File Roller allows you to check whether the compressed data in " #| "an archive contains any errors. Do this by clicking Archive Test Integrity." msgstr "" -"File Roller позволяет проверить, содержат ли сжатые данные в " +"Менеджер архивов позволяет проверить, содержат ли сжатые данные в " "архиве какие-либо ошибки. Для этого выберите АрхивПроверить целостность." @@ -1345,14 +1214,13 @@ #: C/troubleshooting-archive-open.page:22(info/desc) msgid "I cannot open an archive." -msgstr "Я не могу открыть архив." +msgstr "Не получается открыть архив." #: C/troubleshooting-archive-open.page:25(page/title) msgid "Problem opening an archive" msgstr "Проблема с открытием архива" #: C/troubleshooting-archive-open.page:27(page/p) -#, fuzzy #| msgid "" #| "If you cannot open an existing archive with File Roller, check " #| "the format of your file. Some types of archive may require additional " @@ -1364,13 +1232,12 @@ "plugins; the installation process for these varies between different " "distributions." msgstr "" -"Если не удаётся открыть существующий архив в File Roller, " +"Если не удаётся открыть существующий архив в Менеджере архивов, " "проверьте формат файла. Для некоторых типов архивов могут потребоваться " "дополнительные модули, процесс установки которых может отличаться в " "различных дистрибутивах." #: C/troubleshooting-archive-open.page:33(note/p) -#, fuzzy #| msgid "" #| "If File Roller cannot open a recently used archive, it may be " #| "that the location of this archive file has changed. See the help page " @@ -1382,21 +1249,20 @@ "opening an archive for further " "information." msgstr "" -"Если File Roller не может открыть недавно использовавшийся архив, " -"возможно, причина в том, что изменилось местоположение этого архива. Для " -"получения дополнительной информации смотрите страницу об открытии архива." +"Если Менеджер архивов не может открыть недавно использовавшийся " +"архив, возможно, причина в том, что изменилось местоположение этого архива. " +"Для получения дополнительной информации см. открытие архива." #: C/troubleshooting-password.page:21(info/desc) msgid "I have set a password, but it does not protect the whole archive." -msgstr "Я установил пароль, но он защищает не весь архив." +msgstr "Установленный парль защищает не весь архив." #: C/troubleshooting-password.page:25(page/title) msgid "Problem setting a password" msgstr "Проблема с установкой пароля" #: C/troubleshooting-password.page:27(page/p) -#, fuzzy #| msgid "" #| "File Roller does not ensure password protection for an " #| "existing archive. While working with such an archive, you can only set a " @@ -1408,10 +1274,41 @@ "newly added files. To do this, follow instructions on Password protection page." msgstr "" -"File Roller не обеспечивает защиту паролем для уже существующего " -"архива. При работе с такими архивами можно лишь задать пароль для вновь " +"Менеджер архивов не обеспечивает защиту паролем уже существующий " +"архив. При работе с такими архивами можно лишь задать пароль для вновь " "добавляемых файлов. Чтобы сделать это, следуйте инструкциям на странице " -"Защита паролем." +"защита паролем." + +#~ msgid "Re-create folders" +#~ msgstr "Воссоздавать каталоги" + +#~ msgid "Overwrite existing files" +#~ msgstr "Перезаписывать существующие файлы" + +#, fuzzy +#~| msgid "" +#~| "If your archive contains files with the same name as those in the " +#~| "destination folder, then File Roller will overwrite them " +#~| "during extraction if this option is enabled" +#~ msgid "" +#~ "If your archive contains files with the same name as those in the " +#~ "destination folder, then Archive Manager will overwrite them " +#~ "during extraction if this option is enabled." +#~ msgstr "" +#~ "Если архив содержит файлы с именами, которые уже есть в целевой папке, то " +#~ "File Roller перезапишет существующие файлы во время " +#~ "распаковки, если эта опция включена" + +#, fuzzy +#~| msgid "" +#~| "The option Do not extract older files is only avaiable when " +#~| "the option Overwrite existing files has been enabled." +#~ msgid "" +#~ "The option Do not extract older files is only available when " +#~ "the option Overwrite existing files has been enabled." +#~ msgstr "" +#~ "Опция Пропускать устаревшие файлы доступна только если " +#~ "включена опция Перезаписывать существующие файлы." #~ msgid "Add files" #~ msgstr "Добавление файлов" diff -Nru file-roller-3.6.0/help/ru/supported-formats.page file-roller-3.6.3/help/ru/supported-formats.page --- file-roller-3.6.0/help/ru/supported-formats.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/supported-formats.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,7 +16,7 @@

Creative Commons Share Alike 3.0

 - Archive Manager works with a number of different file formats. + Менеджер архивов может использовать различные форматы файлов. Юрий Мясоедов @@ -39,7 +39,7 @@ Поддерживаемые форматы файлов -

File formats that are supported by Archive Manager include:

+

Форматы, поддерживаемые Менеджером архивов:

Несжатые архивы

@@ -73,8 +73,7 @@ -

For some file formats, Archive Manager may require additional - plugins.

+

Для некоторых форматов файлов Менеджеру архивов могут потребоваться дополнительные модули.

 diff -Nru file-roller-3.6.0/help/ru/test-integrity.page file-roller-3.6.3/help/ru/test-integrity.page --- file-roller-3.6.0/help/ru/test-integrity.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/test-integrity.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,7 +16,7 @@

Creative Commons Share Alike 3.0

 - Check the archive for errors. + Проверка архива на ошибки. Юрий Мясоедов @@ -39,9 +39,7 @@ Проверка целостности -

Archive Manager allows you to check whether the compressed data - in an archive contains any errors. Do this by clicking Archive Test - Integrity.

+

Менеджер архивов позволяет проверить, содержат ли сжатые данные в архиве какие-либо ошибки. Для этого выберите АрхивПроверить целостность.

Откроется диалоговое окно Результаты проверки со списком проверенных файлов и итогами проверки внизу.

diff -Nru file-roller-3.6.0/help/ru/troubleshooting-archive-open.page file-roller-3.6.3/help/ru/troubleshooting-archive-open.page --- file-roller-3.6.0/help/ru/troubleshooting-archive-open.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/troubleshooting-archive-open.page 2012-11-27 20:27:02.000000000 +0000 @@ -18,7 +18,7 @@

Creative Commons Share Alike 3.0

 - Я не могу открыть архив. + Не получается открыть архив. Юрий Мясоедов @@ -41,16 +41,10 @@ Проблема с открытием архива -

If you cannot open an existing archive with Archive Manager, - check the format of your file. Some types of archive may require additional - plugins; the installation process for these varies between different - distributions.

+

Если не удаётся открыть существующий архив в Менеджере архивов, проверьте формат файла. Для некоторых типов архивов могут потребоваться дополнительные модули, процесс установки которых может отличаться в различных дистрибутивах.

-

If Archive Manager cannot open a recently used archive, it - may be that the location of this archive file has changed. See the help - page about opening an archive for further - information.

+

Если Менеджер архивов не может открыть недавно использовавшийся архив, возможно, причина в том, что изменилось местоположение этого архива. Для получения дополнительной информации см. открытие архива.

 diff -Nru file-roller-3.6.0/help/ru/troubleshooting-password.page file-roller-3.6.3/help/ru/troubleshooting-password.page --- file-roller-3.6.0/help/ru/troubleshooting-password.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/ru/troubleshooting-password.page 2012-11-27 20:27:02.000000000 +0000 @@ -17,7 +17,7 @@

Creative Commons Share Alike 3.0

 - Я установил пароль, но он защищает не весь архив. + Установленный парль защищает не весь архив. Юрий Мясоедов @@ -40,8 +40,6 @@ Проблема с установкой пароля -

Archive Manager does not add password protection for an - existing archive. While working with such an archive, you can only set a - password for newly added files. To do this, follow instructions on Password protection page.

+

Менеджер архивов не обеспечивает защиту паролем уже существующий архив. При работе с такими архивами можно лишь задать пароль для вновь добавляемых файлов. Чтобы сделать это, следуйте инструкциям на странице защита паролем.

diff -Nru file-roller-3.6.0/help/sl/archive-create.page file-roller-3.6.3/help/sl/archive-create.page --- file-roller-3.6.0/help/sl/archive-create.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/archive-create.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,13 +16,12 @@

Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0

 - Add files or folders to a new archive. + Dodajte datoteke ali mape v nov arhiv. Ustvarjanje novega arhiva -

Create a new archive with Archive Manager by following these - steps:

+

Z Upravljalnikom arhivov lahko ustvarite nov arhiv z naslednjimi koraki:

@@ -54,9 +53,9 @@

Ko dodate mapo v arhiv, vam bodo ponujene nekatere možnosti:

-

Whether to include subfolders or not.

 -

Choose which files should be included.

 -

Select which subfolders or files are to be excluded.

 +

Ali naj bodo podmape vključene ali ne.

 +

Izberite, katere datoteke želite vključiti.

 +

Izberite, katere podmape ali datoteke želite izključiti.

Not all archive file formats support folders — if the file format that you are using does not, you will not be warned. If the file format diff -Nru file-roller-3.6.0/help/sl/archive-edit.page file-roller-3.6.3/help/sl/archive-edit.page --- file-roller-3.6.0/help/sl/archive-edit.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/archive-edit.page 2012-11-27 20:27:02.000000000 +0000 @@ -45,11 +45,8 @@ Preimenovanje datotek

Izbor datoteke.

 -

Click Edit - Rename, or right-click on the - selected file, and choose Rename.

 -

Enter the new file name into the dialog which has - opened.

 +

Kliknite UrediPreimenuj … ali desno kliknite izbrano datoteko in izberite Preimenuj …

 +

Odprlo se bo pogovorno okno. Vnesite novo ime datoteke v polje vnosa besedila.

Potrditev ime s klikom na Preimenuj.

 diff -Nru file-roller-3.6.0/help/sl/archive-extract-advanced-options.page file-roller-3.6.3/help/sl/archive-extract-advanced-options.page --- file-roller-3.6.0/help/sl/archive-extract-advanced-options.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/archive-extract-advanced-options.page 2012-11-27 20:27:02.000000000 +0000 @@ -28,11 +28,11 @@ - <gui>All files</gui> + <gui>Vse datoteke</gui>

All the files and folders in the archive will be extracted.

 - <gui>Selected files</gui> + <gui>Izbrane datoteke</gui>

Archive Manager extracts only the selected files.

You need to select the files that you wish to extract before before @@ -43,7 +43,7 @@ - <gui>Files</gui> + <gui>Datoteke</gui>

You can type in the names of the files that you want to extract. Separate individual files using a semicolon (;)

@@ -54,7 +54,7 @@ -

You can specify in the file chooser dialog whether you want to:

+

V pogovornem oknu izbirnika datotek lahko določite, kaj želite:

<gui>Keep directory structure</gui> diff -Nru file-roller-3.6.0/help/sl/archive-extract.page file-roller-3.6.3/help/sl/archive-extract.page --- file-roller-3.6.0/help/sl/archive-extract.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/archive-extract.page 2012-11-27 20:27:02.000000000 +0000 @@ -19,7 +19,7 @@

Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0

 - Extract files or folders from your archive. + Razširite datoteke ali mape iz arhiva. Razširi arhiv @@ -37,8 +37,7 @@ in the toolbar button.

 -

Choose where you want the archive to be extracted to in the file - chooser. This will be the destination folder.

+

V izbirniku datotek izberite mesto, kamor naj bodo razširjene datoteke. To bo ciljna mapa.

See advanced options for extracting archives for more extraction options.

@@ -57,14 +56,14 @@

Program vam bo v novem oknu pokazal vrstico napredka. Če je razširjanje uspešno boste imeli na voljo naslednje možnosti:

-

Quit to close Archive Manager.

+

Končaj - ta možnost zapre Upravljalnik arhivov.

Show the files to view the destination folder with Files.

 -

Close the dialog.

+

Zaprite pogovorno okno.

 diff -Nru file-roller-3.6.0/help/sl/archive-open.page file-roller-3.6.3/help/sl/archive-open.page --- file-roller-3.6.0/help/sl/archive-open.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/archive-open.page 2012-11-27 20:27:02.000000000 +0000 @@ -21,15 +21,14 @@ Odpri arhiv -

You can open an existing archive with Archive Manager by:

+

Obstoječi arhiv lahko z Upravljalnikom arhivov odprete na naslednje načine:

-

clicking the Open toolbar button

+

s klikom gumba Odpri v orodni vrstici ali

 -

clicking Archive - Open

+

s klikom ArhivOdpri …

 diff -Nru file-roller-3.6.0/help/sl/archive-view.page file-roller-3.6.3/help/sl/archive-view.page --- file-roller-3.6.0/help/sl/archive-view.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/archive-view.page 2012-11-27 20:27:02.000000000 +0000 @@ -21,7 +21,7 @@ Ogled arhiva -

There are two ways to view an archive:

+

Obstajata dva vrsta ogleda arhiva:

diff -Nru file-roller-3.6.0/help/sl/index.page file-roller-3.6.3/help/sl/index.page --- file-roller-3.6.0/help/sl/index.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/index.page 2012-11-27 20:27:02.000000000 +0000 @@ -1,7 +1,7 @@ - Archive Manager Help + Pomoč za upravljalnik arhivov
Upravljanje arhivov diff -Nru file-roller-3.6.0/help/sl/introduction.page file-roller-3.6.3/help/sl/introduction.page --- file-roller-3.6.0/help/sl/introduction.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/introduction.page 2012-11-27 20:27:02.000000000 +0000 @@ -33,17 +33,17 @@ you to collect multiple files into one.

-

With Archive Manager you can:

+

Z Upravljalnikom arhivov lahko:

-

create a new archive

 -

view the content of an existing archive

 -

view a file contained in an archive

 -

modify existing archives

 -

extract files from an archive

 +

Ustvarite nov arhiv

 +

Oglejte si vsebino obstoječega arhiva

 +

si ogledate datoteko, ki je v arhivu,

 +

spremenite obstoječe arhive,

 +

razširite datoteke iz arhiva.
- Viewing an archive with <gui>Archive Manager</gui> + Ogledovanje arhiva z <gui>Upravljalnikom arhivov</gui>

Screenshot of the Archive Manager main window.

 diff -Nru file-roller-3.6.0/help/sl/keyboard-shortcuts.page file-roller-3.6.3/help/sl/keyboard-shortcuts.page --- file-roller-3.6.0/help/sl/keyboard-shortcuts.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/keyboard-shortcuts.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,7 +16,7 @@

Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0

 - The list of shortcuts in Archive Manager. + Seznam bližnjic v Upravljalniku datotek. Tipkovne bližnjice diff -Nru file-roller-3.6.0/help/sl/password-protection.page file-roller-3.6.3/help/sl/password-protection.page --- file-roller-3.6.0/help/sl/password-protection.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/password-protection.page 2012-11-27 20:27:02.000000000 +0000 @@ -37,7 +37,7 @@ -

Start creating a new archive.

+

Začnite z ustvarjanjem novega arhiva.

At the bottom of the file chooser dialog you can choose a @@ -50,27 +50,26 @@ -

Continue with creating a new - archive.

+

Nadaljujte z ustvarjanjem novega arhiva.

Zaščita obstoječega arhiva z nastavitvijo gesla:

-

Open an archive.

+

Odprite arhiv.

Click EditPassword.

 -

Type a password into the password field.

+

Vnesite geslo v polje gesla.

Če želite seznam datotek šifrirani, izberite Šifriraj tudi seznam datotek.

 -

Click OK to continue.

+

Za nadaljevanje kliknite V redu.

Archive Manager will encrypt only new files which will be added to the archive!

diff -Nru file-roller-3.6.0/help/sl/sl.po file-roller-3.6.3/help/sl/sl.po --- file-roller-3.6.0/help/sl/sl.po 2012-04-16 19:15:56.000000000 +0000 +++ file-roller-3.6.3/help/sl/sl.po 2012-10-12 15:49:49.000000000 +0000 @@ -7,9 +7,9 @@ msgid "" msgstr "" "Project-Id-Version: file-roller help master\n" -"POT-Creation-Date: 2012-04-01 07:29+0000\n" -"PO-Revision-Date: 2012-04-09 13:00+0200\n" -"Last-Translator: Andrej Žnidaršič \n" +"POT-Creation-Date: 2012-09-15 15:36+0000\n" +"PO-Revision-Date: 2012-10-07 23:16+0100\n" +"Last-Translator: filmsi\n" "Language-Team: Slovenian GNOME Translation Team \n" "Language: \n" "MIME-Version: 1.0\n" @@ -20,912 +20,1104 @@ "X-Poedit-Language: Slovenian\n" "X-Poedit-SourceCharset: utf-8\n" -#: C/troubleshooting-password.page:8(desc) -msgid "I have set a password, but it does not protect the whole archive." -msgstr "Nastavil sem geslo, a ne zaščiti celotnega arhiva." +#: C/index.page:5(page/title) +#| msgid "File Roller Archive Manager Help" +msgid "Archive Manager Help" +msgstr "Pomoč za upravljalnik arhivov" + +#: C/index.page:8(section/title) +msgid "Managing archives" +msgstr "Upravljanje arhivov" + +#: C/index.page:12(section/title) +msgid "Advanced options" +msgstr "Napredne možnosti" + +#: C/index.page:16(section/title) +msgid "Troubleshooting" +msgstr "Odpravljanje težav" + +#. Put one translator per line, in the form NAME , YEAR1, YEAR2 +#| msgid "translator-credits" +msgctxt "_" +msgid "translator-credits" +msgstr "Andrej Žnidaršič " -#: C/troubleshooting-password.page:10(name) -#: C/troubleshooting-archive-open.page:11(name) -#: C/test-integrity.page:9(name) -#: C/supported-formats.page:9(name) -#: C/password-protection.page:11(name) -#: C/keyboard-shortcuts.page:9(name) -#: C/introduction.page:10(name) -#: C/archive-view.page:9(name) -#: C/archive-open.page:9(name) -#: C/archive-extract-advanced-options.page:9(name) -#: C/archive-extract.page:12(name) -#: C/archive-edit.page:10(name) -#: C/archive-create.page:9(name) +#: C/archive-create.page:10(credit/name) +#: C/archive-edit.page:11(credit/name) +#: C/archive-extract.page:13(credit/name) +#: C/archive-extract-advanced-options.page:10(credit/name) +#: C/archive-open.page:10(credit/name) +#: C/archive-view.page:10(credit/name) +#: C/introduction.page:10(credit/name) +#: C/keyboard-shortcuts.page:10(credit/name) +#: C/password-protection.page:12(credit/name) +#: C/supported-formats.page:10(credit/name) +#: C/test-integrity.page:10(credit/name) +#: C/troubleshooting-archive-open.page:12(credit/name) +#: C/troubleshooting-password.page:11(credit/name) msgid "Marta Bogdanowicz" msgstr "Marta Bogdanowicz" -#: C/troubleshooting-password.page:11(email) -#: C/troubleshooting-archive-open.page:12(email) -#: C/test-integrity.page:10(email) -#: C/supported-formats.page:10(email) -#: C/password-protection.page:12(email) -#: C/keyboard-shortcuts.page:10(email) -#: C/introduction.page:11(email) -#: C/archive-view.page:10(email) -#: C/archive-open.page:10(email) -#: C/archive-extract-advanced-options.page:10(email) -#: C/archive-extract.page:13(email) -#: C/archive-edit.page:11(email) -#: C/archive-create.page:10(email) -msgid "majus85@gmail.com" -msgstr "majus85@gmail.com" - -#: C/troubleshooting-password.page:14(p) -#: C/troubleshooting-archive-open.page:15(p) -#: C/test-integrity.page:13(p) -#: C/supported-formats.page:13(p) -#: C/password-protection.page:15(p) -#: C/keyboard-shortcuts.page:13(p) -#: C/introduction.page:14(p) -#: C/archive-view.page:13(p) -#: C/archive-open.page:13(p) -#: C/archive-extract-advanced-options.page:13(p) -#: C/archive-extract.page:16(p) -#: C/archive-edit.page:14(p) -#: C/archive-create.page:13(p) +#: C/archive-create.page:14(credit/name) +#: C/archive-edit.page:15(credit/name) +#: C/archive-extract.page:17(credit/name) +#: C/archive-extract-advanced-options.page:14(credit/name) +#: C/archive-open.page:14(credit/name) +#: C/archive-view.page:14(credit/name) +#: C/introduction.page:14(credit/name) +#: C/keyboard-shortcuts.page:14(credit/name) +#: C/password-protection.page:16(credit/name) +#: C/supported-formats.page:14(credit/name) +#: C/test-integrity.page:14(credit/name) +#: C/troubleshooting-archive-open.page:16(credit/name) +#: C/troubleshooting-password.page:15(credit/name) +msgid "Ekaterina Gerasimova" +msgstr "Ekaterina Gerasimova" + +#: C/archive-create.page:18(license/p) +#: C/archive-edit.page:19(license/p) +#: C/archive-extract.page:21(license/p) +#: C/archive-extract-advanced-options.page:18(license/p) +#: C/archive-open.page:18(license/p) +#: C/archive-view.page:18(license/p) +#: C/introduction.page:18(license/p) +#: C/keyboard-shortcuts.page:18(license/p) +#: C/password-protection.page:20(license/p) +#: C/supported-formats.page:18(license/p) +#: C/test-integrity.page:18(license/p) +#: C/troubleshooting-archive-open.page:20(license/p) +#: C/troubleshooting-password.page:19(license/p) msgid "Creative Commons Share Alike 3.0" msgstr "Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0" -#: C/troubleshooting-password.page:18(title) -msgid "Problem setting a password" -msgstr "Težave z nastavljanjem gesla" +#: C/archive-create.page:20(info/desc) +#| msgid "Add files or folders to your new archive." +msgid "Add files or folders to a new archive." +msgstr "Dodajte datoteke ali mape v nov arhiv." -#: C/troubleshooting-password.page:20(p) -msgid "File Roller does not ensure password protection for an existing archive. While working with such an archive, you can only set a password for newly added files. To do this, follow instructions on Password protection page." -msgstr "Upravljalnik arhivov ne zagotavlja zaščite z geslom za obstoječe arhive. Geslo lahko nastavite samo za novo dodane datoteke. Navodila za to lahko najdete na strani zaščita gesla." +#: C/archive-create.page:23(page/title) +msgid "Create a new archive" +msgstr "Ustvarjanje novega arhiva" -#: C/troubleshooting-archive-open.page:9(desc) -msgid "I cannot open an archive." -msgstr "Ne morem odpreti arhiva." +#: C/archive-create.page:25(page/p) +#| msgid "" +#| "Create a new archive with File Roller, by following these " +#| "steps:" +msgid "Create a new archive with Archive Manager by following these steps:" +msgstr "Z Upravljalnikom arhivov lahko ustvarite nov arhiv z naslednjimi koraki:" + +#: C/archive-create.page:30(item/p) +#, fuzzy +#| msgid "" +#| "Click the Create a new archive toolbar button, or click " +#| "ArchiveNew…" +msgid "Click the Create a new archive toolbar button, or click Archive New." +msgstr "Kliknite na gumb orodne vrstice Ustvari nov arhiv ali kliknite ArhivNov…" -#: C/troubleshooting-archive-open.page:19(title) -msgid "Problem opening an archive" -msgstr "Težave z odpiranjem arhiva" +#: C/archive-create.page:35(item/p) +#, fuzzy +#| msgid "" +#| "The file chooser will open. Use it to name your new archive file and " +#| "choose its location, and click Create." +msgid "The file chooser will open: name your new archive file and choose the location for it to be saved to, then click Create to continue." +msgstr "Odprl se bo izbirnik datotek. Uporabite ga za poimenovanje svoje datoteke arhiva in izberite njegovo mesto in kliknite Ustvari." -#: C/troubleshooting-archive-open.page:21(p) -msgid "If you cannot open an existing archive with File Roller, check the format of your file. Some types of archive may require additional plugins, the installation process for these varies between different distributions." -msgstr "Če obstoječega arhiva nočete odpreti z Upravljalnikom datotek, preverite vrsto datoteke. Nekatere vrste arhivov morda zahtevajo dodatne vstavke. Namestitveno opravilo za vstavke je različno za različne distribucije." +#: C/archive-create.page:39(note/p) +#, fuzzy +#| msgid "" +#| "In this dialog you may also choose the type of the file format that you " +#| "want to use, available extensions should be listed below. By clicking " +#| "Other options you can set a password, or split your new " +#| "archive into smaller parts. You should specify the size of the volume in " +#| "MB." +msgid "In this dialog, you may also choose the file format that you want to use: available extensions are listed at the bottom. If you do not choose a file format, the new archive will be a tar.gz." +msgstr "V tem pogovornem oknu lahko izberete vrsto datoteke, ki jo želite uporabite. Razpoložljive razširitve bi morale biti izpisane spodaj. S klikom na Druge možnosti lahko nastavite geslo ali razdelite nov arhiv v manjše datoteke. Velikost nosilca navedite v MB." -#: C/troubleshooting-archive-open.page:26(p) -msgid "If File Roller cannot open a recently used archive, it may be that the location of this archive file has changed. See the help page about opening an archive for further information." -msgstr "Če Upravljalnik datotek ne more odpreti nedavno uporabljenega arhiva, se je morda mesto datoteke arhiva spremenilo. Oglejte si stran pomoči o odpiranju arhiva za nadaljnje podrobnosti." +#: C/archive-create.page:42(note/p) +#, fuzzy +msgid "By clicking Other Options you can set a password, or split your new archive into smaller, individual files by selecting the relevant option and specifying the volume for each part in MB." +msgstr "S klikom Druge možnosti lahko določite geslo ali razdelite novi arhiv na manjše, posamezne datoteke, tako da izberete ustrezno možnost in navedete obseg vsakega dela v MB." + +#: C/archive-create.page:49(item/p) +#, fuzzy +#| msgid "" +#| "Add the desired files to your archive by clicking the Add files to " +#| "the archive toolbar button, or by clicking EditAdd files…. File " +#| "Roller also allows you to add whole folders. To do this, click the " +#| "Add a folder to the archive toolbar button, or select " +#| "EditAdd a " +#| "folder…" +msgid "Add the desired files to your archive by clicking the Add files to the archive toolbar button, or by clicking Edit Add files. Archive Manager also allows you to add whole folders by clicking the Add a folder to the archive toolbar button, or selecting Edit Add a folder." +msgstr "Dodajte želene datoteke v arhiv s klikom na gumb orodne vrstice Dodaj datoteke v arhiv ali s klikom na UrediDodaj datoteke …. Upravljalnik arhivov vam omogoča tudi dodajanje celih map. Za to kliknite na gumb orodne vrstice Dodaj mapo v arhiv ali izberite UrediDodaj mapo …" -#: C/test-integrity.page:7(desc) -msgid "Check the integrity of an archive" -msgstr "Preverjanje celovitosti podatkov v arhivu" +#: C/archive-create.page:57(note/p) +msgid "When you add a folder to your archive, you will be offered some options:" +msgstr "Ko dodate mapo v arhiv, vam bodo ponujene nekatere možnosti:" -#: C/test-integrity.page:17(title) -msgid "Test integrity" -msgstr "Preveri celovitost" +#: C/archive-create.page:60(item/p) +#| msgid "Whether to include subfolders or not" +msgid "Whether to include subfolders or not." +msgstr "Ali naj bodo podmape vključene ali ne." + +#: C/archive-create.page:61(item/p) +#| msgid "Choose which files should be included" +msgid "Choose which files should be included." +msgstr "Izberite, katere datoteke želite vključiti." + +#: C/archive-create.page:62(item/p) +#| msgid "Select which subfolders or files are to be excluded" +msgid "Select which subfolders or files are to be excluded." +msgstr "Izberite, katere podmape ali datoteke želite izključiti." + +#: C/archive-create.page:64(note/p) +#, fuzzy +msgid "Not all archive file formats support folders — if the file format that you are using does not, you will not be warned. If the file format that you are using does not support folders, the files from the folders will be added, but not the folder itself." +msgstr "Vse vrste arhivov ne podpirajo map — če vrsta arhiva, ki ga uporabljate, tega ne podpira, se opozorilo ne bo prikazalo. Če uporabljena vrsta arhiva ne podpira map, bodo datoteke iz map dodane, ne pa tudi same mape." + +#: C/archive-create.page:71(item/p) +#, fuzzy +#| msgid "Once you finish adding files, your archive is ready." +msgid "Once you finish adding files, the archive is ready; you do not need to save it." +msgstr "Ko končate z dodajanjem datotek, je vaš arhiv pripravljen. Shraniti ga ni potrebno." -#: C/test-integrity.page:19(p) -msgid "File Roller allows you to check whether the compressed data in an archive contains any errors. Do this by clicking ArchiveTest Integrity." -msgstr "Upravljalnik datotek vam omogoča preverjanje ali stisnjeni podatki v arhivu vsebujejo podatke. To storite s klikom na ArhivPreizkusi celovitost." +#: C/archive-edit.page:21(info/desc) +msgid "Change the content of your archive." +msgstr "Spremeni vsebino vašega arhiva." -#: C/test-integrity.page:24(p) -msgid "The dialog with the Test Result will pop up. You will see the list of tested files and, at the bottom, there will also be the test summary." -msgstr "Pojavilo se bo pogovorno okno z rezultati preizkusa. Videli boste seznam preizkušenih datotek in na dnu bo tudi povzetek preizkusa." +#: C/archive-edit.page:24(page/title) +msgid "Edit an archive" +msgstr "Urejanje arhiva" -#: C/test-integrity.page:28(p) -msgid "The integrity test verifies that your data is not corrupt." -msgstr "Preizkus celovitosti preveri, da vaši podatki niso okvarjeni." +#: C/archive-edit.page:26(page/p) +#, fuzzy +#| msgid "" +#| "With File Roller you can edit an existing archive by adding " +#| "new files, removing unwanted ones or by changing their names. You can " +#| "work with folders in the same way as with files." +msgid "With Archive Manager you can edit an existing archive by adding new files, removing unwanted ones or by renaming them. You can work with folders in the same way as with files." +msgstr "Z Upravljalnikom arhivov lahko uredite obstoječi arhiv z dodajanjem novih datotek, odstranitvijo neželenih ali s spremembo njihovih imen. Z mapami lahko delate na enak način kot z datotekami." -#: C/supported-formats.page:7(desc) -msgid "File Roller has the ability to use various file formats." -msgstr "Upravljalnik datotek ima zmožnost uporabe različnih vrst datotek." +#: C/archive-edit.page:32(item/title) +msgid "Add files" +msgstr "Dodajanje datotek" -#: C/supported-formats.page:17(title) -msgid "Supported file formats" -msgstr "Podprte vrste datotek" +#: C/archive-edit.page:33(item/p) +#, fuzzy +#| msgid "" +#| "Add files to an existing archive by following the instructions on page." +msgid "Add files to an existing archive by following the instructions for creating an archive." +msgstr "Obstoječemu arhivu lahko dodate datoteke tako da sledite navodilom na strani ." -#: C/supported-formats.page:19(p) -msgid "The formats support by File Roller include:" -msgstr "Vrste datotek, ki jih podpira Upravljalnik datotek vključujejo:" +#: C/archive-edit.page:37(item/title) +msgid "Remove files" +msgstr "Odstranitev datotek" -#: C/supported-formats.page:22(p) -msgid "Archive only" -msgstr "Le arhiviraj" +#: C/archive-edit.page:39(item/p) +#: C/archive-edit.page:48(item/p) +msgid "Select the file." +msgstr "Izbor datoteke." -#: C/supported-formats.page:24(p) -msgid "AIX Small Indexed Archive (.ar)" -msgstr "Majhen arhiv s kazalom AIX (.ar)" +#: C/archive-edit.page:40(item/p) +#, fuzzy +#| msgid "" +#| "Click EditDelete, or right-click on the selected file, and choose " +#| "Delete." +msgid "Click Edit Delete, or right-click on the selected file, and choose Delete." +msgstr "Kliknite UrediIzbriši ali desno kliknite na izbrano datoteko in izberite Izbriši." -#: C/supported-formats.page:25(p) -msgid "ISO-9660 CD Disc Image [Read-only mode] (.iso)" -msgstr "Odtis CD diska ISO-9660 [način le za branje] (.iso)" +#: C/archive-edit.page:46(item/title) +msgid "Rename files" +msgstr "Preimenovanje datotek" -#: C/supported-formats.page:26(p) -msgid "Tape Archive File (.tar)" -msgstr "Datoteka kasetnega arhiva (.tar)" +#: C/archive-edit.page:49(item/p) +#| msgid "" +#| "Click EditRename…, or right-click on the selected file, and " +#| "choose Rename…." +msgid "Click Edit Rename, or right-click on the selected file, and choose Rename." +msgstr "Kliknite UrediPreimenuj … ali desno kliknite izbrano datoteko in izberite Preimenuj …" + +#: C/archive-edit.page:52(item/p) +#| msgid "" +#| "A dialog will open. Enter the new file name into the text entry field." +msgid "Enter the new file name into the dialog which has opened." +msgstr "Odprlo se bo pogovorno okno. Vnesite novo ime datoteke v polje vnosa besedila." -#: C/supported-formats.page:29(p) -msgid "Archive and compression" -msgstr "Arhiviranje in stiskanje" +#: C/archive-edit.page:54(item/p) +msgid "Confirm the name by clicking Rename." +msgstr "Potrditev ime s klikom na Preimenuj." -#: C/supported-formats.page:31(p) -msgid "Java Archive (.jar)" -msgstr "Arhiv Java (.jar)" +#: C/archive-extract.page:23(info/desc) +#| msgid "Extract files or folders from your archive" +msgid "Extract files or folders from your archive." +msgstr "Razširite datoteke ali mape iz arhiva." -#: C/supported-formats.page:32(p) -msgid "WinRAR Compressed Archive (.rar)" -msgstr "Stisnjen arhiv WinRAR (.rar)" +#: C/archive-extract.page:26(page/title) +#: C/keyboard-shortcuts.page:38(td/p) +msgid "Extract an archive" +msgstr "Razširi arhiv" -#: C/supported-formats.page:33(p) -msgid "Tape Archive File compressed with:" -msgstr "Datoteke arhiva kasete, stisnjene z:" +#: C/archive-extract.page:28(page/p) +#, fuzzy +#| msgid "" +#| "Extract files from archive using File Roller by following " +#| "these steps:" +msgid "Extract files from an archive using Archive Manager by following these steps:" +msgstr "Razširite datoteke iz arhiva z Upravljalnikom arhivov tako, da sledite tem korakom:" -#: C/supported-formats.page:35(p) -msgid "gzip (.tar.gz, .tgz)" -msgstr "gzip (.tar.gz, .tgz)" +#: C/archive-extract.page:33(item/p) +msgid "Open an archive." +msgstr "Odprite arhiv." -#: C/supported-formats.page:36(p) -msgid "bzip (.tar.bz, .tbz)" -msgstr "bzip (.tar.bz, .tbz)" +#: C/archive-extract.page:36(item/p) +#, fuzzy +#| msgid "" +#| "Click ArchiveExtract… or click the Extract toolbar button." +msgid "Click Archive Extract or click Extract in the toolbar button." +msgstr "Kliknite ArhivRazširi … ali kliknite na gumb orodne vrstice Razširi." -#: C/supported-formats.page:37(p) -msgid "bzip2 (.tar.bz2, .tbz2)" -msgstr "bzip2 (.tar.bz2, .tbz2)" +#: C/archive-extract.page:41(item/p) +#| msgid "" +#| "Choose the location in the file chooser, into which the files should be " +#| "extracted. This will be the destination folder." +msgid "Choose where you want the archive to be extracted to in the file chooser. This will be the destination folder." +msgstr "V izbirniku datotek izberite mesto, kamor naj bodo razširjene datoteke. To bo ciljna mapa." + +#: C/archive-extract.page:44(note/p) +#, fuzzy +#| msgid "" +#| "There are additional options in this dialog. See advanced options for extracting archives." +msgid "See advanced options for extracting archives for more extraction options." +msgstr "V tem pogovornem oknu so dodatne možnosti. Oglejte si napredne možnosti za razširjanje datotek." -#: C/supported-formats.page:38(p) -msgid "lzop (.tar.lzo, .tzo)" -msgstr "lzop (.tar.lzo, .tzo)" +#: C/archive-extract.page:49(item/p) +msgid "Click Extract." +msgstr "Kliknite Razširi" -#: C/supported-formats.page:39(p) -msgid "7zip (.tar.7z)" -msgstr "7zip (.tar.7z)" +#: C/archive-extract.page:52(item/p) +#, fuzzy +#| msgid "" +#| "If an archive is protected by a password, File Roller will " +#| "request it. Type the password and click OK." +msgid "If an archive is protected by a password, Archive Manager will request it. Type in the password and click OK." +msgstr "Če je arhiv zaščite z geslom, ga bo Upravljalnik arhivov zahteval. Vnesite geslo in kliknite V redu." -#: C/supported-formats.page:40(p) -msgid "xz (.tar.xz)" -msgstr "xz (.tar.xz)" +#: C/archive-extract.page:58(item/p) +msgid "The application will show you the progress bar in a new dialog. If the extraction completes successfully, you will be asked whether you want to:" +msgstr "Program vam bo v novem oknu pokazal vrstico napredka. Če je razširjanje uspešno boste imeli na voljo naslednje možnosti:" -#: C/supported-formats.page:43(p) -msgid "Cabinet File (.cab)" -msgstr "Datoteka Cabinet (.cab)" +#: C/archive-extract.page:63(item/p) +#| msgid "Quit - this option closes File Roller" +msgid "Quit to close Archive Manager." +msgstr "Končaj - ta možnost zapre Upravljalnik arhivov." + +#: C/archive-extract.page:66(item/p) +#, fuzzy +#| msgid "" +#| "Show the files - after clicking this the destination folder " +#| "will be open in Nautilus" +msgid "Show the files to view the destination folder with Files." +msgstr "Pokaži datoteke - po kliku na ta gumb se bo ciljna mapa odprla v Nautilusu" -#: C/supported-formats.page:44(p) -msgid "ZIP Archived Comic Book (.cbz)" -msgstr "Stripi v arhivu ZIP (.cbz)" +#: C/archive-extract.page:70(item/p) +msgid "Close the dialog." +msgstr "Zaprite pogovorno okno." -#: C/supported-formats.page:45(p) -msgid "ZIP Archive (.zip)" -msgstr "Arhiv ZIP (.zip)" +#: C/archive-extract-advanced-options.page:20(info/desc) +msgid "Specify your preferences for archive extraction." +msgstr "Določite svoje možnosti za razširitev arhivov." -#: C/supported-formats.page:46(p) -msgid "ZOO Compressed Archive File (.zoo)" -msgstr "Stisnjena datoteka arhiva ZOO (.zoo)" +#: C/archive-extract-advanced-options.page:23(page/title) +msgid "Advanced options for archive extracting" +msgstr "Napredne možnosti za razširjanje arhivov" -#: C/supported-formats.page:53(p) -msgid "For some file formats, File Roller may require additional plugins." -msgstr "Za nekatere vrste datotek bo Upravljalnik arhivov morda zahteval dodatne vstavke." +#: C/archive-extract-advanced-options.page:25(page/p) +#, fuzzy +#| msgid "" +#| "File Roller offers different options while extracting an " +#| "archive. You can see these options in the file chooser dialog, which you " +#| "use for choosing the location for extracted files. At the bottom of this " +#| "dialog, you can decide if you want to extract:" +msgid "Archive Manager offers different options for extracting an archive. You can see these options in the file chooser dialog, that is used for choosing the location for the extracted files. At the bottom of this dialog, you can decide if you want to extract:" +msgstr "Upravljalnik datotek ponuja različne možnosti med razširjanjem arhiva. Te možnosti si lahko ogledate v pogovornem oknu izbirnika datotek, ki ga uporabite za izbiro mesta razširjenih datotek. Na dnu tega pogovornega okna se lahko odločite, če želite razširiti:" -#: C/password-protection.page:9(desc) -msgid "Set the password for your archive." -msgstr "Nastavite geslo za svoj arhiv" +#: C/archive-extract-advanced-options.page:32(item/title) +#| msgid "All files" +msgid "All files" +msgstr "Vse datoteke" + +#: C/archive-extract-advanced-options.page:33(item/p) +#, fuzzy +#| msgid "the whole archive will be extracted" +msgid "All the files and folders in the archive will be extracted." +msgstr "celoten arhiv bo bil razširjen" -#: C/password-protection.page:19(title) -msgid "Password protection" -msgstr "Zaščita z geslom" +#: C/archive-extract-advanced-options.page:36(item/title) +#| msgid "Selected files" +msgid "Selected files" +msgstr "Izbrane datoteke" + +#: C/archive-extract-advanced-options.page:37(item/p) +#, fuzzy +#| msgid "File Roller extracts only the chosen files" +msgid "Archive Manager extracts only the selected files." +msgstr "Upravljalnik datotek razširi le izbrane datoteke" -#: C/password-protection.page:21(p) -msgid "File Roller allows you to encrypt an archive with a password only in specific circumstances." -msgstr "Upravljalnik arhivov vam omogoča šifriranje arhiva tudi le z geslom v posebnih okoliščinah." +#: C/archive-extract-advanced-options.page:39(note/p) +#, fuzzy +#| msgid "" +#| "Select them before you click ArchiveExtract…. Do this by clicking " +#| "on the file name. Press Ctrl or Shift, to select " +#| "more than one file." +msgid "You need to select the files that you wish to extract before before you click Archive Extract. Do this by clicking on the file name. Use Ctrl and Shift keys, to select more than one file." +msgstr "Izberite jih preden kliknete ArhivRazširi …. To storite s klikom na ime datoteke. Pritisnite Ctrl ali Shift za izbiro več kot ene datoteke." -#: C/password-protection.page:24(p) -msgid "Set a password to encrypt data in a new archive by following these steps:" -msgstr "Geslo za šifriranje podatkov v novem arhivu lahko nastavite s sledenjem naslednjim korakom:" +#: C/archive-extract-advanced-options.page:47(item/title) +#| msgid "File Roller main window" +msgid "Files" +msgstr "Datoteke" + +#: C/archive-extract-advanced-options.page:48(item/p) +#, fuzzy +#| msgid "you can type the names of the files that you want to extract" +msgid "You can type in the names of the files that you want to extract. Separate individual files using a semicolon (;)" +msgstr "Vnesete lahko imena datotek, ki jih želite razširiti" -#: C/password-protection.page:26(p) -msgid "Start creating a new archive" -msgstr "Začnite z ustvarjanjem novega arhiva" - -#: C/password-protection.page:27(p) -msgid "The file chooser will open" -msgstr "Odprl se bo izbirnik datotek" +#: C/archive-extract-advanced-options.page:51(note/p) +#, fuzzy +#| msgid "" +#| "The file name needs to be followed by a file extension. You can extract, " +#| "for example, all .txt files, by typing *.txt." +msgid "The file name needs to be followed by a file extension. You can use the asterisk (*) as a wild card. For example, to select all .txt files, type *.txt." +msgstr "Imenu datotek mora slediti pripona. Vse datoteke .txt lahko razširite z vnosom *.txt." -#: C/password-protection.page:28(p) -msgid "At the bottom of this dialog you can choose the File Format and Other Options, where you can set a password" -msgstr "Na dnu tega pogovornega okna lahko izberete Vrsto datoteke in Druge možnosti, kjer lahko nastavite geslo." +#: C/archive-extract-advanced-options.page:58(page/p) +#| msgid "You can specify in the file chooser dialog whether you want:" +msgid "You can specify in the file chooser dialog whether you want to:" +msgstr "V pogovornem oknu izbirnika datotek lahko določite, kaj želite:" + +#: C/archive-extract-advanced-options.page:61(item/title) +#, fuzzy +msgid "Keep directory structure" +msgstr "Ohrani strukturo map" + +#: C/archive-extract-advanced-options.page:62(item/p) +#, fuzzy +#| msgid "" +#| "Tick this option if you want to keep the directory structure, as it was " +#| "in your archive" +msgid "Tick this option if you want to keep the directory structure as it is in your archive." +msgstr "Izberite to možnost, če želite obdržati strukturo map kot je bila v vašem arhivu" -#: C/password-protection.page:30(p) -msgid "Click Other Options and type a password" -msgstr "Kliknite Druge možnosti in vnesite geslo" +#: C/archive-extract-advanced-options.page:66(item/title) +#, fuzzy +msgid "Do not overwrite newer files" +msgstr "Ne prepiši novejših datotek" -#: C/password-protection.page:32(p) -msgid "You may not be able to type password, because File Roller does not allow this option to be used for all types of archive files, so it is better to choose file format before setting a password." -msgstr "Morda gesla ne boste mogli vnesti, ker Upravljalnik arhivov te možnosti ne omogoča za vse vrste arhivov. Priporočamo vam, da izberete vrsto datoteke preden nastavite geslo." +#: C/archive-extract-advanced-options.page:67(item/p) +msgid "This option will not overwrite existing files with the same name, which have a more recent modification date than those which are in the archive." +msgstr "Ta možnost ne bo prepisala obstoječih datotek z enakim imenom, ki imajo bolj nedaven datum spreminjanje, kot tiste v arhivu." -#: C/password-protection.page:38(p) -msgid "Type your password into the password field" -msgstr "Vnesite svoje geslo v polje gesla" - -#: C/password-protection.page:39(p) -msgid "Continue with creating a new archive" -msgstr "Nadaljujte z ustvarjanjem novega arhiva" +#: C/archive-extract-advanced-options.page:73(page/p) +msgid "These Actions are listed at the bottom of the dialog." +msgstr "Ta Dejanja so izpisana na dnu pogovornega okna." -#: C/password-protection.page:43(p) -msgid "Protect an existing archive by setting a password:" -msgstr "Zaščita obstoječega arhiva z nastavitvijo gesla:" +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/archive-open.page:42(media) +#| msgid "" +#| "@@image: 'figures/file-roller-open-recent.png'; " +#| "md5=56d69ff2cb369cc5b0b85d5dde11018e" +msgctxt "_" +msgid "external ref='figures/file-roller-open-recent.png' md5='56d69ff2cb369cc5b0b85d5dde11018e'" +msgstr "external ref='figures/file-roller-open-recent.png' md5='56d69ff2cb369cc5b0b85d5dde11018e'" -#: C/password-protection.page:45(link) -#: C/keyboard-shortcuts.page:28(p) -#: C/archive-open.page:17(title) +#: C/archive-open.page:20(info/desc) +msgid "Open an existing archive." +msgstr "Odprite obstoječi arhiv." + +#: C/archive-open.page:23(page/title) +#: C/keyboard-shortcuts.page:34(td/p) msgid "Open an archive" msgstr "Odpri arhiv" -#: C/password-protection.page:46(p) -msgid "Click EditPassword…" -msgstr "Kliknite UrediGeslo …" +#: C/archive-open.page:25(page/p) +#| msgid "" +#| "Open an existing archive with File Roller in the following " +#| "ways:" +msgid "You can open an existing archive with Archive Manager by:" +msgstr "Obstoječi arhiv lahko z Upravljalnikom arhivov odprete na naslednje načine:" -#: C/password-protection.page:48(p) -msgid "Type password into the password field" -msgstr "Vnesite geslo v polje gesla" +#: C/archive-open.page:29(item/p) +msgid "clicking the Open toolbar button" +msgstr "s klikom gumba Odpri v orodni vrstici ali" + +#: C/archive-open.page:32(item/p) +#| msgid "" +#| "Click ArchiveOpen…" +msgid "clicking Archive Open" +msgstr "s klikom ArhivOdpri …" + +#: C/archive-open.page:37(page/p) +#, fuzzy +#| msgid "" +#| "You may also use the Open Recent option in the following ways:" +msgid "You may also use the Open Recent option by:" +msgstr "Možnost Odpri nedavno lahko uporabite na naslednje načine:" -#: C/password-protection.page:50(p) -msgid "If you want to encrypt the list of files tick Encrypt the file list too." -msgstr "Če želite seznam datotek šifrirani, izberite Šifriraj tudi seznam datotek." +#: C/archive-open.page:41(item/p) +#, fuzzy +#| msgid "" +#| "Click the Open a recently used archive toolbar " +#| "button and select a file." +msgid "clicking the Open a recently used archive toolbar button and selecting a file" +msgstr "Kliknite gumb orodne vrstice Odpri nedavno uporabljen arhiv in izberite datoteko." -#: C/password-protection.page:54(p) -msgid "Click OK to continue" -msgstr "Za naslednje kliknite V redu." +#: C/archive-open.page:46(item/p) +#, fuzzy +#| msgid "" +#| "Click ArchiveOpen Recent to see the list of recently used archives." +msgid "clicking Archive Open Recent to see the list of recently used archives" +msgstr "Kliknite AhivOdpri nedavno za ogled seznama nedavno uporabljenih arhivov." -#: C/password-protection.page:56(p) -msgid "File Roller will encrypt only new files which will be added to the archive!" -msgstr "Upravljalnik datotek bo šifriral le nove datoteke, ki bodo dodane v arhiv!" +#: C/archive-open.page:53(note/p) +#, fuzzy +#| msgid "" +#| "If File Roller cannot open your recently used archive, and " +#| "shows the error message The file doesn't exist, it may be that " +#| "the location of the archive file has changed. Then, you may use " +#| "Open option to search for it." +msgid "If Archive Manager cannot open your recently used archive and shows the error message The file doesn't exist, it may be that the location of the archive file has changed. You can try using the Open option to search for it." +msgstr "Če Upravljalnik datotek ne more odpreti vašega nedavno uporabljenega arhiva in pokaže sporočilo o napaki Datoteka ne obstaja, se je morda mesto datoteke arhiva spremenilo. Za njeno iskanje lahko uporabite možnost Odpri." + +#: C/archive-view.page:20(info/desc) +msgid "View an existing archive and its content." +msgstr "Ogled obstoječega arhiva in njegove vsebine." + +#: C/archive-view.page:23(page/title) +msgid "View an archive" +msgstr "Ogled arhiva" + +#: C/archive-view.page:25(page/p) +#| msgid "There are two ways of viewing the archive:" +msgid "There are two ways to view an archive:" +msgstr "Obstajata dva vrsta ogleda arhiva:" -#: C/keyboard-shortcuts.page:7(desc) -msgid "The list of shortcuts in File Roller." +#: C/archive-view.page:29(item/title) +msgid "View all files" +msgstr "Ogled vseh datotek" + +#: C/archive-view.page:30(item/p) +#, fuzzy +#| msgid "" +#| "To use this view, click ViewView All Files. File Roller will " +#| "list all files inside the archive. You will see their names, sizes, " +#| "types, dates of the last modification and locations." +msgid "Click ViewView All Files. Archive Manager will list all files inside the archive. You will see their names, sizes, types, dates of the last modification and locations." +msgstr "Za uporabo tega pogleda kliknite PogledPrikaži vse datoteke. Upravljalnik arhivov bo izpisal vse datoteke v arhivu. Videli boste njihova imena, velikosti, vrste, datume zadnjih sprememb in mesta." + +#: C/archive-view.page:35(note/p) +#, fuzzy +#| msgid "" +#| "You may use these column headings mentioned above (name, size…) to sort " +#| "the files in your archive. Do this by clicking on them, and click the " +#| "same one again to sort in reverse order." +msgid "You may use the column headings mentioned above (name, size…) to sort the files in your archive. Do this by clicking on them; you can toggle to sort in reverse order." +msgstr "Uporabite lahko glave stolpcev omenjene zgoraj (ime, velikost ...) za razvrstitev datotek v arhivu. To storite s klikom na glave. S ponovnim klikom na glavo obrnete vrstni red." + +#: C/archive-view.page:41(item/title) +msgid "View as a folder" +msgstr "Pogled kot mapa" + +#: C/archive-view.page:42(item/p) +#, fuzzy +#| msgid "" +#| "This view displays the classic directory structure. To use this, click " +#| "ViewView as a " +#| "Folder." +msgid "This view displays the classic directory structure. To use this, click View View as a Folder." +msgstr "Drevesni pogled prikazuje običajno strukturo map. Za uporabo tega kliknite PogledPrikaži kot mapo." + +#: C/archive-view.page:46(note/p) +#, fuzzy +#| msgid "" +#| "While viewing your archive in this way, press F9, or click " +#| "ViewFolders option. You will see a tree view of the folders in the side " +#| "pane. It allows you to navigate easily between folders." +msgid "While viewing your archive in this way, you can press F9, or click View Folders option, to see a tree view of the folders in the side pane. It allows you to navigate easily between folders." +msgstr "Medtem ko si ogledujete arhiv na ta način pritisnite F9 ali kliknite možnost PogledMape. V stranskem pladnju boste videli drevo map. Omogoča vam enostavno krmarjenje med mapami." + +#: C/archive-view.page:56(section/title) +msgid "Open files in your archive" +msgstr "Odpiranje datotek v arhivu" + +#: C/archive-view.page:57(section/p) +#, fuzzy +#| msgid "" +#| "Open files, which are in you archive by double-clicking the file name, or " +#| "right-click on the file name and select Open. File " +#| "Roller will open the file with the default application for that " +#| "file type." +msgid "Open files which are in your archive by double-clicking on the file name, or by right-clicking on the file name and selecting Open. Archive Manager will open the file with the default application for that file type." +msgstr "Odprite datoteke, ki so v arhivu, z dvoklikom na ime datoteke ali desnim klikom na ime datoteke in izbiro Odpri. Upravljalnik datotek bo odprl datoteko s privzetim programom za to vrsto datotek." + +#: C/archive-view.page:63(note/p) +#, fuzzy +#| msgid "Open the file with different application by following these steps:" +msgid "Open the file with a different application by following these steps:" +msgstr "Odprite datoteko z različnim programom s sledenjem naslednjim korakom:" + +#: C/archive-view.page:66(item/p) +#, fuzzy +#| msgid "Select the file." +msgid "Right click on the file." +msgstr "Desno kliknite datoteko." + +#: C/archive-view.page:69(item/p) +#, fuzzy +#| msgid "Click Open With…" +msgid "Click Open With." +msgstr "Kliknite Odpri z." + +#: C/archive-view.page:72(item/p) +#, fuzzy +msgid "Select the application that you want to use and click Select." +msgstr "Izberite program, ki ga želite uporabiti, in kliknite Izberi." + +#. This is a reference to an external file such as an image or video. When +#. the file changes, the md5 hash will change to let you know you need to +#. update your localized copy. The msgstr is not used at all. Set it to +#. whatever you like once you have updated your copy of the file. +#: C/introduction.page:48(media) +#| msgid "" +#| "@@image: 'figures/file-roller-main-window.png'; " +#| "md5=133c50bfcf2ac220d3c2c61180f339db" +msgctxt "_" +msgid "external ref='figures/file-roller-main-window.png' md5='133c50bfcf2ac220d3c2c61180f339db'" +msgstr "external ref='figures/file-roller-main-window.png' md5='133c50bfcf2ac220d3c2c61180f339db'" + +#: C/introduction.page:20(info/desc) +#, fuzzy +#| msgid "" +#| "Introduction to the File Roller archive managing application." +msgid "Introduction to the GNOME Archive Manager." +msgstr "Uvod v Upravljalnik arhivov." + +#: C/introduction.page:23(page/title) +msgid "Introduction" +msgstr "Uvod" + +#: C/introduction.page:25(page/p) +#, fuzzy +#| msgid "" +#| "File Roller is an application for managing archives, designed " +#| "to be easy to use. It provides all the tools necessary for creating, " +#| "modifying or extracting archives." +msgid "Archive Manager is an application for managing archive files, for example, .zip or .tar files; it is designed to be easy to use. Archive Manager provides all the tools that are necessary for creating, modifying and extracting archives." +msgstr "Upravljalnik arhivov je program za upravljanje arhivov, ki je bil zasnovan za enostavno uporabo. Zagotavlja vsa orodja, zahtevana za ustvarjanje, spreminjanje ali razširjaje arhivov." + +#: C/introduction.page:31(note/p) +#, fuzzy +#| msgid "" +#| "An archive is composed of one or more files, along with metadata. It may " +#| "be encrypted in part or as a whole. By collecting multiple data files " +#| "together into a single one, archive files are useful for storing data and " +#| "transferring it between computers." +msgid "An archive consists of one or more files and folders, along with metadata. It may be encrypted in part or as a whole. Archive files are useful for storing data and transferring it between computers as they allow you to collect multiple files into one." +msgstr "Arhiv je sestavljen iz ene ali več datotek skupaj z metapodatki. Morda je šifriran delno ali v celoti. Z zbiranjem več podatkovnih datotek skupaj v eno, so datoteke arhivov uporabne za shranjevanje podatkov in njihov prenos med računalniki." + +#: C/introduction.page:37(page/p) +#| msgid "With File Roller you can:" +msgid "With Archive Manager you can:" +msgstr "Z Upravljalnikom arhivov lahko:" + +#: C/introduction.page:39(item/p) +#| msgid "Create a new archive" +msgid "create a new archive" +msgstr "Ustvarite nov arhiv" + +#: C/introduction.page:40(item/p) +#| msgid "View the content of the existing archive" +msgid "view the content of an existing archive" +msgstr "Oglejte si vsebino obstoječega arhiva" + +#: C/introduction.page:41(item/p) +#| msgid "View a file contained in the archive" +msgid "view a file contained in an archive" +msgstr "si ogledate datoteko, ki je v arhivu," + +#: C/introduction.page:42(item/p) +#| msgid "Modify existing archives" +msgid "modify existing archives" +msgstr "spremenite obstoječe arhive," + +#: C/introduction.page:43(item/p) +#| msgid "Extract files from archive" +msgid "extract files from an archive" +msgstr "razširite datoteke iz arhiva." + +#: C/introduction.page:47(figure/title) +msgid "Viewing an archive with Archive Manager" +msgstr "Ogledovanje arhiva z Upravljalnikom arhivov" + +#: C/introduction.page:49(media/p) +#, fuzzy +#| msgid "Screenshot of the File Roller main window." +msgid "Screenshot of the Archive Manager main window." +msgstr "Zaslonska slika glavnega okna Upravljalnika datotek." + +#: C/keyboard-shortcuts.page:20(info/desc) +#| msgid "The list of shortcuts in File Roller." +msgid "The list of shortcuts in Archive Manager." msgstr "Seznam bližnjic v Upravljalniku datotek." -#: C/keyboard-shortcuts.page:17(title) +#: C/keyboard-shortcuts.page:23(page/title) msgid "Keyboard shortcuts" msgstr "Tipkovne bližnjice" -#: C/keyboard-shortcuts.page:19(p) -msgid "Using keyboard shortcuts can help speed up work-flow. In the table below is a list of shortcuts which can be used in File Roller." +#: C/keyboard-shortcuts.page:25(page/p) +#, fuzzy +#| msgid "" +#| "Using keyboard shortcuts can help speed up work-flow. In the table below " +#| "is a list of shortcuts which can be used in File Roller." +msgid "Using keyboard shortcuts can help speed up work-flow. In the table below is a list of shortcuts which can be used in Archive Manager." msgstr "Uporaba tipkovnih bližnjic lahko pomaga pri pohitritvi dela. V preglednici spodaj je seznam bližnjic, ki jih je mogoče uporabiti v Upravljalniku datotek." -#: C/keyboard-shortcuts.page:24(p) +#: C/keyboard-shortcuts.page:30(td/p) msgid "Create new archive" msgstr "Ustvari nov arhiv" -#: C/keyboard-shortcuts.page:25(key) -#: C/keyboard-shortcuts.page:29(key) -#: C/keyboard-shortcuts.page:33(key) -#: C/keyboard-shortcuts.page:41(key) -#: C/keyboard-shortcuts.page:45(key) -#: C/keyboard-shortcuts.page:49(key) -#: C/keyboard-shortcuts.page:53(key) -#: C/keyboard-shortcuts.page:61(key) -#: C/keyboard-shortcuts.page:65(key) -#: C/keyboard-shortcuts.page:69(key) -#: C/keyboard-shortcuts.page:81(key) -#: C/keyboard-shortcuts.page:85(key) -#: C/keyboard-shortcuts.page:93(key) -msgid "Ctrl" -msgstr "Ctrl" - -#: C/keyboard-shortcuts.page:25(key) -msgid "N" -msgstr "N" - -#: C/keyboard-shortcuts.page:29(key) -msgid "O" -msgstr "O" - -#: C/keyboard-shortcuts.page:32(p) -#: C/archive-extract.page:20(title) -msgid "Extract an archive" -msgstr "Razširi arhiv" - -#: C/keyboard-shortcuts.page:33(key) -msgid "E" -msgstr "E" +#: C/keyboard-shortcuts.page:31(td/p) +#, fuzzy +msgid "CtrlN" +msgstr "krmilkaN" + +#: C/keyboard-shortcuts.page:35(td/p) +#, fuzzy +msgid "CtrlO" +msgstr "krmilkaO" + +#: C/keyboard-shortcuts.page:39(td/p) +#, fuzzy +msgid "CtrlE" +msgstr "krmilkaE" -#: C/keyboard-shortcuts.page:36(p) +#: C/keyboard-shortcuts.page:42(td/p) msgid "View archive properties" msgstr "Pokaži lastnosti arhiva" -#: C/keyboard-shortcuts.page:37(key) -msgid "Alt" -msgstr "Alt" - -#: C/keyboard-shortcuts.page:37(key) -msgid "Return" -msgstr "Vrni" +#: C/keyboard-shortcuts.page:43(td/p) +#, fuzzy +msgid "AltReturn" +msgstr "izmenjalkavnašalka" -#: C/keyboard-shortcuts.page:40(p) +#: C/keyboard-shortcuts.page:46(td/p) msgid "Close" msgstr "Zapri" -#: C/keyboard-shortcuts.page:41(key) -msgid "W" -msgstr "W" +#: C/keyboard-shortcuts.page:47(td/p) +#, fuzzy +msgid "CtrlW" +msgstr "krmilkaW" -#: C/keyboard-shortcuts.page:44(p) +#: C/keyboard-shortcuts.page:50(td/p) msgid "Cut" msgstr "Izreži" -#: C/keyboard-shortcuts.page:45(key) -msgid "X" -msgstr "X" +#: C/keyboard-shortcuts.page:51(td/p) +#, fuzzy +msgid "CtrlX" +msgstr "krmilkaX" -#: C/keyboard-shortcuts.page:48(p) +#: C/keyboard-shortcuts.page:54(td/p) msgid "Copy" msgstr "Kopiraj" -#: C/keyboard-shortcuts.page:49(key) -msgid "C" -msgstr "C" +#: C/keyboard-shortcuts.page:55(td/p) +#, fuzzy +msgid "CtrlC" +msgstr "krmilkaC" -#: C/keyboard-shortcuts.page:52(p) +#: C/keyboard-shortcuts.page:58(td/p) msgid "Paste" msgstr "Prilepi" -#: C/keyboard-shortcuts.page:53(key) -msgid "V" -msgstr "V" +#: C/keyboard-shortcuts.page:59(td/p) +#, fuzzy +msgid "CtrlV" +msgstr "krmilkaV" -#: C/keyboard-shortcuts.page:56(p) +#: C/keyboard-shortcuts.page:62(td/p) msgid "Rename file or folder in an archive" msgstr "Preimenovanje datotek ali map iz arhiva" -#: C/keyboard-shortcuts.page:57(key) -msgid "F2" -msgstr "F2" +#: C/keyboard-shortcuts.page:63(td/p) +msgid "F2" +msgstr "F2" -#: C/keyboard-shortcuts.page:60(p) +#: C/keyboard-shortcuts.page:66(td/p) msgid "Select all" msgstr "Izberi vse" -#: C/keyboard-shortcuts.page:61(key) -#: C/keyboard-shortcuts.page:65(key) -msgid "A" -msgstr "A" +#: C/keyboard-shortcuts.page:67(td/p) +#, fuzzy +msgid "CtrlA" +msgstr "krmilkaA" -#: C/keyboard-shortcuts.page:64(p) +#: C/keyboard-shortcuts.page:70(td/p) msgid "Deselect all" msgstr "Počisti izbor" -#: C/keyboard-shortcuts.page:65(key) -msgid "Shift" -msgstr "Shift" +#: C/keyboard-shortcuts.page:71(td/p) +#, fuzzy +msgid "ShiftCtrlA" +msgstr "dvigalkakrmilkaA" -#: C/keyboard-shortcuts.page:68(p) +#: C/keyboard-shortcuts.page:74(td/p) msgid "Find" msgstr "Poišči" -#: C/keyboard-shortcuts.page:69(key) -msgid "F" -msgstr "F" +#: C/keyboard-shortcuts.page:75(td/p) +#, fuzzy +msgid "CtrlF" +msgstr "krmilkaF" -#: C/keyboard-shortcuts.page:72(p) +#: C/keyboard-shortcuts.page:78(td/p) msgid "Delete files or folders from an archive" msgstr "Izbris datotek ali map iz arhiva" -#: C/keyboard-shortcuts.page:73(key) -msgid "Delete" -msgstr "Izbriši" +#: C/keyboard-shortcuts.page:79(td/p) +#, fuzzy +msgid "Delete" +msgstr "brisalka" -#: C/keyboard-shortcuts.page:76(p) +#: C/keyboard-shortcuts.page:82(td/p) msgid "Display the tree view of the folders in the side pane" msgstr "Pokaži drevesni pogled map v stranskem pladnju" -#: C/keyboard-shortcuts.page:77(key) -msgid "F9" -msgstr "F9" +#: C/keyboard-shortcuts.page:83(td/p) +msgid "F9" +msgstr "F9" -#: C/keyboard-shortcuts.page:80(p) +#: C/keyboard-shortcuts.page:86(td/p) msgid "View the content of an archive as a list of files" msgstr "Ogled vsebine arhiva kot seznama datotek" -#: C/keyboard-shortcuts.page:81(key) -msgid "1" -msgstr "1" +#: C/keyboard-shortcuts.page:87(td/p) +#, fuzzy +msgid "Ctrl1" +msgstr "krmilka1" -#: C/keyboard-shortcuts.page:84(p) +#: C/keyboard-shortcuts.page:90(td/p) msgid "View the content of an archive as a folder structure" msgstr "Ogled vsebine arhiva kot struktura mape" -#: C/keyboard-shortcuts.page:85(key) -msgid "2" -msgstr "2" +#: C/keyboard-shortcuts.page:91(td/p) +#, fuzzy +msgid "Ctrl2" +msgstr "krmilka2" -#: C/keyboard-shortcuts.page:88(p) +#: C/keyboard-shortcuts.page:94(td/p) msgid "Stop the operation" msgstr "Zaustavi opravilo" -#: C/keyboard-shortcuts.page:89(key) -msgid "Esc" -msgstr "Esc" +#: C/keyboard-shortcuts.page:95(td/p) +#, fuzzy +msgid "Esc" +msgstr "ubežnica" -#: C/keyboard-shortcuts.page:92(p) +#: C/keyboard-shortcuts.page:98(td/p) msgid "Refresh" msgstr "Osveži" -#: C/keyboard-shortcuts.page:93(key) -msgid "R" -msgstr "R" - -#: C/keyboard-shortcuts.page:96(p) -msgid "View help content" +#: C/keyboard-shortcuts.page:99(td/p) +#, fuzzy +msgid "CtrlR" +msgstr "krmilkaR" + +#: C/keyboard-shortcuts.page:102(td/p) +#, fuzzy +#| msgid "View help content" +msgid "View help" msgstr "Ogled vsebine pomoči" -#: C/keyboard-shortcuts.page:97(key) -msgid "F1" -msgstr "F1" - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/introduction.page:42(None) -msgid "@@image: 'figures/file-roller-main-window.png'; md5=133c50bfcf2ac220d3c2c61180f339db" -msgstr "@@image: 'figures/file-roller-main-window.png'; md5=133c50bfcf2ac220d3c2c61180f339db" - -#: C/introduction.page:7(desc) -msgid "Introduction to the File Roller archive managing application." -msgstr "Uvod v Upravljalnik arhivov." - -#: C/introduction.page:18(title) -msgid "Introduction" -msgstr "Uvod" - -#: C/introduction.page:20(p) -msgid "File Roller is an application for managing archives, designed to be easy to use. It provides all the tools necessary for creating, modifying or extracting archives." -msgstr "Upravljalnik arhivov je program za upravljanje arhivov, ki je bil zasnovan za enostavno uporabo. Zagotavlja vsa orodja, zahtevana za ustvarjanje, spreminjanje ali razširjaje arhivov." - -#: C/introduction.page:25(p) -msgid "An archive is composed of one or more files, along with metadata. It may be encrypted in part or as a whole. By collecting multiple data files together into a single one, archive files are useful for storing data and transferring it between computers." -msgstr "Arhiv je sestavljen iz ene ali več datotek skupaj z metapodatki. Morda je šifriran delno ali v celoti. Z zbiranjem več podatkovnih datotek skupaj v eno, so datoteke arhivov uporabne za shranjevanje podatkov in njihov prenos med računalniki." - -#: C/introduction.page:31(p) -msgid "With File Roller you can:" -msgstr "Z Upravljalnikom arhivov lahko:" - -#: C/introduction.page:33(p) -msgid "Create new archive by adding files or folders" -msgstr "Ustvarjanje novega arhiva z dodajanjem datotek ali map" - -#: C/introduction.page:34(p) -msgid "View the content of the existing archive" -msgstr "Ogled vsebine obstoječega arhiva" - -#: C/introduction.page:35(p) -msgid "View a file contained in the archive" -msgstr "Ogled datoteke, ki je v arhivu" - -#: C/introduction.page:36(p) -msgid "Modify existing archives" -msgstr "Spremeni obstoječe arhive" - -#: C/introduction.page:37(p) -msgid "Extract files from archive" -msgstr "Razširi datoteke iz arhiva" - -#: C/introduction.page:41(title) -msgid "File Roller main window" -msgstr "Glavno okno Upravljalnika arhivov." +#: C/keyboard-shortcuts.page:103(td/p) +msgid "F1" +msgstr "F1" -#: C/introduction.page:43(p) -msgid "Screenshot of the File Roller main window." -msgstr "Zaslonska slika glavnega okna Upravljalnika datotek." - -#: C/index.page:5(title) -msgid "File Roller Archive Manager Help" -msgstr "Pomoč upravljalnika arhivov" - -#: C/index.page:8(title) -msgid "Managing archives" -msgstr "Upravljanje arhivov" - -#: C/index.page:12(title) -msgid "Advanced options" -msgstr "Napredne možnosti" - -#: C/index.page:16(title) -msgid "Troubleshooting" -msgstr "Odpravljanje težav" - -#: C/archive-view.page:7(desc) -msgid "View an existing archive and its content." -msgstr "Ogled obstoječega arhiva in njegove vsebine." - -#: C/archive-view.page:17(title) -msgid "View an archive" -msgstr "Ogled arhiva" - -#: C/archive-view.page:19(p) -msgid "There are two ways of viewing the archive:" -msgstr "Obstajata dva vrsta ogleda arhiva:" - -#: C/archive-view.page:23(p) -msgid "View all files" -msgstr "Ogled vseh datotek" - -#: C/archive-view.page:24(p) -msgid "To use this view, click ViewView All Files. File Roller will list all files inside the archive. You will see their names, sizes, types, dates of the last modification and locations." -msgstr "Za uporabo tega pogleda kliknite PogledPrikaži vse datoteke. Upravljalnik arhivov bo izpisal vse datoteke v arhivu. Videli boste njihova imena, velikosti, vrste, datume zadnjih sprememb in mesta." - -#: C/archive-view.page:29(p) -msgid "You may use these column headings mentioned above (name, size…) to sort the files in your archive. Do this by clicking on them, and click the same one again to sort in reverse order." -msgstr "Uporabite lahko glave stolpcev omenjene zgoraj (ime, velikost ...) za razvrstitev datotek v arhivu. To storite s klikom na glave. S ponovnim klikom na glavo obrnete vrstni red." - -#: C/archive-view.page:35(p) -msgid "View as a folder" -msgstr "Pogled kot mapa" - -#: C/archive-view.page:36(p) -msgid "This view displays the classic directory structure. To use this, click ViewView as a Folder." -msgstr "Drevesni pogled prikazuje običajno strukturo map. Za uporabo tega kliknite PogledPrikaži kot mapo." - -#: C/archive-view.page:40(p) -msgid "While viewing your archive in this way, press F9, or click ViewFolders option. You will see a tree view of the folders in the side pane. It allows you to navigate easily between folders." -msgstr "Medtem ko si ogledujete arhiv na ta način pritisnite F9 ali kliknite možnost PogledMape. V stranskem pladnju boste videli drevo map. Omogoča vam enostavno krmarjenje med mapami." - -#: C/archive-view.page:50(title) -msgid "Open files in your archive" -msgstr "Odpiranje datotek v arhivu" - -#: C/archive-view.page:51(p) -msgid "Open files, which are in you archive by double-clicking the file name, or right-click on the file name and select Open. File Roller will open the file with the default application for that file type." -msgstr "Odprite datoteke, ki so v arhivu, z dvoklikom na ime datoteke ali desnim klikom na ime datoteke in izbiro Odpri. Upravljalnik datotek bo odprl datoteko s privzetim programom za to vrsto datotek." - -#: C/archive-view.page:56(p) -msgid "Open the file with different application by following these steps:" -msgstr "Odprite datoteko z različnim programom s sledenjem naslednjim korakom:" - -#: C/archive-view.page:58(p) -msgid "Select the file" -msgstr "Izberite datoteko" - -#: C/archive-view.page:59(p) -msgid "Right-click" -msgstr "Desni klik" - -#: C/archive-view.page:60(p) -msgid "Click Open With…" -msgstr "Kliknite Odpri z ...." - -#. When image changes, this message will be marked fuzzy or untranslated for you. -#. It doesn't matter what you translate it to: it's not used at all. -#: C/archive-open.page:36(None) -msgid "@@image: 'figures/file-roller-open-recent.png'; md5=56d69ff2cb369cc5b0b85d5dde11018e" -msgstr "@@image: 'figures/file-roller-open-recent.png'; md5=56d69ff2cb369cc5b0b85d5dde11018e" - -#: C/archive-open.page:7(desc) -msgid "Open an existing archive." -msgstr "Odprite obstoječi arhiv." - -#: C/archive-open.page:19(p) -msgid "Open an existing archive with File Roller in the following ways:" -msgstr "Obstoječi arhiv lahko z Upravljalnikom arhivov odprete na naslednje načine:" - -#: C/archive-open.page:23(p) -msgid "Click the toolbar button Open." -msgstr "Kliknite na gumb orodne vrstice Odpri." - -#: C/archive-open.page:26(p) -msgid "Click ArchiveOpen…" -msgstr "Kliknite ArhivOdpri …" - -#: C/archive-open.page:31(p) -msgid "You may also use the Open Recent option in the following ways:" -msgstr "Možnost Odpri nedavno lahko uporabite na naslednje načine:" - -#: C/archive-open.page:35(p) -msgid "Click the Open a recently used archive toolbar button and select a file." -msgstr "Kliknite gumb orodne vrstice Odpri nedavno uporabljen arhiv in izberite datoteko." - -#: C/archive-open.page:41(p) -msgid "Click ArchiveOpen Recent to see the list of recently used archives." -msgstr "Kliknite AhivOdpri nedavno za ogled seznama nedavno uporabljenih arhivov." - -#: C/archive-open.page:47(p) -msgid "If File Roller cannot open your recently used archive, and shows the error message The file doesn't exist, it may be that the location of the archive file has changed. Then, you may use Open option to search for it." -msgstr "Če Upravljalnik datotek ne more odpreti vašega nedavno uporabljenega arhiva in pokaže sporočilo o napaki Datoteka ne obstaja, se je morda mesto datoteke arhiva spremenilo. Za njeno iskanje lahko uporabite možnost Odpri." - -#: C/archive-extract-advanced-options.page:7(desc) -msgid "Specify your preferences for archive extraction." -msgstr "Določite svoje možnosti za razširitev arhivov." - -#: C/archive-extract-advanced-options.page:17(title) -msgid "Advanced options for archive extracting" -msgstr "Napredne možnosti za razširjanje arhivov" - -#: C/archive-extract-advanced-options.page:19(p) -msgid "File Roller offers different options while extracting an archive. You can see these options in the file chooser dialog, which you use for choosing the location for extracted files. At the bottom of this dialog, you can decide if you want to extract:" -msgstr "Upravljalnik datotek ponuja različne možnosti med razširjanjem arhiva. Te možnosti si lahko ogledate v pogovornem oknu izbirnika datotek, ki ga uporabite za izbiro mesta razširjenih datotek. Na dnu tega pogovornega okna se lahko odločite, če želite razširiti:" - -#: C/archive-extract-advanced-options.page:25(gui) -msgid "All files" -msgstr "Vse datoteke" - -#: C/archive-extract-advanced-options.page:26(p) -msgid "the whole archive will be extracted" -msgstr "celoten arhiv bo bil razširjen" - -#: C/archive-extract-advanced-options.page:29(gui) -msgid "Selected files" -msgstr "Izbrane datoteke" - -#: C/archive-extract-advanced-options.page:30(p) -msgid "File Roller extracts only the chosen files" -msgstr "Upravljalnik datotek razširi le izbrane datoteke" - -#: C/archive-extract-advanced-options.page:32(p) -msgid "Select them before you click ArchiveExtract…. Do this by clicking on the file name. Press Ctrl or Shift, to select more than one file." -msgstr "Izberite jih preden kliknete ArhivRazširi …. To storite s klikom na ime datoteke. Pritisnite Ctrl ali Shift za izbiro več kot ene datoteke." - -#: C/archive-extract-advanced-options.page:39(gui) -msgid "Files" -msgstr "Datoteke" - -#: C/archive-extract-advanced-options.page:40(p) -msgid "you can type the names of the files that you want to extract" -msgstr "Vnesete lahko imena datotek, ki jih želite razširiti" - -#: C/archive-extract-advanced-options.page:42(p) -msgid "The file name needs to be followed by a file extension. You can extract, for example, all .txt files, by typing *.txt." -msgstr "Imenu datotek mora slediti pripona. Vse datoteke .txt lahko razširite z vnosom *.txt." - -#: C/archive-extract-advanced-options.page:49(p) -msgid "You can specify in the file chooser dialog whether you want:" -msgstr "V pogovornem oknu izbirnika datotek lahko določite kaj želite:" - -#: C/archive-extract-advanced-options.page:52(gui) -msgid "Re-create folders" -msgstr "Ponovno ustvari mape" - -#: C/archive-extract-advanced-options.page:53(p) -msgid "Tick this option if you want to keep the directory structure, as it was in your archive" -msgstr "Izberite to možnost, če želite obdržati strukturo map kot je bila v vašem arhivu" - -#: C/archive-extract-advanced-options.page:57(gui) -msgid "Overwrite existing files" -msgstr "Prepiši obstoječe datoteke" - -#: C/archive-extract-advanced-options.page:58(p) -msgid "If your archive contains files with the same name as those in the destination folder, then File Roller will overwrite them during extraction if this option is enabled" -msgstr "Če vaš arhiv vsebuje datoteke z enakim imenom kot ciljna mapa, jih bo Upravljalnik arhivov med razširjanjem prepisal, če je ta možnost omogočena " - -#: C/archive-extract-advanced-options.page:63(gui) -msgid "Do not extract older files" -msgstr "Ne odpakiraj starejših datotek" - -#: C/archive-extract-advanced-options.page:64(p) -msgid "This option will not overwrite existing files with the same name, which have a more recent modification date than those which are in the archive." -msgstr "Ta možnost ne bo prepisala obstoječih datotek z enakim imenom, ki imajo bolj nedaven datum spreminjanje, kot tiste v arhivu." - -#: C/archive-extract-advanced-options.page:70(p) -msgid "These Actions are listed at the bottom of the dialog." -msgstr "Ta Dejanja so izpisana na dnu pogovornega okna." - -#: C/archive-extract-advanced-options.page:73(p) -msgid "The option Do not extract older files is only avaiable when the option Overwrite existing files has been enabled." -msgstr "Možnost Ne razširi starejših datotek je na voljo le, ko je možnost Prepiši obstoječe datoteke bila omogočena." - -#: C/archive-extract.page:10(desc) -msgid "Extract files or folders from your archive" -msgstr "Razširitev datotek ali map iz arhiva" - -#: C/archive-extract.page:22(p) -msgid "Extract files from archive using File Roller by following these steps:" -msgstr "Razširite datoteke iz arhiva z Upravljalnikom arhivov tako, da sledite tem korakom:" - -#: C/archive-extract.page:26(p) -msgid "Open an archive." -msgstr "Odprite arhiv." - -#: C/archive-extract.page:27(p) -msgid "Click ArchiveExtract… or click the Extract toolbar button." -msgstr "Kliknite ArhivRazširi … ali kliknite na gumb orodne vrstice Razširi." - -#: C/archive-extract.page:30(p) -msgid "Choose the location in the file chooser, into which the files should be extracted. This will be the destination folder." -msgstr "Izberite mesto v izbirniku datotek v katero naj bodo razširjene datoteke. To bo bila ciljna mapa." - -#: C/archive-extract.page:33(p) -msgid "There are additional options in this dialog. See advanced options for extracting archives." -msgstr "V tem pogovornem oknu so dodatne možnosti. Oglejte si napredne možnosti za razširjanje datotek." - -#: C/archive-extract.page:38(p) -msgid "Click Extract." -msgstr "Kliknite Razširi" +#: C/password-protection.page:22(info/desc) +msgid "Set the password for your archive." +msgstr "Nastavite geslo za svoj arhiv" -#: C/archive-extract.page:39(p) -msgid "If an archive is protected by a password, File Roller will request it. Type the password and click OK." -msgstr "Če je arhiv zaščite z geslom, ga bo Upravljalnik arhivov zahteval. Vnesite geslo in kliknite V redu." +#: C/password-protection.page:25(page/title) +msgid "Password protection" +msgstr "Zaščita z geslom" -#: C/archive-extract.page:43(p) -msgid "The application will show you the progress bar in a new dialog. If the extraction completes successfully, you will be asked whether you want to:" -msgstr "Program vam bo v novem oknu pokazal vrstico napredka. Če je razširjanje uspešno boste imeli na voljo naslednje možnosti:" +#: C/password-protection.page:27(page/p) +#, fuzzy +msgid "You can encrypt an archive with a password so that only you and those with whom you choose to share the password are able to access it. Note that the password can still be guessed, so for highest security, use a good password." +msgstr "Arhiv lahko šifrirate z geslom, tako da ga lahko odprete le vi in tisti, s katerimi delite geslo. Upoštevajte, da je geslo še vedno mogoče uganiti, zato za najvišjo varnost uporabite dobro geslo." + +#: C/password-protection.page:33(note/p) +#, fuzzy +#| msgid "" +#| "File Roller allows you to encrypt an archive with a password " +#| "only in specific circumstances." +msgid "Archive Manager allows you to encrypt an archive with a password only in specific circumstances." +msgstr "Upravljalnik arhivov vam omogoča šifriranje arhiva tudi le z geslom v posebnih okoliščinah." -#: C/archive-extract.page:47(p) -msgid "Quit - this option closes File Roller" -msgstr "Končaj - ta možnost zapre Upravljalnik arhivov" +#: C/password-protection.page:37(page/p) +msgid "Set a password to encrypt data in a new archive by following these steps:" +msgstr "Geslo za šifriranje podatkov v novem arhivu lahko nastavite s sledenjem naslednjim korakom:" -#: C/archive-extract.page:48(p) -msgid "Show the files - after clicking this the destination folder will be open in Nautilus" -msgstr "Pokaži datoteke - po kliku na ta gumb se bo ciljna mapa odprla v Nautilusu" +#: C/password-protection.page:42(item/p) +#| msgid "Start creating a new archive" +msgid "Start creating a new archive." +msgstr "Začnite z ustvarjanjem novega arhiva." + +#: C/password-protection.page:45(item/p) +#, fuzzy +#| msgid "" +#| "At the bottom of this dialog you can choose the File Format " +#| "and Other Options, where you can set a password" +msgid "At the bottom of the file chooser dialog you can choose a File Format and enter a password into the Password field in Other Options." +msgstr "Na dnu tega pogovornega okna lahko izberete Vrsto datoteke in Druge možnosti, kjer lahko nastavite geslo." -#: C/archive-extract.page:50(p) -msgid "Close - the dialog will be closed and you will see your archive again" -msgstr "Zapri - pogovorno okno se bo zaprlo in spet boste lahko videli svoj arhiv" +#: C/password-protection.page:49(note/p) +#, fuzzy +#| msgid "" +#| "You may not be able to type password, because File Roller does " +#| "not allow this option to be used for all types of archive files, so it is " +#| "better to choose file format before setting a password." +msgid "You may not be able to type a password, because not all archive types support encryption, so it is better to choose a file format before setting a password." +msgstr "Morda gesla ne boste mogli vnesti, ker Upravljalnik arhivov te možnosti ne omogoča za vse vrste arhivov. Priporočamo vam, da izberete vrsto datoteke preden nastavite geslo." -#: C/archive-edit.page:8(desc) -msgid "Change the content of your archive." -msgstr "Spremeni vsebino vašega arhiva." +#: C/password-protection.page:55(item/p) +#| msgid "" +#| "Continue with creating a new archive" +msgid "Continue with creating a new archive." +msgstr "Nadaljujte z ustvarjanjem novega arhiva." -#: C/archive-edit.page:18(title) -msgid "Edit an archive" -msgstr "Urejanje arhiva" +#: C/password-protection.page:60(page/p) +msgid "Protect an existing archive by setting a password:" +msgstr "Zaščita obstoječega arhiva z nastavitvijo gesla:" -#: C/archive-edit.page:20(p) -msgid "With File Roller you can edit an existing archive by adding new files, removing unwanted ones or by changing their names. You can work with folders in the same way as with files." -msgstr "Z Upravljalnikom arhivov lahko uredite obstoječi arhiv z dodajanjem novih datotek, odstranitvijo neželenih ali s spremembo njihovih imen. Z mapami lahko delate na enak način kot z datotekami." +#: C/password-protection.page:63(item/p) +#| msgid "Open an archive." +msgid "Open an archive." +msgstr "Odprite arhiv." + +#: C/password-protection.page:66(item/p) +#, fuzzy +#| msgid "" +#| "Click EditPassword…" +msgid "Click EditPassword." +msgstr "Kliknite UrediGeslo …" -#: C/archive-edit.page:26(code) -#, no-wrap -msgid "Add files" -msgstr "Dodajanje datotek" +#: C/password-protection.page:70(item/p) +#| msgid "Type password into the password field" +msgid "Type a password into the password field." +msgstr "Vnesite geslo v polje gesla." -#: C/archive-edit.page:27(p) -msgid "Add files to an existing archive by following the instructions on page." -msgstr "Obstoječemu arhivu lahko dodate datoteke tako da sledite navodilom na strani ." +#: C/password-protection.page:72(note/p) +msgid "If you want to encrypt the list of files tick Encrypt the file list too." +msgstr "Če želite seznam datotek šifrirani, izberite Šifriraj tudi seznam datotek." -#: C/archive-edit.page:31(code) -#, no-wrap -msgid "Remove files" -msgstr "Odstranitev datotek" +#: C/password-protection.page:77(item/p) +#| msgid "Click OK to continue" +msgid "Click OK to continue." +msgstr "Za nadaljevanje kliknite V redu." + +#: C/password-protection.page:79(note/p) +#, fuzzy +#| msgid "" +#| "File Roller will encrypt only new files which will be added to " +#| "the archive!" +msgid "Archive Manager will encrypt only new files which will be added to the archive!" +msgstr "Upravljalnik datotek bo šifriral le nove datoteke, ki bodo dodane v arhiv!" -#: C/archive-edit.page:33(p) -#: C/archive-edit.page:42(p) -msgid "Select the file." -msgstr "Izbor datoteke." +#: C/supported-formats.page:20(info/desc) +#, fuzzy +#| msgid "File Roller has the ability to use various file formats." +msgid "Archive Manager works with a number of different file formats." +msgstr "Upravljalnik datotek ima zmožnost uporabe različnih vrst datotek." -#: C/archive-edit.page:34(p) -msgid "Click EditDelete, or right-click on the selected file, and choose Delete." -msgstr "Kliknite UrediIzbriši ali desno kliknite na izbrano datoteko in izberite Izbriši." +#: C/supported-formats.page:23(page/title) +msgid "Supported file formats" +msgstr "Podprte vrste datotek" -#: C/archive-edit.page:40(code) -#, no-wrap -msgid "Rename files" -msgstr "Preimenovanje datotek" +#: C/supported-formats.page:25(page/p) +#, fuzzy +#| msgid "The formats support by File Roller include:" +msgid "File formats that are supported by Archive Manager include:" +msgstr "Vrste datotek, ki jih podpira Upravljalnik datotek vključujejo:" -#: C/archive-edit.page:43(p) -msgid "Click EditRename…, or right-click on the selected file, and choose Rename…." -msgstr "Kliknite UrediPreimenuj … ali desno kliknite na izbrano datoteko in izberite Preimenuj …." +#: C/supported-formats.page:28(item/p) +msgid "Archive only" +msgstr "Le arhiviraj" -#: C/archive-edit.page:46(p) -msgid "A dialog will open. Enter the new file name into the text entry field." -msgstr "Odprlo se bo pogovorno okno. Vnesite novo ime datoteke v polje vnosa besedila." +#: C/supported-formats.page:30(item/p) +msgid "AIX Small Indexed Archive (.ar)" +msgstr "Majhen arhiv s kazalom AIX (.ar)" -#: C/archive-edit.page:48(p) -msgid "Confirm the name by clicking Rename." -msgstr "Potrditev ime s klikom na Preimenuj." +#: C/supported-formats.page:31(item/p) +msgid "ISO-9660 CD Disc Image [Read-only mode] (.iso)" +msgstr "Odtis CD diska ISO-9660 [način le za branje] (.iso)" -#: C/archive-create.page:7(desc) -msgid "Add files or folders to your new archive." -msgstr "Dodajanje datotek ali map v vaš nov arhiv." +#: C/supported-formats.page:32(item/p) +msgid "Tape Archive File (.tar)" +msgstr "Datoteka kasetnega arhiva (.tar)" -#: C/archive-create.page:17(title) -msgid "Create a new archive" -msgstr "Ustvarjanje novega arhiva" +#: C/supported-formats.page:35(item/p) +msgid "Archive and compression" +msgstr "Arhiviranje in stiskanje" -#: C/archive-create.page:19(p) -msgid "Create a new archive with File Roller, by following these steps:" -msgstr "Z Upravljalnikom arhivov lahko ustvarite nov arhiv s sledenjem tem korakom:" +#: C/supported-formats.page:37(item/p) +msgid "Java Archive (.jar)" +msgstr "Arhiv Java (.jar)" -#: C/archive-create.page:25(p) -msgid "Click the Create a new archive toolbar button, or click ArchiveNew…" -msgstr "Kliknite na gumb orodne vrstice Ustvari nov arhiv ali kliknite ArhivNov…" +#: C/supported-formats.page:38(item/p) +msgid "WinRAR Compressed Archive (.rar)" +msgstr "Stisnjen arhiv WinRAR (.rar)" -#: C/archive-create.page:29(p) -msgid "The file chooser will open. Use it to name your new archive file and choose its location, and click Create." -msgstr "Odprl se bo izbirnik datotek. Uporabite ga za poimenovanje svoje datoteke arhiva in izberite njegovo mesto in kliknite Ustvari." +#: C/supported-formats.page:39(item/p) +msgid "Tape Archive File compressed with:" +msgstr "Datoteke arhiva kasete, stisnjene z:" -#: C/archive-create.page:32(p) -msgid "In this dialog you may also choose the type of the file format that you want to use, available extensions should be listed below. By clicking Other options you can set a password, or split your new archive into smaller parts. You should specify the size of the volume in MB." -msgstr "V tem pogovornem oknu lahko izberete vrsto datoteke, ki jo želite uporabite. Razpoložljive razširitve bi morale biti izpisane spodaj. S klikom na Druge možnosti lahko nastavite geslo ali razdelite nov arhiv v manjše datoteke. Velikost nosilca navedite v MB." +#: C/supported-formats.page:41(item/p) +msgid "gzip (.tar.gz, .tgz)" +msgstr "gzip (.tar.gz, .tgz)" -#: C/archive-create.page:40(p) -msgid "Add the desired files to your archive by clicking the Add files to the archive toolbar button, or by clicking EditAdd files…. File Roller also allows you to add whole folders. To do this, click the Add a folder to the archive toolbar button, or select EditAdd a folder…" -msgstr "Dodajte želene datoteke v arhiv s klikom na gumb orodne vrstice Dodaj datoteke v arhiv ali s klikom na UrediDodaj datoteke …. Upravljalnik arhivov vam omogoča tudi dodajanje celih map. Za to kliknite na gumb orodne vrstice Dodaj mapo v arhiv ali izberite UrediDodaj mapo …" +#: C/supported-formats.page:42(item/p) +msgid "bzip (.tar.bz, .tbz)" +msgstr "bzip (.tar.bz, .tbz)" -#: C/archive-create.page:49(p) -msgid "When you add a folder to your archive, you will be offered some options:" -msgstr "Ko dodate mapo v arhiv, vam bodo ponujene nekatere možnosti:" +#: C/supported-formats.page:43(item/p) +msgid "bzip2 (.tar.bz2, .tbz2)" +msgstr "bzip2 (.tar.bz2, .tbz2)" -#: C/archive-create.page:52(p) -msgid "Whether to include subfolders or not" -msgstr "Ali naj bodo podmape vključene ali ne" - -#: C/archive-create.page:53(p) -msgid "Choose which files should be included" -msgstr "Izberite katere datoteke želite vključiti" - -#: C/archive-create.page:54(p) -msgid "Select which subfolders or files are to be excluded" -msgstr "Izberite katere podmape ali datoteke želite izključiti" - -#: C/archive-create.page:59(p) -msgid "Once you finish adding files, your archive is ready." -msgstr "Ko končate z dodajanjem datotek, je vaš arhiv pripravljen." +#: C/supported-formats.page:44(item/p) +msgid "lzop (.tar.lzo, .tzo)" +msgstr "lzop (.tar.lzo, .tzo)" -#. Put one translator per line, in the form of NAME , YEAR1, YEAR2 -#: C/index.page:0(None) -msgid "translator-credits" -msgstr "Andrej Žnidaršič " +#: C/supported-formats.page:45(item/p) +msgid "7zip (.tar.7z)" +msgstr "7zip (.tar.7z)" -#~ msgid "" -#~ "@@image: 'figures/file-roller_leftarrow.png'; " -#~ "md5=1878b2a4132b673aa79df7660398caa0" -#~ msgstr "" -#~ "@@image: 'figures/file-roller_leftarrow.png'; " -#~ "md5=1878b2a4132b673aa79df7660398caa0" +#: C/supported-formats.page:46(item/p) +msgid "xz (.tar.xz)" +msgstr "xz (.tar.xz)" -#~ msgid "" -#~ "@@image: 'figures/file-roller_rightarrow.png'; " -#~ "md5=45a0479ca13140680220976ccb653bda" -#~ msgstr "" -#~ "@@image: 'figures/file-roller_rightarrow.png'; " -#~ "md5=45a0479ca13140680220976ccb653bda" +#: C/supported-formats.page:49(item/p) +msgid "Cabinet File (.cab)" +msgstr "Datoteka Cabinet (.cab)" -#~ msgid "" -#~ "@@image: 'figures/file-roller_uparrow.png'; " -#~ "md5=097f01471c5575ceeb527ea8d50061bd" -#~ msgstr "" -#~ "@@image: 'figures/file-roller_uparrow.png'; " -#~ "md5=097f01471c5575ceeb527ea8d50061bd" +#: C/supported-formats.page:50(item/p) +msgid "ZIP Archived Comic Book (.cbz)" +msgstr "Stripi v arhivu ZIP (.cbz)" -#~ msgid "2009" -#~ msgstr "2009" +#: C/supported-formats.page:51(item/p) +msgid "ZIP Archive (.zip)" +msgstr "Arhiv ZIP (.zip)" -#~ msgid "Paul Cutler" -#~ msgstr "Paul Cutler" +#: C/supported-formats.page:52(item/p) +msgid "ZOO Compressed Archive File (.zoo)" +msgstr "Stisnjena datoteka arhiva ZOO (.zoo)" -#~ msgid "2006" -#~ msgstr "2006" +#: C/supported-formats.page:59(note/p) +#, fuzzy +#| msgid "" +#| "For some file formats, File Roller may require additional " +#| "plugins." +msgid "For some file formats, Archive Manager may require additional plugins." +msgstr "Za nekatere vrste datotek bo Upravljalnik arhivov morda zahteval dodatne vstavke." -#~ msgid "2008" -#~ msgstr "2008" +#: C/test-integrity.page:20(info/desc) +msgid "Check the archive for errors." +msgstr "Preverite, če so v arhivu napake." -#~ msgid "Paolo Bacchilega" -#~ msgstr "Paolo Bacchilega" +#: C/test-integrity.page:23(page/title) +msgid "Test integrity" +msgstr "Preveri celovitost" -#~ msgid "2003" -#~ msgstr "2003" +#: C/test-integrity.page:25(page/p) +#, fuzzy +#| msgid "" +#| "File Roller allows you to check whether the compressed data in " +#| "an archive contains any errors. Do this by clicking ArchiveTest Integrity." +msgid "Archive Manager allows you to check whether the compressed data in an archive contains any errors. Do this by clicking Archive Test Integrity." +msgstr "Upravljalnik datotek vam omogoča preverjanje ali stisnjeni podatki v arhivu vsebujejo podatke. To storite s klikom na ArhivPreizkusi celovitost." -#~ msgid "2004" -#~ msgstr "2004" +#: C/test-integrity.page:30(page/p) +msgid "The dialog with the Test Result will pop up. You will see the list of tested files and, at the bottom, there will also be the test summary." +msgstr "Pojavilo se bo pogovorno okno z rezultati preizkusa. Videli boste seznam preizkušenih datotek in na dnu bo tudi povzetek preizkusa." -#~ msgid "2002" -#~ msgstr "2002" +#: C/test-integrity.page:35(note/p) +msgid "The integrity test verifies that your data is not corrupt." +msgstr "Preizkus celovitosti preveri, da vaši podatki niso okvarjeni." -#~ msgid "Sun" -#~ msgstr "Sun" +#: C/troubleshooting-archive-open.page:22(info/desc) +msgid "I cannot open an archive." +msgstr "Ne morem odpreti arhiva." -#~ msgid "Paolo" -#~ msgstr "Paolo" +#: C/troubleshooting-archive-open.page:25(page/title) +msgid "Problem opening an archive" +msgstr "Težave z odpiranjem arhiva" -#~ msgid "Bacchilega" -#~ msgstr "Bacchilega" +#: C/troubleshooting-archive-open.page:27(page/p) +#, fuzzy +#| msgid "" +#| "If you cannot open an existing archive with File Roller, check " +#| "the format of your file. Some types of archive may require additional " +#| "plugins, the installation process for these varies between different " +#| "distributions." +msgid "If you cannot open an existing archive with Archive Manager, check the format of your file. Some types of archive may require additional plugins; the installation process for these varies between different distributions." +msgstr "Če obstoječega arhiva nočete odpreti z Upravljalnikom datotek, preverite vrsto datoteke. Nekatere vrste arhivov morda zahtevajo dodatne vstavke. Namestitveno opravilo za vstavke je različno za različne distribucije." -#~ msgid "Alexander" -#~ msgstr "Alexander" +#: C/troubleshooting-archive-open.page:33(note/p) +#, fuzzy +#| msgid "" +#| "If File Roller cannot open a recently used archive, it may be " +#| "that the location of this archive file has changed. See the help page " +#| "about opening an archive for further " +#| "information." +msgid "If Archive Manager cannot open a recently used archive, it may be that the location of this archive file has changed. See the help page about opening an archive for further information." +msgstr "Če Upravljalnik datotek ne more odpreti nedavno uporabljenega arhiva, se je morda mesto datoteke arhiva spremenilo. Oglejte si stran pomoči o odpiranju arhiva za nadaljnje podrobnosti." -#~ msgid "Kirillov" -#~ msgstr "Kirillov" +#: C/troubleshooting-password.page:21(info/desc) +msgid "I have set a password, but it does not protect the whole archive." +msgstr "Nastavil sem geslo, a ne zaščiti celotnega arhiva." -#~ msgid "kirillov@math.sunysb.edu" -#~ msgstr "kirillov@math.sunysb.edu" +#: C/troubleshooting-password.page:25(page/title) +msgid "Problem setting a password" +msgstr "Težave z nastavljanjem gesla" -#~ msgid "Paul" -#~ msgstr "Paul" +#: C/troubleshooting-password.page:27(page/p) +#, fuzzy +#| msgid "" +#| "File Roller does not ensure password protection for an " +#| "existing archive. While working with such an archive, you can only set a " +#| "password for newly added files. To do this, follow instructions on Password protection page." +msgid "Archive Manager does not add password protection for an existing archive. While working with such an archive, you can only set a password for newly added files. To do this, follow instructions on Password protection page." +msgstr "Upravljalnik arhivov ne zagotavlja zaščite z geslom za obstoječe arhive. Geslo lahko nastavite samo za novo dodane datoteke. Navodila za to lahko najdete na strani zaščita gesla." -#~ msgid "pcutler@foresightlinux.org" -#~ msgstr "pcutler@foresightlinux.org" diff -Nru file-roller-3.6.0/help/sl/test-integrity.page file-roller-3.6.3/help/sl/test-integrity.page --- file-roller-3.6.0/help/sl/test-integrity.page 2012-09-17 20:22:25.000000000 +0000 +++ file-roller-3.6.3/help/sl/test-integrity.page 2012-11-27 20:27:02.000000000 +0000 @@ -16,7 +16,7 @@

Dovoljenje Creative Commons - deljenje pod istimi pogoji 3.0

 - Check the archive for errors. + Preverite, če so v arhivu napake. Preveri celovitost diff -Nru file-roller-3.6.0/nautilus/Makefile.in file-roller-3.6.3/nautilus/Makefile.in --- file-roller-3.6.0/nautilus/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/nautilus/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/po/an.po file-roller-3.6.3/po/an.po --- file-roller-3.6.0/po/an.po 2012-04-16 19:15:56.000000000 +0000 +++ file-roller-3.6.3/po/an.po 2012-10-02 18:39:26.000000000 +0000 @@ -9,10 +9,11 @@ "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: 2012-02-20 23:54+0000\n" -"PO-Revision-Date: 2012-04-13 12:43+0200\n" +"POT-Creation-Date: 2012-09-29 07:29+0000\n" +"PO-Revision-Date: 2012-09-29 11:37+0200\n" "Last-Translator: Daniel Martinez \n" "Language-Team: Aragonés \n" +"Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bits\n" @@ -81,8 +82,8 @@ msgid "Show session management options" msgstr "Amostrar as opcions de chestion d'a sesion" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1981 -#: ../src/fr-window.c:5452 +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1960 +#: ../src/fr-window.c:5340 msgid "Archive Manager" msgstr "Chestor d'archivadors" @@ -159,64 +160,50 @@ msgstr "Amostrar a columna ruta en a finestra prencipal." #: ../data/org.gnome.FileRoller.gschema.xml.in.h:15 -msgid "Use mime icons" -msgstr "Fer servir iconos MIME" - -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:16 -msgid "" -"If true will display icons depending on the file type (slower), otherwise " -"will use always the same icon for all files (faster)." -msgstr "" -"Si ye verdadero amostrara iconos en funcion d'o tipo d'archivo (más lento), " -"d'atro modo fera servir de peren o mesmo icono ta totz os archivos (mas " -"rapido)." - -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:17 msgid "Name column width" msgstr "Amplo d'a columna \"nome\"" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:18 -#| msgid "The default width of the name column the file list." +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:16 msgid "The default width of the name column in the file list." msgstr "L'amplo predeterminau d'a columna nome en a lista d'archivos." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:17 msgid "Max history length" msgstr "Tamanyo maximo d'o historial" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:18 msgid "Max number of items in the 'Open Recents' submenu." msgstr "O numero maximo d'elementos en o submenu 'Ubrir recientz'." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19 msgid "View toolbar" msgstr "Veyer barra d'ainas" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20 msgid "Whether to display the toolbar." msgstr "Dice si s'ha d'amostrar a barra d'ainas" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 msgid "View statusbar" msgstr "Veyer barra d'estau" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22 msgid "Whether to display the statusbar." msgstr "Dice si s'ha d'amostrar a barra d'estau" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25 ../src/ui.h:229 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 ../src/ui.h:212 msgid "View the folders pane" msgstr "Veyer o panel de carpetas" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24 msgid "Whether to display the folders pane." msgstr "Dice si s'ha d'amostrar o panel de carpetas." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25 msgid "Editors" msgstr "Editors" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26 msgid "" "List of applications entered in the 'Open File' dialog and not associated " "with the file type." @@ -224,11 +211,11 @@ "Lista d'aplicacions mesa en o dialogo 'Ubrir archivo' y no asociadas con o " "tipo d'archivo." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27 msgid "Compression level" msgstr "Ran de compresion" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28 msgid "" "Compression level used when adding files to an archive. Possible values: " "very-fast, fast, normal, maximum." @@ -237,11 +224,11 @@ "valors posibles estan \"very-fast\" (muy ascape), \"fast\" (ascape), normal, " "y \"maximum\" (maximo)." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29 msgid "Encrypt the archive header" msgstr "Cifrar a cabecera de l'archivo" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30 msgid "" "Whether to encrypt the archive header. If the header is encrypted the " "password will be required to list the archive content as well." @@ -249,309 +236,125 @@ "Dice si cifrar a cabecera d¡o archivo. Si la cabecera ye cifrada se " "demandará la clau de paso ta listar tambien o conteniu d'o archivo." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:33 -msgid "Overwrite existing files" -msgstr "Sobreescribir archivos existentz" - -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:34 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31 msgid "Do not overwrite newer files" msgstr "No sobreescribir archivos mas nuevos" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:35 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32 msgid "Recreate the folders stored in the archive" msgstr "Recreyar as carpetas mesas en l'archivador" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:36 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:33 msgid "Default volume size" msgstr "Tamanyo predeterminau d'o volumen" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:37 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:34 msgid "The default size for volumes." msgstr "O tamanyo predeterminau d'os volumens" -#: ../data/ui/add-options.ui.h:1 -msgid "Load Options" -msgstr "Carga as opcions" - -#: ../data/ui/batch-add-files.ui.h:1 -msgid "Compress" -msgstr "Comprimir" - -#: ../data/ui/batch-add-files.ui.h:2 -msgid "_Filename:" -msgstr "Nome de l'_archivo:" - -#. Translators: after the colon there is a folder name. -#: ../data/ui/batch-add-files.ui.h:3 ../src/fr-window.c:5905 -msgid "_Location:" -msgstr "_Puesto:" - -#: ../data/ui/batch-add-files.ui.h:4 -msgid "Location" -msgstr "Puesto" - -#: ../data/ui/batch-add-files.ui.h:5 ../data/ui/batch-password.ui.h:2 -#: ../data/ui/new.ui.h:1 ../data/ui/password.ui.h:3 -msgid "_Password:" -msgstr "Clau de _paso:" - -#: ../data/ui/batch-add-files.ui.h:6 ../data/ui/new.ui.h:2 -msgid "_Encrypt the file list too" -msgstr "_Cifrar tambien a lista d'archivos" - -#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. -#: ../data/ui/batch-add-files.ui.h:8 ../data/ui/new.ui.h:3 -msgid "Split into _volumes of" -msgstr "Tallar en _volumens de" - -#. MB means megabytes -#: ../data/ui/batch-add-files.ui.h:10 ../data/ui/new.ui.h:5 -msgid "MB" -msgstr "MB" - -#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/new.ui.h:6 -msgid "_Other Options" -msgstr "Atras _opcions" - -#: ../data/ui/batch-password.ui.h:1 -msgid "Password required" -msgstr "" -"S'amenista una clau de paso" - -#: ../data/ui/delete.ui.h:1 -msgid "Delete" -msgstr "Borrar" - -#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:348 -msgid "_Files:" -msgstr "A_rchivos:" - -#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:359 -msgid "example: *.txt; *.doc" -msgstr "exemplo: *.txt; *.doc" - -#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:362 -msgid "_All files" -msgstr "_Totz os archivos" - -#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:369 -msgid "_Selected files" -msgstr "Archivos _trigaus" - -#: ../data/ui/password.ui.h:1 -msgid "Password" -msgstr "Clau de paso" - -#: ../data/ui/password.ui.h:2 -#| msgid "_Encrypt the file list too" -msgid "_Encrypt the file list" -msgstr "_Cifrar a lista d'archivos" - -#: ../data/ui/password.ui.h:4 -msgid "" -"Note: the password will be used to encrypt files you add to the " -"current archive, and to decrypt files you extract from the current archive. " -"When the archive is closed the password will be deleted." -msgstr "" -"Nota: a clau de paso se ferá servir ta cifrar os archivos que " -"anyada a l'archivador actual, y ta descifrar os archivos que extraiga d'o " -"archivador actual. Cuan se tranque l'archivador se borrara a clau de paso." - -#. secondary text -#: ../data/ui/update.ui.h:1 ../src/dlg-update.c:175 ../src/dlg-update.c:203 -#, c-format -msgid "" -"The file has been modified with an external application. If you don't update " -"the file in the archive, all of your changes will be lost." -msgid_plural "" -"%d files have been modified with an external application. If you don't " -"update the files in the archive, all of your changes will be lost." -msgstr[0] "" -"L'archivo ha estau modificau con una aplicacion externa. Se perderan totz os " -"cambeos si no esviella la version en l'archivador." -msgstr[1] "" -"%d archivos han estau modificaus con una aplicacion externa. Se perderan " -"totz os cambeos si no esviella las versions en l'archivador." - -#: ../data/ui/update.ui.h:2 -msgid "_Update" -msgstr "_Esviellar" - -#: ../data/ui/update.ui.h:3 -msgid "S_elect the files you want to update:" -msgstr "Tri_e os archivos que quiere esviellar:" - -#: ../nautilus/nautilus-fileroller.c:325 +#: ../nautilus/nautilus-fileroller.c:327 msgid "Extract Here" msgstr "Sacar aqui" #. Translators: the current position is the current folder -#: ../nautilus/nautilus-fileroller.c:327 +#: ../nautilus/nautilus-fileroller.c:329 msgid "Extract the selected archive to the current position" msgstr "Sacar l'archivo trigau en a carpeta actual" -#: ../nautilus/nautilus-fileroller.c:344 +#: ../nautilus/nautilus-fileroller.c:346 msgid "Extract To..." msgstr "Sacar a..." -#: ../nautilus/nautilus-fileroller.c:345 +#: ../nautilus/nautilus-fileroller.c:347 msgid "Extract the selected archive" msgstr "Sacar l'archivo trigau" -#: ../nautilus/nautilus-fileroller.c:364 +#: ../nautilus/nautilus-fileroller.c:366 msgid "Compress..." msgstr "Comprimir..." -#: ../nautilus/nautilus-fileroller.c:365 +#: ../nautilus/nautilus-fileroller.c:367 msgid "Create a compressed archive with the selected objects" msgstr "Creyar un archivador comprimiu con os obchetos trigaus" -#: ../src/actions.c:156 ../src/actions.c:195 ../src/actions.c:231 -#: ../src/dlg-batch-add.c:157 ../src/dlg-batch-add.c:173 -#: ../src/dlg-batch-add.c:202 ../src/dlg-batch-add.c:247 -#: ../src/dlg-batch-add.c:293 ../src/fr-window.c:2980 -msgid "Could not create the archive" -msgstr "No s'ha puesto creyar l'archivador" - -#: ../src/actions.c:158 ../src/dlg-batch-add.c:159 ../src/dlg-batch-add.c:295 -msgid "You have to specify an archive name." -msgstr "Ha de especificar un nome d'archivador." - -#: ../src/actions.c:197 -msgid "You don't have permission to create an archive in this folder" -msgstr "No ha permisos ta creyar un archivador en ista carpeta" - -#: ../src/actions.c:233 ../src/dlg-package-installer.c:268 -#: ../src/dlg-package-installer.c:277 ../src/dlg-package-installer.c:305 -#: ../src/fr-archive.c:1178 ../src/fr-window.c:6090 ../src/fr-window.c:6266 -msgid "Archive type not supported." -msgstr "Tipo de archivador no soportau." - -#: ../src/actions.c:247 -msgid "Could not delete the old archive." -msgstr "No s'ha puesto borrar l'archivador anterior." - -#: ../src/actions.c:381 ../src/fr-window.c:5827 +#: ../src/actions.c:112 ../src/fr-window.c:5635 ../src/fr-window.c:6180 msgid "Open" msgstr "Ubrir" -#: ../src/actions.c:392 ../src/dlg-new.c:312 ../src/fr-window.c:5266 +#: ../src/actions.c:125 ../src/fr-window.c:5178 msgid "All archives" msgstr "Totz os archivadors" -#: ../src/actions.c:399 ../src/dlg-new.c:319 +#: ../src/actions.c:132 msgid "All files" msgstr "Totz os archivos" -#: ../src/actions.c:844 +#: ../src/actions.c:499 msgid "Copyright © 2001–2010 Free Software Foundation, Inc." msgstr "Copyright © 2001–2010 Free Software Foundation, Inc." -#: ../src/actions.c:845 +#: ../src/actions.c:500 msgid "An archive manager for GNOME." msgstr "Un chestor d'archivadors ta Gnome" -#: ../src/actions.c:848 +#: ../src/actions.c:503 msgid "translator-credits" msgstr "Daniel Martinez , 2011" -#: ../src/dlg-add-files.c:99 ../src/dlg-add-folder.c:129 +#: ../src/dlg-add.c:116 msgid "Could not add the files to the archive" msgstr "No s'han puesto anyadir os archivos a l'archivador" -#: ../src/dlg-add-files.c:100 ../src/dlg-add-folder.c:130 +#: ../src/dlg-add.c:117 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "No ha los permisos apropiaus ta leyer archivos d'a carpeta \"%s\"" -#: ../src/dlg-add-files.c:148 ../src/ui.h:46 +#: ../src/dlg-add.c:182 ../src/ui.h:46 msgid "Add Files" msgstr "Anyadir archivos" -#. Translators: add a file to the archive only if the disk version is -#. * newer than the archive version. -#: ../src/dlg-add-files.c:164 ../src/dlg-add-folder.c:230 -msgid "Add only if _newer" -msgstr "Anyadir solo que si ye mas _nuevo" - -#: ../src/dlg-add-folder.c:216 -msgid "Add a Folder" -msgstr "Anyadir una carpeta" - -#: ../src/dlg-add-folder.c:231 -msgid "_Include subfolders" -msgstr "_Incluyir subcarpetas" - -#: ../src/dlg-add-folder.c:232 -msgid "Exclude folders that are symbolic lin_ks" -msgstr "Excluyir as carpetas que sigan en_rastres simbolicos" - -#: ../src/dlg-add-folder.c:235 ../src/dlg-add-folder.c:241 -#: ../src/dlg-add-folder.c:247 -msgid "example: *.o; *.bak" -msgstr "exemplo: *.o; *.bak" - -#: ../src/dlg-add-folder.c:236 -msgid "Include _files:" -msgstr "Incluyir _archivos:" +#: ../src/dlg-add.c:193 +#| msgid "_Load Options" +msgid "_Options" +msgstr "_Opcions" -#: ../src/dlg-add-folder.c:242 -msgid "E_xclude files:" -msgstr "E_xcluyir archivos:" - -#: ../src/dlg-add-folder.c:248 -msgid "_Exclude folders:" -msgstr "_Excluyir carpetas:" - -#: ../src/dlg-add-folder.c:252 -msgid "_Load Options" -msgstr "_Cargar opcions" - -#: ../src/dlg-add-folder.c:253 -msgid "Sa_ve Options" -msgstr "_Alzar opcions" - -#: ../src/dlg-add-folder.c:254 -msgid "_Reset Options" -msgstr "_Restablecer opcions" +#. load options +#: ../src/dlg-add.c:202 ../src/ui/add-options.ui.h:1 +msgid "Load Options" +msgstr "Carga as opcions" -#: ../src/dlg-add-folder.c:882 +#. save options +#: ../src/dlg-add.c:209 ../src/dlg-add.c:825 msgid "Save Options" msgstr "Alza las opcions" -#: ../src/dlg-add-folder.c:883 -#| msgid "Options Name:" +#. clear options +#: ../src/dlg-add.c:216 +#| msgid "_Reset Options" +msgid "Reset Options" +msgstr "Restablecer as opcions" + +#: ../src/dlg-add.c:826 msgid "_Options Name:" msgstr "Nome de _opcions:" -#: ../src/dlg-ask-password.c:122 +#. Translators: %s is a filename +#: ../src/dlg-ask-password.c:131 #, c-format -msgid "Enter the password for the archive '%s'." -msgstr "Mete a clau de paso ta l'archivador '%s'." +msgid "Password required for \"%s\"" +msgstr "S'amenista una clau de paso ta \"%s\"" -#: ../src/dlg-batch-add.c:174 -#, c-format -msgid "" -"The name \"%s\" is not valid because it cannot contain the characters: %s\n" -"\n" -"%s" -msgstr "" -"O nome \"%s\" no ye valido porque no ha de tener o caracter: %s\n" -"\n" -"%s" - -#: ../src/dlg-batch-add.c:177 ../src/fr-window.c:7644 ../src/fr-window.c:7646 -msgid "Please use a different name." -msgstr "Faiga servir un nome diferent." +#: ../src/dlg-ask-password.c:139 +#| msgid "Password" +msgid "Wrong password." +msgstr "Clau de paso incorrecta." -#: ../src/dlg-batch-add.c:204 -msgid "" -"You don't have the right permissions to create an archive in the destination " -"folder." -msgstr "No ha permiso ta creyar un archivador en a carpeta de destino." +#: ../src/dlg-batch-add.c:81 ../src/main.c:417 ../src/main.c:783 +msgid "Compress" +msgstr "Comprimir" -#: ../src/dlg-batch-add.c:220 ../src/dlg-extract.c:102 ../src/fr-window.c:6865 +#: ../src/dlg-extract.c:96 ../src/fr-window.c:6725 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -562,74 +365,44 @@ "\n" "¿Quiere creyar-la?" -#: ../src/dlg-batch-add.c:229 ../src/dlg-extract.c:111 ../src/fr-window.c:6874 +#: ../src/dlg-extract.c:105 ../src/fr-window.c:6734 msgid "Create _Folder" msgstr "Creyar _carpeta" -#: ../src/dlg-batch-add.c:248 ../src/dlg-extract.c:131 ../src/fr-window.c:6891 +#: ../src/dlg-extract.c:124 ../src/dlg-extract.c:142 ../src/dlg-extract.c:169 +#: ../src/fr-window.c:4124 ../src/fr-window.c:6629 ../src/fr-window.c:6634 +#: ../src/fr-window.c:6755 ../src/fr-window.c:6774 ../src/fr-window.c:6779 +msgid "Extraction not performed" +msgstr "Sacada no feita" + +#: ../src/dlg-extract.c:125 ../src/fr-window.c:6751 #, c-format msgid "Could not create the destination folder: %s." msgstr "No s'ha puesto creyar a carpeta de destino %s." -#: ../src/dlg-batch-add.c:265 -msgid "Archive not created" -msgstr "Archivador no creyau" - -#: ../src/dlg-batch-add.c:313 -msgid "The archive is already present. Do you want to overwrite it?" -msgstr "L'archivador ya existe. Quiere sobreescribir-lo?" - -#: ../src/dlg-batch-add.c:316 -msgid "_Overwrite" -msgstr "_Sobreescribir" - -#: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 -#: ../src/fr-window.c:4205 ../src/fr-window.c:6895 ../src/fr-window.c:6914 -#: ../src/fr-window.c:6919 -msgid "Extraction not performed" -msgstr "Sacada no feita" - -#: ../src/dlg-extract.c:176 ../src/fr-window.c:4368 ../src/fr-window.c:4448 +#: ../src/dlg-extract.c:170 ../src/fr-window.c:4290 ../src/fr-window.c:4374 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" msgstr "No ha los permisos ta extrayer archivadors en a carpeta \"%s\"" -#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:121 +#: ../src/dlg-extract.c:283 ../src/ui/extract-dialog-options.ui.h:1 +#: ../src/ui.h:113 msgid "Extract" msgstr "Sacar" -#: ../src/dlg-extract.c:380 -msgid "Actions" -msgstr "Accions" - -#: ../src/dlg-extract.c:396 -msgid "Re-crea_te folders" -msgstr "R_ecreyar as carpetas" - -#: ../src/dlg-extract.c:400 -msgid "Over_write existing files" -msgstr "Sobre_escribir archivos existentz" - -#: ../src/dlg-extract.c:404 -msgid "Do not e_xtract older files" -msgstr "No e_xtrayer archivos mas viellos" - -#: ../src/dlg-new.c:440 -msgctxt "File" -msgid "New" -msgstr "Nuevo" - -#: ../src/dlg-new.c:453 -msgctxt "File" -msgid "Save" -msgstr "Alzar" - -#: ../src/dlg-package-installer.c:107 ../src/dlg-package-installer.c:219 +#: ../src/dlg-package-installer.c:112 ../src/dlg-package-installer.c:225 msgid "There was an internal error trying to search for applications:" msgstr "Habió una error interna en prebar de mirar aplicacions:" -#: ../src/dlg-package-installer.c:287 +#: ../src/dlg-package-installer.c:294 ../src/dlg-package-installer.c:303 +#: ../src/dlg-package-installer.c:331 ../src/fr-archive.c:740 +#: ../src/fr-window.c:3854 ../src/fr-window.c:7330 ../src/fr-window.c:7686 +#: ../src/fr-window.c:9227 +msgid "Archive type not supported." +msgstr "Tipo de archivador no soportau." + +#: ../src/dlg-package-installer.c:313 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -638,272 +411,151 @@ "No bi ha garra comando instalau ta los archivos %s.\n" "Quiere mirar d'un comando ta ubrir iste archivo?" -#: ../src/dlg-package-installer.c:292 +#: ../src/dlg-package-installer.c:318 msgid "Could not open this file type" msgstr "No s'ha puesto ubir iste tipo d'archivo" -#: ../src/dlg-package-installer.c:295 +#: ../src/dlg-package-installer.c:321 msgid "_Search Command" msgstr "Comando de _busqueda" -#. Translators: after the colon there is a folder name. -#: ../src/dlg-prop.c:106 -msgid "Location:" -msgstr "Puesto:" - -#: ../src/dlg-prop.c:118 -msgctxt "File" -msgid "Name:" -msgstr "Nome:" +#: ../src/dlg-password.c:91 +#, c-format +#| msgid "Enter the password for the archive '%s'." +msgid "Enter a password for \"%s\"" +msgstr "Mete a clau de paso ta \"%s\"." -#: ../src/dlg-prop.c:124 +#: ../src/dlg-prop.c:96 #, c-format msgid "%s Properties" msgstr "Propiedatz de %s" -#: ../src/dlg-prop.c:133 -#| msgctxt "File" -#| msgid "Date Modified" -msgid "Last modified:" -msgstr "Zaguera modificacion:" - -#: ../src/dlg-prop.c:143 -msgid "Archive size:" -msgstr "Tamanyo d'o archivador:" - -#: ../src/dlg-prop.c:154 -msgid "Content size:" -msgstr "Tamanyo d'o conteniu:" - -#: ../src/dlg-prop.c:174 -msgid "Compression ratio:" -msgstr "Tasa de compresion:" - -#: ../src/dlg-prop.c:189 -msgid "Number of files:" -msgstr "Numero d'archivos:" - -#: ../src/dlg-update.c:163 +#: ../src/dlg-update.c:162 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "Esviellar l'archivo \"%s\" en l'archivador \"%s\"?" -#: ../src/dlg-update.c:192 -#, c-format -msgid "Update the files in the archive \"%s\"?" -msgstr "Esviellar os archivos en l'archivador \"%s\"?" - -#: ../src/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Formato d'archivo: %s" - -#: ../src/eggfileformatchooser.c:397 -msgid "All Files" -msgstr "Totz os archivos" - -#: ../src/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Totz os archivos soportaus" - -#: ../src/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Por extension" - -#: ../src/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Formato d'archivo" - -#: ../src/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Extensions" - -#: ../src/eggfileformatchooser.c:675 +#. secondary text +#: ../src/dlg-update.c:173 ../src/dlg-update.c:198 ../src/ui/update.ui.h:2 #, c-format msgid "" -"The program was not able to find out the file format you want to use for `" -"%s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"O programa no ha puesto trobar o formato d'archivo que quiere fer servir ta " -"'%s'. Pare cuenta de fer servir una extension d'archivo conoxida ta " -"l'archivo u trie manualment un formato d'archivo d'a lista de abaxo." - -#: ../src/eggfileformatchooser.c:682 -msgid "File format not recognized" -msgstr "No s'ha reconoxiu o formato d'archivo" - -#: ../src/fr-archive.c:1158 -msgid "File not found." -msgstr "No s'ha trobau l'archivo." +"The file has been modified with an external application. If you don't update " +"the file in the archive, all of your changes will be lost." +msgid_plural "" +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." +msgstr[0] "" +"L'archivo ha estau modificau con una aplicacion externa. Se perderan totz os " +"cambeos si no esviella la version en l'archivador." +msgstr[1] "" +"%d archivos han estau modificaus con una aplicacion externa. Se perderan " +"totz os cambeos si no esviella las versions en l'archivador." -#: ../src/fr-archive.c:1261 +#: ../src/dlg-update.c:188 #, c-format -#| msgid "File not found." -msgid "Archive not found" -msgstr "No s'ha trobau l'archivo." +msgid "Update the files in the archive \"%s\"?" +msgstr "Esviellar os archivos en l'archivador \"%s\"?" -#: ../src/fr-archive.c:2427 +#: ../src/fr-archive.c:1840 msgid "You don't have the right permissions." msgstr "No tiene os permisos apropiaus." -#: ../src/fr-archive.c:2427 +#: ../src/fr-archive.c:1840 msgid "This archive type cannot be modified" msgstr "Iste tipo d'archivador no se puede modificar" -#: ../src/fr-archive.c:2439 +#: ../src/fr-archive.c:1854 msgid "You can't add an archive to itself." msgstr "No puede anyadir un archivador a si mesmo." -#. Translators: after the colon there is a filename. -#: ../src/fr-command-7z.c:297 ../src/fr-command-rar.c:324 -#: ../src/fr-command-tar.c:307 -msgid "Adding file: " -msgstr "Anyadindo archivo: " +#. Translators: %s is a filename. +#: ../src/fr-command-7z.c:297 ../src/fr-command-rar.c:325 +#: ../src/fr-command-tar.c:305 +#, c-format +msgid "Adding \"%s\"" +msgstr "Anyadindo \"%s\"" -#. Translators: after the colon there is a filename. -#: ../src/fr-command-7z.c:418 ../src/fr-command-rar.c:451 +#. Translators: %s is a filename. +#: ../src/fr-command-7z.c:420 ../src/fr-command-rar.c:455 #: ../src/fr-command-tar.c:426 -msgid "Extracting file: " -msgstr "Sacando archivo: " +#, c-format +#| msgid "Starting %s" +msgid "Extracting \"%s\"" +msgstr "Sacando \"%s\"" -#. Translators: after the colon there is a filename. -#: ../src/fr-command-rar.c:402 ../src/fr-command-tar.c:372 -msgid "Removing file: " -msgstr "Borrando archivo: " +#: ../src/fr-command.c:597 +#, c-format +msgid "Archive not found" +msgstr "No s'ha trobau l'archivo." -#: ../src/fr-command-rar.c:584 +#. Translators: %s is a filename. +#: ../src/fr-command-rar.c:406 ../src/fr-command-tar.c:371 +#, c-format +#| msgid "Removing file: " +msgid "Removing \"%s\"" +msgstr "Quitando \"%s\"" + +#: ../src/fr-command-rar.c:581 #, c-format msgid "Could not find the volume: %s" msgstr "No s'ha puesto trobar o volumen: %s" -#: ../src/fr-command-tar.c:381 ../src/fr-window.c:2315 +#: ../src/fr-command-tar.c:381 msgid "Deleting files from archive" msgstr "Borrando archivos de l'archivador" -#: ../src/fr-command-tar.c:485 +#: ../src/fr-command-tar.c:486 msgid "Recompressing archive" msgstr "Recomprimindo archivador" -#: ../src/fr-command-tar.c:736 +#: ../src/fr-command-tar.c:725 msgid "Decompressing archive" msgstr "Descomprimindo archivador" -#: ../src/fr-init.c:58 -msgid "7-Zip (.7z)" -msgstr "7-Zip (.7z)" - -#: ../src/fr-init.c:59 -msgid "Tar compressed with 7z (.tar.7z)" -msgstr "Tar comprimiu con 7z (.tar.7z)" - -#: ../src/fr-init.c:60 -msgid "Ace (.ace)" -msgstr "Ace (.ace)" - -#: ../src/fr-init.c:62 -msgid "Ar (.ar)" -msgstr "Ar (.ar)" - -#: ../src/fr-init.c:63 -msgid "Arj (.arj)" -msgstr "Arj (.arj)" - -#: ../src/fr-init.c:65 -msgid "Tar compressed with bzip2 (.tar.bz2)" -msgstr "Tar comprimiu con bzip2 (.tar.bz2)" - -#: ../src/fr-init.c:67 -msgid "Tar compressed with bzip (.tar.bz)" -msgstr "Tar comprimiu con bzip (.tar.bz)" - -#: ../src/fr-init.c:68 -msgid "Cabinet (.cab)" -msgstr "Cabinet (.cab)" - -#: ../src/fr-init.c:69 -msgid "Rar Archived Comic Book (.cbr)" -msgstr "Libro de comic archivau en rar (.cbr)" - -#: ../src/fr-init.c:70 -msgid "Zip Archived Comic Book (.cbz)" -msgstr "Libro de comic archivau en zip (.cbz)" - -#: ../src/fr-init.c:73 -msgid "Tar compressed with gzip (.tar.gz)" -msgstr "Tar comprimiu con gzip (.tar.gz)" - -#: ../src/fr-init.c:76 -msgid "Ear (.ear)" -msgstr "Ear (.ear)" - -#: ../src/fr-init.c:77 -msgid "Self-extracting zip (.exe)" -msgstr "Zip autoextrayible (.exe)" - -#: ../src/fr-init.c:79 -msgid "Jar (.jar)" -msgstr "Jar (.jar)" - -#: ../src/fr-init.c:80 -msgid "Lha (.lzh)" -msgstr "Lha (.lzh)" - -#: ../src/fr-init.c:81 -msgid "Lrzip (.lrz)" -msgstr "Lrzip (.lrz)" - -#: ../src/fr-init.c:82 -msgid "Tar compressed with lrzip (.tar.lrz)" -msgstr "Tar comprimiu con lrzip (.tar.lrz)" - -#: ../src/fr-init.c:84 -msgid "Tar compressed with lzip (.tar.lz)" -msgstr "Tar comprimiu con lzip (.tar.lz)" - -#: ../src/fr-init.c:86 -msgid "Tar compressed with lzma (.tar.lzma)" -msgstr "Tar comprimiu con lzma (.tar.lzma)" - -#: ../src/fr-init.c:88 -msgid "Tar compressed with lzop (.tar.lzo)" -msgstr "Tar comprimiu con lzop (.tar.lzo)" - -#: ../src/fr-init.c:89 -msgid "Windows Imaging Format (.wim)" -msgstr "Formato d'imachen de Windows (.wim)" - -#: ../src/fr-init.c:90 -msgid "Rar (.rar)" -msgstr "Rar (.rar)" - -#: ../src/fr-init.c:93 -msgid "Tar uncompressed (.tar)" -msgstr "Tar sin compresion (.tar)" - -#: ../src/fr-init.c:94 -msgid "Tar compressed with compress (.tar.Z)" -msgstr "Tar comprimiu con compress (.tar.Z)" - -#: ../src/fr-init.c:96 -msgid "War (.war)" -msgstr "War (.war)" - -#: ../src/fr-init.c:97 -msgid "Xz (.xz)" -msgstr "Xz (.xz)" - -#: ../src/fr-init.c:98 -msgid "Tar compressed with xz (.tar.xz)" -msgstr "Tar comprimiu con xz (.tar.xz)" - -#: ../src/fr-init.c:99 -msgid "Zoo (.zoo)" -msgstr "Zoo (.zoo)" - -#: ../src/fr-init.c:100 -msgid "Zip (.zip)" -msgstr "Zip (.zip)" +#: ../src/fr-file-selector-dialog.c:588 +msgid "File System" +msgstr "Sistema d'archivos" + +#: ../src/fr-file-selector-dialog.c:1331 ../src/fr-file-selector-dialog.c:1376 +#| msgid "Could not perform the operation" +msgid "Could not load the location" +msgstr "No s'ha puesto cargar o puesto" + +#: ../src/fr-new-archive-dialog.c:335 ../src/fr-new-archive-dialog.c:354 +#: ../src/fr-new-archive-dialog.c:370 ../src/fr-new-archive-dialog.c:418 +#: ../src/fr-window.c:2822 +msgid "Could not create the archive" +msgstr "No s'ha puesto creyar l'archivador" + +#: ../src/fr-new-archive-dialog.c:337 ../src/fr-new-archive-dialog.c:356 +msgid "You have to specify an archive name." +msgstr "Ha de especificar un nome d'archivador." + +#: ../src/fr-new-archive-dialog.c:420 +msgid "You don't have permission to create an archive in this folder" +msgstr "No ha permisos ta creyar un archivador en ista carpeta" + +#: ../src/fr-new-archive-dialog.c:439 +#, c-format +#| msgid "The archive is already present. Do you want to overwrite it?" +msgid "A file named \"%s\" already exists. Do you want to replace it?" +msgstr "Ya existe un archivo clamau \"%s\". Quiere reemplazar-lo?" + +#: ../src/fr-new-archive-dialog.c:440 +#, c-format +msgid "" +"The file already exists in \"%s\". Replacing it will overwrite its contents." +msgstr "" +"L'archivo ya existe en \"%s\". Si lo reemplaza sobrescribirá lo suyo " +"conteniu." + +#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:6567 +msgid "_Replace" +msgstr "_Reemplazar" + +#: ../src/fr-new-archive-dialog.c:462 +msgid "Could not delete the old archive." +msgstr "No s'ha puesto borrar l'archivador anterior." #: ../src/fr-stock.c:41 msgid "C_reate" @@ -917,145 +569,215 @@ msgid "_Extract" msgstr "_Sacar" -#: ../src/fr-window.c:1517 +#: ../src/fr-window.c:1045 +#| msgid "Extraction completed successfully" +msgid "Operation completed" +msgstr "Operación rematada" + +#: ../src/fr-window.c:1162 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" msgstr[0] "%d obcheto (%s)" msgstr[1] "%d obchetos (%s)" -#: ../src/fr-window.c:1522 +#: ../src/fr-window.c:1167 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" msgstr[0] "%d obcheto trigau (%s)" msgstr[1] "%d obchetos trigaus (%s)" -#: ../src/fr-window.c:1592 +#: ../src/fr-window.c:1587 msgid "Folder" msgstr "Carpeta" -#: ../src/fr-window.c:1989 +#: ../src/fr-window.c:1968 msgid "[read only]" msgstr "[solo que lectura]" -#: ../src/fr-window.c:2238 +#: ../src/fr-window.c:2087 #, c-format msgid "Could not display the folder \"%s\"" msgstr "No s'ha puesto amostrar a carpeta \"%s\"" -#: ../src/fr-window.c:2306 ../src/fr-window.c:2336 -msgid "Creating archive" -msgstr "Creyando archivador" - -#: ../src/fr-window.c:2309 -msgid "Loading archive" -msgstr "Cargando archivador" - -#: ../src/fr-window.c:2312 -msgid "Reading archive" -msgstr "Leyendo archivador" - -#: ../src/fr-window.c:2318 -msgid "Testing archive" -msgstr "Comprebando archivador" +#. Translators: %s is a filename +#: ../src/fr-window.c:2178 ../src/fr-window.c:2216 +#, c-format +#| msgid "Starting %s" +msgid "Creating \"%s\"" +msgstr "Creyando \"%s\"" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2182 +#, c-format +#| msgid "Starting %s" +msgid "Loading \"%s\"" +msgstr "Cargando \"%s\"" -#: ../src/fr-window.c:2321 +#. Translators: %s is a filename +#: ../src/fr-window.c:2186 +#, c-format +#| msgid "Starting %s" +msgid "Reading \"%s\"" +msgstr "Leyendo \"%s\"" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2190 +#, c-format +#| msgid "Deleting files from archive" +msgid "Deleting the files from \"%s\"" +msgstr "Borrando os archivos de \"%s\"" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2194 +#, c-format +#| msgid "Starting %s" +msgid "Testing \"%s\"" +msgstr "Verificando \"%s\"" + +#: ../src/fr-window.c:2197 msgid "Getting the file list" msgstr "Obteniendo la lista d'archivos" -#: ../src/fr-window.c:2324 ../src/fr-window.c:2333 -msgid "Copying the file list" -msgstr "Copiando la lista d'archivos" - -#: ../src/fr-window.c:2327 -msgid "Adding files to archive" -msgstr "Anyadiendo archivos a l'archivador" - -#: ../src/fr-window.c:2330 -msgid "Extracting files from archive" -msgstr "Sacando archivos de l'archivador" - -#: ../src/fr-window.c:2339 -msgid "Saving archive" -msgstr "Alzando archivador" +#. Translators: %s is a filename +#: ../src/fr-window.c:2201 +#, c-format +#| msgid "Copying the file list" +msgid "Copying the files to add to \"%s\"" +msgstr "Copiando os archivos que anyadir a \"%s\"" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2205 +#, c-format +#| msgid "Adding files to archive" +msgid "Adding the files to \"%s\"" +msgstr "Anyadiendo archivos a \"%s\"" -#: ../src/fr-window.c:2509 +#. Translators: %s is a filename +#: ../src/fr-window.c:2209 +#, c-format +#| msgid "Extracting files from archive" +msgid "Extracting the files from \"%s\"" +msgstr "Sacando archivos de \"%s\"" + +#: ../src/fr-window.c:2212 +msgid "Copying the extracted files to the destination" +msgstr "Copiando os archivos sacaus a lo destín" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2221 +#, c-format +#| msgid "Starting %s" +msgid "Saving \"%s\"" +msgstr "Alzando \"%s\"" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2228 +#, c-format +#| msgid "Getting the file list" +msgid "Renaming the files in \"%s\"" +msgstr "Renombrando os archivos en \"%s\"" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2232 +#, c-format +#| msgid "Update the files in the archive \"%s\"?" +msgid "Updating the files in \"%s\"" +msgstr "Esviellando os archivos en \"%s\"" + +#: ../src/fr-window.c:2407 msgid "_Open the Archive" msgstr "_Ubrir l'archivador" -#: ../src/fr-window.c:2510 +#: ../src/fr-window.c:2408 msgid "_Show the Files" msgstr "A_mostrar os archivos" -#: ../src/fr-window.c:2565 -msgid "Archive:" -msgstr "Archivador:" +#: ../src/fr-window.c:2525 +#, c-format +msgid "%d file remaining" +msgid_plural "%'d files remaining" +msgstr[0] "manca %d archivo" +msgstr[1] "mancan %d archivos" + +#: ../src/fr-window.c:2529 ../src/fr-window.c:3105 +#| msgid "please wait…" +msgid "Please wait…" +msgstr "Aguarde..." -#: ../src/fr-window.c:2736 +#: ../src/fr-window.c:2585 msgid "Extraction completed successfully" msgstr "A sacada s'ha rematau bien" -#: ../src/fr-window.c:2759 -msgid "Archive created successfully" -msgstr "L'archivador s'ha creyau bien" - -#: ../src/fr-window.c:2807 -#| msgid "please wait..." -msgid "please wait…" -msgstr "por favor aguarde..." +#. Translators: %s is a filename +#: ../src/fr-window.c:2616 ../src/fr-window.c:6159 +#, c-format +#| msgid "Archive created successfully" +msgid "\"%s\" created successfully" +msgstr "\"%s\" s'ha creyau bien" -#: ../src/fr-window.c:2892 ../src/fr-window.c:3027 +#: ../src/fr-window.c:2706 ../src/fr-window.c:2878 msgid "Command exited abnormally." msgstr "O comando remató con error." -#: ../src/fr-window.c:2985 +#: ../src/fr-window.c:2827 msgid "An error occurred while extracting files." msgstr "Habió una error en extraer os archivos." -#: ../src/fr-window.c:2991 +#: ../src/fr-window.c:2833 #, c-format msgid "Could not open \"%s\"" msgstr "No s'ha puesto ubrir \"%s\"" -#: ../src/fr-window.c:2996 +#: ../src/fr-window.c:2838 msgid "An error occurred while loading the archive." msgstr "Habió una error cargando l'archivador." -#: ../src/fr-window.c:3000 +#: ../src/fr-window.c:2842 msgid "An error occurred while deleting files from the archive." msgstr "Habió una error borrando archivos de l'archivador." -#: ../src/fr-window.c:3006 +#: ../src/fr-window.c:2848 msgid "An error occurred while adding files to the archive." msgstr "Habió una error anyadiendo archivos a l'archivador." -#: ../src/fr-window.c:3010 +#: ../src/fr-window.c:2852 msgid "An error occurred while testing archive." msgstr "Habió una error comprebando l'archivador." -#: ../src/fr-window.c:3014 +#: ../src/fr-window.c:2857 msgid "An error occurred while saving the archive." msgstr "Habió una error en alzar l'archivador." -#: ../src/fr-window.c:3018 +#: ../src/fr-window.c:2861 +#| msgid "An error occurred while extracting files." +msgid "An error occurred while renaming the files." +msgstr "Habió una error en renombrar os archivos." + +#: ../src/fr-window.c:2865 +#| msgid "An error occurred while extracting files." +msgid "An error occurred while updating the files." +msgstr "Habió una error en esviellar os archivos." + +#: ../src/fr-window.c:2869 msgid "An error occurred." msgstr "Habió una error." -#: ../src/fr-window.c:3024 +#: ../src/fr-window.c:2875 msgid "Command not found." msgstr "No s'ha trobau lo comando" -#: ../src/fr-window.c:3226 +#: ../src/fr-window.c:3033 msgid "Test Result" msgstr "Resultau d'a comprebacion" -#: ../src/fr-window.c:4048 ../src/fr-window.c:8197 ../src/fr-window.c:8231 -#: ../src/fr-window.c:8481 +#: ../src/fr-window.c:3972 ../src/fr-window.c:8670 ../src/fr-window.c:8704 +#: ../src/fr-window.c:8983 msgid "Could not perform the operation" msgstr "No s'ha puesto fer la operacion" -#: ../src/fr-window.c:4074 +#: ../src/fr-window.c:3998 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" @@ -1063,116 +785,115 @@ "Quiere anyadir iste archivo a l'archivador actual u prefiere ubrir-lo como " "archivador nuevo?" -#: ../src/fr-window.c:4104 +#: ../src/fr-window.c:4028 msgid "Do you want to create a new archive with these files?" msgstr "Quiere creyar un archivador nuevo con istos archivos?" -#: ../src/fr-window.c:4107 +#: ../src/fr-window.c:4031 msgid "Create _Archive" msgstr "Creyar _archivador" -#: ../src/fr-window.c:4700 ../src/fr-window.c:5776 +#: ../src/fr-window.c:4060 ../src/fr-window.c:7140 +#| msgid "Archive:" +msgid "New Archive" +msgstr "Nuevo archivador" + +#: ../src/fr-window.c:4648 msgid "Folders" msgstr "Carpetas" -#: ../src/fr-window.c:4738 +#: ../src/fr-window.c:4686 ../src/ui/file-selector.ui.h:5 msgctxt "File" msgid "Size" msgstr "Tamanyo" -#: ../src/fr-window.c:4739 +#: ../src/fr-window.c:4687 msgctxt "File" msgid "Type" msgstr "Tipo" -#: ../src/fr-window.c:4740 +#: ../src/fr-window.c:4688 ../src/ui/file-selector.ui.h:6 +#| msgid "Modified on:" msgctxt "File" -msgid "Date Modified" -msgstr "Calendata de modificacion" +msgid "Modified" +msgstr "Modificau" -#: ../src/fr-window.c:4741 +#: ../src/fr-window.c:4689 msgctxt "File" msgid "Location" msgstr "Puesto" -#: ../src/fr-window.c:4750 +#: ../src/fr-window.c:4698 ../src/ui/file-selector.ui.h:4 msgctxt "File" msgid "Name" msgstr "Nome" -#: ../src/fr-window.c:5697 +#: ../src/fr-window.c:5528 msgid "Find:" msgstr "Mirar:" -#: ../src/fr-window.c:5784 -msgid "Close the folders pane" -msgstr "Trancar o panel de carpetas" - #. Translators: this is the label for the "open recent file" sub-menu. -#: ../src/fr-window.c:5815 +#: ../src/fr-window.c:5623 msgid "Open _Recent" msgstr "Ubrir _recient" -#: ../src/fr-window.c:5816 ../src/fr-window.c:5828 +#: ../src/fr-window.c:5624 ../src/fr-window.c:5636 msgid "Open a recently used archive" msgstr "Ubrir un archivador usau recientement" -#: ../src/fr-window.c:6258 -#, c-format -msgid "Could not save the archive \"%s\"" -msgstr "No s'ha puesto alzar l'archivador \"%s\"" - -#: ../src/fr-window.c:6774 +#. Translators: after the colon there is a folder name. +#: ../src/fr-window.c:5708 ../src/ui/file-selector.ui.h:1 +#: ../src/ui/new-archive-dialog.ui.h:2 +msgid "_Location:" +msgstr "_Puesto:" + +#: ../src/fr-window.c:6555 #, c-format -#| msgid "_Selected files" msgid "Replace file \"%s\"?" msgstr "Reemplazar l'archivo \"%s\"?" -#: ../src/fr-window.c:6777 +#: ../src/fr-window.c:6558 #, c-format -#| msgid "" -#| "A file named \"%s\" already exists.\n" -#| "\n" -#| "%s" msgid "Another file with the same name already exists in \"%s\"." msgstr "Atro archivo con lo mesmo nombre ya existe en \"%s\"." -#: ../src/fr-window.c:6784 +#: ../src/fr-window.c:6565 msgid "Replace _All" msgstr "Reemplazar _tot" -#: ../src/fr-window.c:6785 +#: ../src/fr-window.c:6566 msgid "_Skip" msgstr "_Brincar" -#: ../src/fr-window.c:6786 -#| msgid "_Rename" -msgid "_Replace" -msgstr "_Reemplazar" +#: ../src/fr-window.c:7322 ../src/fr-window.c:7678 +#, c-format +msgid "Could not save the archive \"%s\"" +msgstr "No s'ha puesto alzar l'archivador \"%s\"" + +#: ../src/fr-window.c:7449 +#| msgctxt "File" +#| msgid "Save" +msgid "Save" +msgstr "Alzar" -#: ../src/fr-window.c:7293 +#: ../src/fr-window.c:7772 msgid "Last Output" msgstr "Zaguer resultau" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7598 +#: ../src/fr-window.c:7994 msgid "New name is void, please type a name." msgstr "O nuevo nombre ye vuedo, por favor, escriba un nombre." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7603 +#: ../src/fr-window.c:7999 msgid "New name is the same as old one, please type other name." msgstr "" "O nuevo nombre ye lo mismo que lo viello, por favor, escriba atro nombre." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7608 +#: ../src/fr-window.c:8004 #, c-format -#| msgid "" -#| "The name \"%s\" is not valid because it cannot contain the characters: " -#| "%s\n" -#| "\n" -#| "%s" msgid "" "Name \"%s\" is not valid because it contains at least one of the following " "characters: %s, please type other name." @@ -1180,7 +901,7 @@ "O nome \"%s\" no ye valido porque no ha de tener o caracter: %s, por favor, " "escriba atro nombre." -#: ../src/fr-window.c:7644 +#: ../src/fr-window.c:8040 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -1191,7 +912,11 @@ "\n" "%s" -#: ../src/fr-window.c:7646 +#: ../src/fr-window.c:8040 ../src/fr-window.c:8042 +msgid "Please use a different name." +msgstr "Faiga servir un nome diferent." + +#: ../src/fr-window.c:8042 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -1202,93 +927,99 @@ "\n" "%s" -#: ../src/fr-window.c:7716 +#: ../src/fr-window.c:8112 msgid "Rename" msgstr "Renombrar" -#: ../src/fr-window.c:7717 -#| msgid "New folder name" +#: ../src/fr-window.c:8113 msgid "_New folder name:" msgstr "_Nome de carpeta nuevo" -#: ../src/fr-window.c:7717 -#| msgid "New file name" +#: ../src/fr-window.c:8113 msgid "_New file name:" msgstr "_Nome d'archivo nuevo" -#: ../src/fr-window.c:7721 +#: ../src/fr-window.c:8117 msgid "_Rename" msgstr "_Renombrar" -#: ../src/fr-window.c:7738 ../src/fr-window.c:7758 +#: ../src/fr-window.c:8134 ../src/fr-window.c:8153 msgid "Could not rename the folder" msgstr "No s'ha puesto renombrar a carpeta" -#: ../src/fr-window.c:7738 ../src/fr-window.c:7758 +#: ../src/fr-window.c:8134 ../src/fr-window.c:8153 msgid "Could not rename the file" msgstr "No s'ha puesto renombrar l'archivo" -#: ../src/fr-window.c:8158 +#. Translators: %s are archive filenames +#: ../src/fr-window.c:8577 +#, c-format +msgid "Moving the files from \"%s\" to \"%s\"" +msgstr "Moviendo archivos de \"%s\" a \"%s\"" + +#. Translators: %s are archive filenames +#: ../src/fr-window.c:8580 +#, c-format +#| msgid "Copying the file list" +msgid "Copying the files from \"%s\" to \"%s\"" +msgstr "Copiando los archivos de \"%s\" a \"%s\"" + +#: ../src/fr-window.c:8631 msgid "Paste Selection" msgstr "Apegar tria" -#: ../src/fr-window.c:8159 -#| msgid "Destination folder" +#: ../src/fr-window.c:8632 msgid "_Destination folder:" msgstr "Carpeta de _destino:" -#: ../src/fr-window.c:8760 +#: ../src/fr-window.c:9245 msgid "Add files to an archive" msgstr "Anyadir archivos a un archivador" -#: ../src/fr-window.c:8804 +#: ../src/fr-window.c:9289 ../src/main.c:453 ../src/main.c:489 +#: ../src/main.c:515 ../src/main.c:807 msgid "Extract archive" msgstr "Sacar archivador" #. This is the time format used in the "Date Modified" column and #. * in the Properties dialog. See the man page of strftime for an #. * explanation of the values. -#: ../src/glib-utils.c:560 +#: ../src/glib-utils.c:733 msgid "%d %B %Y, %H:%M" msgstr "%d %B %Y, %H:%M" -#. Expander -#: ../src/gtk-utils.c:421 -msgid "Command _Line Output" -msgstr "Surtida de linia de _comandos" - -#: ../src/gtk-utils.c:750 +#: ../src/gtk-utils.c:557 msgid "Could not display help" msgstr "No s'ha puesto amostrar l'aduya" -#: ../src/main.c:51 +#: ../src/main.c:66 msgid "Add files to the specified archive and quit the program" msgstr "Anyade archivos a l'archivador especificau y surte d'o programa" -#: ../src/main.c:52 +#: ../src/main.c:67 msgid "ARCHIVE" msgstr "ARCHIVADOR" -#: ../src/main.c:55 +#: ../src/main.c:70 msgid "Add files asking the name of the archive and quit the program" msgstr "" "Anyade archivos demandando lo nome d'o archivador y dimpués surte d'o " "programa" -#: ../src/main.c:59 +#: ../src/main.c:74 msgid "Extract archives to the specified folder and quit the program" msgstr "Extrae archivadors a la carpeta especificada y surte d'o programa" -#: ../src/main.c:60 ../src/main.c:72 +#: ../src/main.c:75 ../src/main.c:87 msgid "FOLDER" msgstr "CARPETA" -#: ../src/main.c:63 +#: ../src/main.c:78 msgid "Extract archives asking the destination folder and quit the program" msgstr "" "Extrae archivadors demandando la carpeta de destino y surte d'o programa" -#: ../src/main.c:67 +#: ../src/main.c:82 msgid "" "Extract the contents of the archives in the archive folder and quit the " "program" @@ -1296,22 +1027,149 @@ "Extrae o conteniu d'os archivadors en a carpeta de l'archivador y surte d'o " "programa" -#: ../src/main.c:71 +#: ../src/main.c:86 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "Carpeta predeterminada ta os comandos '--add' y '--extract'" -#: ../src/main.c:75 +#: ../src/main.c:90 msgid "Create destination folder without asking confirmation" msgstr "Creya una carpeta de destino sin demandar confirmacion" -#: ../src/main.c:296 ../src/server.c:444 -msgid "- Create and modify an archive" -msgstr " - Creyar y modificar un archivador" +#: ../src/main.c:94 +msgid "Use the notification system to notify the operation completion" +msgstr "" +"Fer servir una notificacion d'o sistema ta indicar que a operacion s'ha " +"rematau" -#: ../src/main.c:312 ../src/server.c:457 +#: ../src/main.c:97 +msgid "Start as a service" +msgstr "Encetar como un servicio" + +#: ../src/main.c:100 +msgid "Show version" +msgstr "Amostrar version" + +#. manually set name and icon +#: ../src/main.c:634 msgid "File Roller" msgstr "File Roller" +#: ../src/main.c:665 +msgid "- Create and modify an archive" +msgstr " - Creyar y modificar un archivador" + +#: ../src/ui/add-dialog-options.ui.h:1 +#| msgid "_Add" +msgid "Add" +msgstr "Anyadir" + +#: ../src/ui/add-dialog-options.ui.h:2 +msgid "Include _files:" +msgstr "Incluyir _archivos:" + +#: ../src/ui/add-dialog-options.ui.h:3 +msgid "E_xclude files:" +msgstr "E_xcluyir archivos:" + +#: ../src/ui/add-dialog-options.ui.h:4 +msgid "_Exclude folders:" +msgstr "_Excluyir carpetas:" + +#: ../src/ui/add-dialog-options.ui.h:5 ../src/ui/extract-dialog-options.ui.h:5 +msgid "example: *.o; *.bak" +msgstr "exemplo: *.o; *.bak" + +#: ../src/ui/add-dialog-options.ui.h:6 ../src/ui/extract-dialog-options.ui.h:6 +msgid "Actions" +msgstr "Accions" + +#: ../src/ui/add-dialog-options.ui.h:7 +msgid "Add only if _newer" +msgstr "Anyadir solo que si ye mas _nuevo" + +#: ../src/ui/add-dialog-options.ui.h:8 +msgid "_Follow symbolic links" +msgstr "_Siguir enlaces simbolicos" + +#: ../src/ui/app-menu.ui.h:1 +#| msgid "_Archive" +msgid "_New Archive" +msgstr "_Nuevo archivador" + +#: ../src/ui/app-menu.ui.h:2 ../src/ui.h:34 +msgid "_Help" +msgstr "Ad_uya" + +#: ../src/ui/app-menu.ui.h:3 +#| msgid "Archive Manager" +msgid "_About Archive Manager" +msgstr "_Arredol d'o Chestor d'archivadors" + +#: ../src/ui/app-menu.ui.h:4 +msgid "_Quit" +msgstr "_Surtir" + +#: ../src/ui/ask-password.ui.h:1 ../src/ui/new-archive-dialog-options.ui.h:1 +#: ../src/ui/new-archive-dialog.ui.h:4 +msgid "_Password:" +msgstr "Clau de _paso:" + +#: ../src/ui/delete.ui.h:1 +msgid "Delete" +msgstr "Borrar" + +#: ../src/ui/delete.ui.h:2 ../src/ui/extract-dialog-options.ui.h:4 +msgid "_Files:" +msgstr "A_rchivos:" + +#: ../src/ui/delete.ui.h:3 +msgid "example: *.txt; *.doc" +msgstr "exemplo: *.txt; *.doc" + +#: ../src/ui/delete.ui.h:4 ../src/ui/extract-dialog-options.ui.h:2 +msgid "_All files" +msgstr "_Totz os archivos" + +#: ../src/ui/delete.ui.h:5 ../src/ui/extract-dialog-options.ui.h:3 +msgid "_Selected files" +msgstr "Archivos _trigaus" + +#: ../src/ui/error-dialog.ui.h:1 +#| msgid "Command _Line Output" +msgid "C_ommand Line Output:" +msgstr "Surtida de linia de _comandos:" + +#: ../src/ui/extract-dialog-options.ui.h:7 +msgid "_Keep directory structure" +msgstr "_Mantenir a estructura de carpetas" + +#: ../src/ui/extract-dialog-options.ui.h:8 +#| msgid "Do not overwrite newer files" +msgid "Do not _overwrite newer files" +msgstr "No s_obreescribir archivos mas nuevos" + +#: ../src/ui/file-selector.ui.h:2 ../src/ui.h:188 +msgid "Go up one level" +msgstr "Puyar un ran" + +#: ../src/ui/file-selector.ui.h:3 +msgid "Places" +msgstr "Puestos" + +#: ../src/ui/file-selector.ui.h:7 +#| msgid "Dese_lect All" +msgid "_Select All" +msgstr "Trig_ar tot" + +#: ../src/ui/file-selector.ui.h:8 ../src/ui.h:101 +msgid "Dese_lect All" +msgstr "_Destrigar tot" + +#: ../src/ui/file-selector.ui.h:9 +#| msgid "_Show the Files" +msgid "Show Hidden Files" +msgstr "A_mostrar archivos amagaus" + #: ../src/ui.h:31 msgid "_Archive" msgstr "_Archivador" @@ -1324,10 +1182,6 @@ msgid "_View" msgstr "_Veyer" -#: ../src/ui.h:34 -msgid "_Help" -msgstr "Ad_uya" - #: ../src/ui.h:35 msgid "_Arrange Files" msgstr "_Ordenar archivos" @@ -1337,7 +1191,6 @@ msgstr "Informacion arredol d'o programa" #: ../src/ui.h:42 -#| msgid "Add Files" msgid "_Add Files…" msgstr "_Anyadir archivos…" @@ -1345,253 +1198,520 @@ msgid "Add files to the archive" msgstr "Anyadir archivos a l'archivador" -#: ../src/ui.h:50 -#| msgid "Add a Folder" -msgid "Add a _Folder…" -msgstr "Anyadir una _carpeta…" - -#: ../src/ui.h:51 ../src/ui.h:55 -msgid "Add a folder to the archive" -msgstr "Anyadir una carpeta a l'rchivador" - -#: ../src/ui.h:54 -msgid "Add Folder" -msgstr "Anyadir carpeta" - -#: ../src/ui.h:59 +#: ../src/ui.h:51 msgid "Close the current archive" msgstr "Tranca l'archivador actual" -#: ../src/ui.h:62 +#: ../src/ui.h:54 msgid "Contents" msgstr "Endiz" -#: ../src/ui.h:63 +#: ../src/ui.h:55 msgid "Display the File Roller Manual" msgstr "Amuestra lo manual de File Roller" -#: ../src/ui.h:68 ../src/ui.h:89 +#: ../src/ui.h:60 ../src/ui.h:81 msgid "Copy the selection" msgstr "Copia la tria" -#: ../src/ui.h:72 ../src/ui.h:93 +#: ../src/ui.h:64 ../src/ui.h:85 msgid "Cut the selection" msgstr "Talla la tria" -#: ../src/ui.h:76 ../src/ui.h:97 +#: ../src/ui.h:68 ../src/ui.h:89 msgid "Paste the clipboard" msgstr "Apegar d'o portapapels" -#: ../src/ui.h:79 ../src/ui.h:100 -#| msgid "_Rename" +#: ../src/ui.h:71 ../src/ui.h:92 msgid "_Rename…" msgstr "_Renombrar…" -#: ../src/ui.h:80 ../src/ui.h:101 +#: ../src/ui.h:72 ../src/ui.h:93 msgid "Rename the selection" msgstr "Renombrar a tria" -#: ../src/ui.h:84 ../src/ui.h:105 +#: ../src/ui.h:76 ../src/ui.h:97 msgid "Delete the selection from the archive" msgstr "Borra la tria d'o archivador" -#: ../src/ui.h:109 -msgid "Dese_lect All" -msgstr "_Destrigar tot" - -#: ../src/ui.h:110 +#: ../src/ui.h:102 msgid "Deselect all files" msgstr "Destrigar totz os archivos" -#: ../src/ui.h:113 ../src/ui.h:117 -#| msgid "_Extract" +#: ../src/ui.h:105 ../src/ui.h:109 msgid "_Extract…" msgstr "_Sacar…" -#: ../src/ui.h:114 ../src/ui.h:118 ../src/ui.h:122 +#: ../src/ui.h:106 ../src/ui.h:110 ../src/ui.h:114 msgid "Extract files from the archive" msgstr "Sacar archivos de l'archivador" -#: ../src/ui.h:125 -#| msgid "Find:" +#: ../src/ui.h:117 msgid "Find…" msgstr "Mirar…" -#: ../src/ui.h:130 -#| msgctxt "File" -#| msgid "New" +#: ../src/ui.h:122 msgid "New…" msgstr "Nuevo…" -#: ../src/ui.h:131 +#: ../src/ui.h:123 msgid "Create a new archive" msgstr "Creyar un archivador nuevo" -#: ../src/ui.h:134 -#| msgid "Open" +#: ../src/ui.h:126 msgid "Open…" msgstr "Ubrir…" -#: ../src/ui.h:135 ../src/ui.h:139 +#: ../src/ui.h:127 ../src/ui.h:131 msgid "Open archive" msgstr "Ubrir un archivador" -#: ../src/ui.h:142 -#| msgid "_Open With..." +#: ../src/ui.h:134 msgid "_Open With…" msgstr "Ubrir c_on…" -#: ../src/ui.h:143 +#: ../src/ui.h:135 msgid "Open selected files with an application" msgstr "Ubrir os archivos trigaus con una aplicacion" -#: ../src/ui.h:146 -#| msgid "Password" +#: ../src/ui.h:138 msgid "Pass_word…" msgstr "Clau de _paso…" -#: ../src/ui.h:147 +#: ../src/ui.h:139 msgid "Specify a password for this archive" msgstr "Especifique una clau de paso ta iste archivador" -#: ../src/ui.h:151 +#: ../src/ui.h:143 msgid "Show archive properties" msgstr "Amostrar as propiedatz d'o archivador" -#: ../src/ui.h:155 +#: ../src/ui.h:147 msgid "Reload current archive" msgstr "Recargar l'archivador actual" -#: ../src/ui.h:158 -#| msgid "Save As..." +#: ../src/ui.h:150 msgid "Save As…" msgstr "Alzar como…" -#: ../src/ui.h:159 +#: ../src/ui.h:151 msgid "Save the current archive with a different name" msgstr "Alza l'archivo actual con un nome diferent" -#: ../src/ui.h:163 +#: ../src/ui.h:155 msgid "Select all files" msgstr "Trigar totz os archivos" -#: ../src/ui.h:167 -msgid "Stop current operation" -msgstr "Aturar la operacion en curso" - -#: ../src/ui.h:170 +#: ../src/ui.h:158 msgid "_Test Integrity" msgstr "_Comprebar integridat" -#: ../src/ui.h:171 +#: ../src/ui.h:159 msgid "Test whether the archive contains errors" msgstr "Compreba si l'archivador ha errors" -#: ../src/ui.h:175 ../src/ui.h:179 +#: ../src/ui.h:163 ../src/ui.h:167 msgid "Open the selected file" msgstr "Ubrir l'archivo trigau" -#: ../src/ui.h:183 ../src/ui.h:187 +#: ../src/ui.h:171 ../src/ui.h:175 msgid "Open the selected folder" msgstr "Ubrir a carpeta trigada" -#: ../src/ui.h:192 +#: ../src/ui.h:180 msgid "Go to the previous visited location" msgstr "Ir a la pachina anterior vesitada" -#: ../src/ui.h:196 +#: ../src/ui.h:184 msgid "Go to the next visited location" msgstr "Ir a la vinient pachina vesitada" -#: ../src/ui.h:200 -msgid "Go up one level" -msgstr "Puyar un ran" - #. Translators: the home location is the home folder. -#: ../src/ui.h:205 +#: ../src/ui.h:193 msgid "Go to the home location" msgstr "Ir a lo lugar de prencipie" -#: ../src/ui.h:213 +#: ../src/ui.h:201 msgid "_Toolbar" msgstr "Ba_rra d'ainas" -#: ../src/ui.h:214 +#: ../src/ui.h:202 msgid "View the main toolbar" msgstr "Veyer a barra d'ainas prencipal" -#: ../src/ui.h:218 +#: ../src/ui.h:206 msgid "Stat_usbar" msgstr "Barra d'_estau" -#: ../src/ui.h:219 +#: ../src/ui.h:207 msgid "View the statusbar" msgstr "Veyer a barra d'estau" -#: ../src/ui.h:223 -msgid "_Reversed Order" -msgstr "Orden _inverso" - -#: ../src/ui.h:224 -msgid "Reverse the list order" -msgstr "Invierte la ordenacion d'o listau" - -#: ../src/ui.h:228 +#: ../src/ui.h:211 msgid "_Folders" msgstr "_Carpetas" -#: ../src/ui.h:238 +#: ../src/ui.h:221 msgid "View All _Files" msgstr "Veyer _totz os archivos" -#: ../src/ui.h:241 +#: ../src/ui.h:224 msgid "View as a F_older" msgstr "Veyer como una ca_rpeta" -#: ../src/ui.h:249 -msgid "by _Name" -msgstr "por _nome" - -#: ../src/ui.h:250 -msgid "Sort file list by name" -msgstr "Ordena los archivos por o suyo nome" - -#: ../src/ui.h:252 -msgid "by _Size" -msgstr "por _tamanyo" - -#: ../src/ui.h:253 -msgid "Sort file list by file size" -msgstr "Ordena los archivos por o suyo tamanyo" - -#: ../src/ui.h:255 -msgid "by T_ype" -msgstr "por ti_po" - -#: ../src/ui.h:256 -msgid "Sort file list by type" -msgstr "Ordena os archivos por o suyo tipo" - -#: ../src/ui.h:258 -msgid "by _Date Modified" -msgstr "por _calendata de modificacion" - -#: ../src/ui.h:259 -msgid "Sort file list by modification time" -msgstr "Ordena los archivos por a suya calendata de modificacion" - -#. Translators: this is the "sort by file location" menu item -#: ../src/ui.h:262 -msgid "by _Location" -msgstr "por _ruta" - -#. Translators: location is the file location -#: ../src/ui.h:264 -msgid "Sort file list by location" -msgstr "Ordena los archivos por a suya ruta" +#: ../src/ui/new-archive-dialog-options.ui.h:2 +#: ../src/ui/new-archive-dialog.ui.h:5 +msgid "_Encrypt the file list too" +msgstr "_Cifrar tambien a lista d'archivos" + +#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. +#: ../src/ui/new-archive-dialog-options.ui.h:3 +#: ../src/ui/new-archive-dialog.ui.h:7 +msgid "Split into _volumes of" +msgstr "Tallar en _volumens de" + +#. MB means megabytes +#: ../src/ui/new-archive-dialog-options.ui.h:5 +#: ../src/ui/new-archive-dialog.ui.h:9 +msgid "MB" +msgstr "MB" + +#: ../src/ui/new-archive-dialog-options.ui.h:6 +#: ../src/ui/new-archive-dialog.ui.h:10 +msgid "_Other Options" +msgstr "Atras _opcions" + +#: ../src/ui/new-archive-dialog.ui.h:1 +msgid "_Filename:" +msgstr "Nome de l'_archivo:" + +#: ../src/ui/new-archive-dialog.ui.h:3 +msgid "Location" +msgstr "Puesto" + +#: ../src/ui/password.ui.h:1 +msgid "Password" +msgstr "Clau de paso" + +#: ../src/ui/password.ui.h:2 +msgid "_Encrypt the file list" +msgstr "_Cifrar a lista d'archivos" + +#: ../src/ui/properties.ui.h:1 +msgctxt "File" +msgid "Name:" +msgstr "Nome:" + +#: ../src/ui/properties.ui.h:2 +msgid "Archive size:" +msgstr "Tamanyo d'o archivador:" + +#. after the colon there is a folder name. +#: ../src/ui/properties.ui.h:4 +msgid "Location:" +msgstr "Puesto:" + +#: ../src/ui/properties.ui.h:5 +msgid "Compression ratio:" +msgstr "Tasa de compresion:" + +#: ../src/ui/properties.ui.h:6 +msgid "Last modified:" +msgstr "Zaguera modificacion:" + +#: ../src/ui/properties.ui.h:7 +msgid "Content size:" +msgstr "Tamanyo d'o conteniu:" + +#: ../src/ui/properties.ui.h:8 +msgid "Number of files:" +msgstr "Numero d'archivos:" + +#. after the colon there is a file type. +#: ../src/ui/properties.ui.h:10 +#| msgctxt "File" +#| msgid "Type" +msgid "Type:" +msgstr "Tipo:" + +#: ../src/ui/update.ui.h:1 +msgid "_Update" +msgstr "_Esviellar" + +#: ../src/ui/update.ui.h:3 +msgid "S_elect the files you want to update:" +msgstr "Tri_e os archivos que quiere esviellar:" + +#~ msgid "Use mime icons" +#~ msgstr "Fer servir iconos MIME" + +#~ msgid "" +#~ "If true will display icons depending on the file type (slower), otherwise " +#~ "will use always the same icon for all files (faster)." +#~ msgstr "" +#~ "Si ye verdadero amostrara iconos en funcion d'o tipo d'archivo (más " +#~ "lento), d'atro modo fera servir de peren o mesmo icono ta totz os " +#~ "archivos (mas rapido)." + +#~ msgid "Overwrite existing files" +#~ msgstr "Sobreescribir archivos existentz" + +#~ msgid "Password required" +#~ msgstr "" +#~ "S'amenista una clau de paso" + +#~ msgid "" +#~ "Note: the password will be used to encrypt files you add to the " +#~ "current archive, and to decrypt files you extract from the current " +#~ "archive. When the archive is closed the password will be deleted." +#~ msgstr "" +#~ "Nota: a clau de paso se ferá servir ta cifrar os archivos que " +#~ "anyada a l'archivador actual, y ta descifrar os archivos que extraiga d'o " +#~ "archivador actual. Cuan se tranque l'archivador se borrara a clau de paso." +#~ "" + +#~ msgid "Add a Folder" +#~ msgstr "Anyadir una carpeta" + +#~ msgid "_Include subfolders" +#~ msgstr "_Incluyir subcarpetas" + +#~ msgid "Exclude folders that are symbolic lin_ks" +#~ msgstr "Excluyir as carpetas que sigan en_rastres simbolicos" + +#~ msgid "Sa_ve Options" +#~ msgstr "_Alzar opcions" + +#~ msgid "" +#~ "The name \"%s\" is not valid because it cannot contain the characters: " +#~ "%s\n" +#~ "\n" +#~ "%s" +#~ msgstr "" +#~ "O nome \"%s\" no ye valido porque no ha de tener o caracter: %s\n" +#~ "\n" +#~ "%s" + +#~ msgid "" +#~ "You don't have the right permissions to create an archive in the " +#~ "destination folder." +#~ msgstr "No ha permiso ta creyar un archivador en a carpeta de destino." + +#~ msgid "Archive not created" +#~ msgstr "Archivador no creyau" + +#~ msgid "_Overwrite" +#~ msgstr "_Sobreescribir" + +#~ msgid "Re-crea_te folders" +#~ msgstr "R_ecreyar as carpetas" + +#~ msgid "Over_write existing files" +#~ msgstr "Sobre_escribir archivos existentz" + +#~ msgid "Do not e_xtract older files" +#~ msgstr "No e_xtrayer archivos mas viellos" + +#~ msgctxt "File" +#~ msgid "New" +#~ msgstr "Nuevo" + +#~ msgid "File _Format: %s" +#~ msgstr "_Formato d'archivo: %s" + +#~ msgid "All Files" +#~ msgstr "Totz os archivos" + +#~ msgid "All Supported Files" +#~ msgstr "Totz os archivos soportaus" + +#~ msgid "By Extension" +#~ msgstr "Por extension" + +#~ msgid "File Format" +#~ msgstr "Formato d'archivo" + +#~ msgid "Extension(s)" +#~ msgstr "Extensions" + +#~ msgid "" +#~ "The program was not able to find out the file format you want to use for `" +#~ "%s'. Please make sure to use a known extension for that file or manually " +#~ "choose a file format from the list below." +#~ msgstr "" +#~ "O programa no ha puesto trobar o formato d'archivo que quiere fer servir " +#~ "ta '%s'. Pare cuenta de fer servir una extension d'archivo conoxida ta " +#~ "l'archivo u trie manualment un formato d'archivo d'a lista de abaxo." + +#~ msgid "File format not recognized" +#~ msgstr "No s'ha reconoxiu o formato d'archivo" + +#~ msgid "File not found." +#~ msgstr "No s'ha trobau l'archivo." + +#~ msgid "Adding file: " +#~ msgstr "Anyadindo archivo: " + +#~ msgid "Extracting file: " +#~ msgstr "Sacando archivo: " + +#~ msgid "7-Zip (.7z)" +#~ msgstr "7-Zip (.7z)" + +#~ msgid "Tar compressed with 7z (.tar.7z)" +#~ msgstr "Tar comprimiu con 7z (.tar.7z)" + +#~ msgid "Ace (.ace)" +#~ msgstr "Ace (.ace)" + +#~ msgid "Ar (.ar)" +#~ msgstr "Ar (.ar)" + +#~ msgid "Arj (.arj)" +#~ msgstr "Arj (.arj)" + +#~ msgid "Tar compressed with bzip2 (.tar.bz2)" +#~ msgstr "Tar comprimiu con bzip2 (.tar.bz2)" + +#~ msgid "Tar compressed with bzip (.tar.bz)" +#~ msgstr "Tar comprimiu con bzip (.tar.bz)" + +#~ msgid "Cabinet (.cab)" +#~ msgstr "Cabinet (.cab)" + +#~ msgid "Rar Archived Comic Book (.cbr)" +#~ msgstr "Libro de comic archivau en rar (.cbr)" + +#~ msgid "Zip Archived Comic Book (.cbz)" +#~ msgstr "Libro de comic archivau en zip (.cbz)" + +#~ msgid "Tar compressed with gzip (.tar.gz)" +#~ msgstr "Tar comprimiu con gzip (.tar.gz)" + +#~ msgid "Ear (.ear)" +#~ msgstr "Ear (.ear)" + +#~ msgid "Self-extracting zip (.exe)" +#~ msgstr "Zip autoextrayible (.exe)" + +#~ msgid "Jar (.jar)" +#~ msgstr "Jar (.jar)" + +#~ msgid "Lha (.lzh)" +#~ msgstr "Lha (.lzh)" + +#~ msgid "Lrzip (.lrz)" +#~ msgstr "Lrzip (.lrz)" + +#~ msgid "Tar compressed with lrzip (.tar.lrz)" +#~ msgstr "Tar comprimiu con lrzip (.tar.lrz)" + +#~ msgid "Tar compressed with lzip (.tar.lz)" +#~ msgstr "Tar comprimiu con lzip (.tar.lz)" + +#~ msgid "Tar compressed with lzma (.tar.lzma)" +#~ msgstr "Tar comprimiu con lzma (.tar.lzma)" + +#~ msgid "Tar compressed with lzop (.tar.lzo)" +#~ msgstr "Tar comprimiu con lzop (.tar.lzo)" + +#~ msgid "Windows Imaging Format (.wim)" +#~ msgstr "Formato d'imachen de Windows (.wim)" + +#~ msgid "Rar (.rar)" +#~ msgstr "Rar (.rar)" + +#~ msgid "Tar uncompressed (.tar)" +#~ msgstr "Tar sin compresion (.tar)" + +#~ msgid "Tar compressed with compress (.tar.Z)" +#~ msgstr "Tar comprimiu con compress (.tar.Z)" + +#~ msgid "War (.war)" +#~ msgstr "War (.war)" + +#~ msgid "Xz (.xz)" +#~ msgstr "Xz (.xz)" + +#~ msgid "Tar compressed with xz (.tar.xz)" +#~ msgstr "Tar comprimiu con xz (.tar.xz)" + +#~ msgid "Zoo (.zoo)" +#~ msgstr "Zoo (.zoo)" + +#~ msgid "Zip (.zip)" +#~ msgstr "Zip (.zip)" + +#~ msgid "Creating archive" +#~ msgstr "Creyando archivador" + +#~ msgid "Loading archive" +#~ msgstr "Cargando archivador" + +#~ msgid "Reading archive" +#~ msgstr "Leyendo archivador" + +#~ msgid "Testing archive" +#~ msgstr "Comprebando archivador" + +#~ msgid "Saving archive" +#~ msgstr "Alzando archivador" + +#~ msgctxt "File" +#~ msgid "Date Modified" +#~ msgstr "Calendata de modificacion" + +#~ msgid "Close the folders pane" +#~ msgstr "Trancar o panel de carpetas" + +#~| msgid "Add a Folder" +#~ msgid "Add a _Folder…" +#~ msgstr "Anyadir una _carpeta…" + +#~ msgid "Add a folder to the archive" +#~ msgstr "Anyadir una carpeta a l'rchivador" + +#~ msgid "Add Folder" +#~ msgstr "Anyadir carpeta" + +#~ msgid "Stop current operation" +#~ msgstr "Aturar la operacion en curso" + +#~ msgid "_Reversed Order" +#~ msgstr "Orden _inverso" + +#~ msgid "Reverse the list order" +#~ msgstr "Invierte la ordenacion d'o listau" + +#~ msgid "by _Name" +#~ msgstr "por _nome" + +#~ msgid "Sort file list by name" +#~ msgstr "Ordena los archivos por o suyo nome" + +#~ msgid "by _Size" +#~ msgstr "por _tamanyo" + +#~ msgid "Sort file list by file size" +#~ msgstr "Ordena los archivos por o suyo tamanyo" + +#~ msgid "by T_ype" +#~ msgstr "por ti_po" + +#~ msgid "Sort file list by type" +#~ msgstr "Ordena os archivos por o suyo tipo" + +#~ msgid "by _Date Modified" +#~ msgstr "por _calendata de modificacion" + +#~ msgid "Sort file list by modification time" +#~ msgstr "Ordena los archivos por a suya calendata de modificacion" + +#~ msgid "by _Location" +#~ msgstr "por _ruta" -#~ msgid "Modified on:" -#~ msgstr "Modificau o:" +#~ msgid "Sort file list by location" +#~ msgstr "Ordena los archivos por a suya ruta" #~ msgid "The file doesn't exist" #~ msgstr "L'archivo no existe pas" diff -Nru file-roller-3.6.0/po/it.po file-roller-3.6.3/po/it.po --- file-roller-3.6.0/po/it.po 2012-09-11 15:44:15.000000000 +0000 +++ file-roller-3.6.3/po/it.po 2012-10-12 15:49:49.000000000 +0000 @@ -11,8 +11,8 @@ msgstr "" "Project-Id-Version: file-roller\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-03 21:38+0200\n" -"PO-Revision-Date: 2012-09-03 21:37+0200\n" +"POT-Creation-Date: 2012-10-03 08:43+0200\n" +"PO-Revision-Date: 2012-10-03 08:45+0200\n" "Last-Translator: Milo Casagrande \n" "Language-Team: Italian \n" "Language: it\n" @@ -84,8 +84,8 @@ msgid "Show session management options" msgstr "Mostra le opzioni di gestione sessione" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1955 -#: ../src/fr-window.c:5329 +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1960 +#: ../src/fr-window.c:5340 msgid "Archive Manager" msgstr "Gestore di archivi" @@ -279,11 +279,11 @@ msgid "Create a compressed archive with the selected objects" msgstr "Crea un archivio compresso con gli oggetti selezionati" -#: ../src/actions.c:112 ../src/fr-window.c:5624 ../src/fr-window.c:6163 +#: ../src/actions.c:112 ../src/fr-window.c:5635 ../src/fr-window.c:6180 msgid "Open" msgstr "Apri" -#: ../src/actions.c:125 ../src/fr-window.c:5167 +#: ../src/actions.c:125 ../src/fr-window.c:5178 msgid "All archives" msgstr "Tutti gli archivi" @@ -331,7 +331,7 @@ msgstr "Carica opzioni" #. save options -#: ../src/dlg-add.c:209 ../src/dlg-add.c:824 +#: ../src/dlg-add.c:209 ../src/dlg-add.c:825 msgid "Save Options" msgstr "Salva opzioni" @@ -341,7 +341,7 @@ msgid "Reset Options" msgstr "Ripristina opzioni" -#: ../src/dlg-add.c:825 +#: ../src/dlg-add.c:826 msgid "_Options Name:" msgstr "Nome delle _opzioni:" @@ -356,11 +356,11 @@ msgstr "Password errata." # (ndt) titolo finestra -#: ../src/dlg-batch-add.c:81 ../src/main.c:410 ../src/main.c:776 +#: ../src/dlg-batch-add.c:85 ../src/main.c:417 ../src/main.c:783 msgid "Compress" msgstr "Comprimi" -#: ../src/dlg-extract.c:96 ../src/fr-window.c:6708 +#: ../src/dlg-extract.c:96 ../src/fr-window.c:6725 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -371,22 +371,22 @@ "\n" "Creare tale cartella?" -#: ../src/dlg-extract.c:105 ../src/fr-window.c:6717 +#: ../src/dlg-extract.c:105 ../src/fr-window.c:6734 msgid "Create _Folder" msgstr "C_rea cartella" #: ../src/dlg-extract.c:124 ../src/dlg-extract.c:142 ../src/dlg-extract.c:169 -#: ../src/fr-window.c:4116 ../src/fr-window.c:6612 ../src/fr-window.c:6617 -#: ../src/fr-window.c:6738 ../src/fr-window.c:6757 ../src/fr-window.c:6762 +#: ../src/fr-window.c:4124 ../src/fr-window.c:6629 ../src/fr-window.c:6634 +#: ../src/fr-window.c:6755 ../src/fr-window.c:6774 ../src/fr-window.c:6779 msgid "Extraction not performed" msgstr "Estrazione non eseguita" -#: ../src/dlg-extract.c:125 ../src/fr-window.c:6734 +#: ../src/dlg-extract.c:125 ../src/fr-window.c:6751 #, c-format msgid "Could not create the destination folder: %s." msgstr "Impossibile creare la cartella di destinazione: %s." -#: ../src/dlg-extract.c:170 ../src/fr-window.c:4282 ../src/fr-window.c:4366 +#: ../src/dlg-extract.c:170 ../src/fr-window.c:4290 ../src/fr-window.c:4374 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" @@ -397,18 +397,18 @@ msgid "Extract" msgstr "Estrai" -#: ../src/dlg-package-installer.c:107 ../src/dlg-package-installer.c:220 +#: ../src/dlg-package-installer.c:112 ../src/dlg-package-installer.c:225 msgid "There was an internal error trying to search for applications:" msgstr "Si è verificato un errore interno cercando le applicazioni:" -#: ../src/dlg-package-installer.c:269 ../src/dlg-package-installer.c:278 -#: ../src/dlg-package-installer.c:306 ../src/fr-archive.c:819 -#: ../src/fr-window.c:3846 ../src/fr-window.c:7313 ../src/fr-window.c:7669 -#: ../src/fr-window.c:9210 +#: ../src/dlg-package-installer.c:294 ../src/dlg-package-installer.c:303 +#: ../src/dlg-package-installer.c:331 ../src/fr-archive.c:742 +#: ../src/fr-window.c:3854 ../src/fr-window.c:7330 ../src/fr-window.c:7686 +#: ../src/fr-window.c:9227 msgid "Archive type not supported." msgstr "Tipo di archivio non supportato." -#: ../src/dlg-package-installer.c:288 +#: ../src/dlg-package-installer.c:313 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -417,11 +417,11 @@ "Non c'è alcun comando installato per i file %s.\n" "Cercare un comando per aprire questo file?" -#: ../src/dlg-package-installer.c:293 +#: ../src/dlg-package-installer.c:318 msgid "Could not open this file type" msgstr "Impossibile aprire questo tipo di file" -#: ../src/dlg-package-installer.c:296 +#: ../src/dlg-package-installer.c:321 msgid "_Search Command" msgstr "Ce_rca comando" @@ -461,15 +461,15 @@ msgid "Update the files in the archive \"%s\"?" msgstr "Aggiornare i file nell'archivio «%s»?" -#: ../src/fr-archive.c:1944 +#: ../src/fr-archive.c:1842 msgid "You don't have the right permissions." msgstr "Non si dispone dei permessi necessari." -#: ../src/fr-archive.c:1944 +#: ../src/fr-archive.c:1842 msgid "This archive type cannot be modified" msgstr "Questo tipo di archivio non può essere modificato." -#: ../src/fr-archive.c:1958 +#: ../src/fr-archive.c:1856 msgid "You can't add an archive to itself." msgstr "Impossibile aggiungere un archivio a se stesso." @@ -525,7 +525,7 @@ #: ../src/fr-new-archive-dialog.c:335 ../src/fr-new-archive-dialog.c:354 #: ../src/fr-new-archive-dialog.c:370 ../src/fr-new-archive-dialog.c:418 -#: ../src/fr-window.c:2814 +#: ../src/fr-window.c:2822 msgid "Could not create the archive" msgstr "Impossibile creare l'archivio" @@ -550,7 +550,7 @@ "Il file esiste già in «%s». Se viene sostituito, verrà sovrascritto il suo " "contenuto." -#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:6550 +#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:6567 msgid "_Replace" msgstr "S_ostituisci" @@ -570,201 +570,201 @@ msgid "_Extract" msgstr "_Estrai" -#: ../src/fr-window.c:1043 +#: ../src/fr-window.c:1045 msgid "Operation completed" msgstr "Operazione completata" -#: ../src/fr-window.c:1160 +#: ../src/fr-window.c:1162 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" msgstr[0] "%d oggetto (%s)" msgstr[1] "%d oggetti (%s)" -#: ../src/fr-window.c:1165 +#: ../src/fr-window.c:1167 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" msgstr[0] "%d oggetto selezionato (%s)" msgstr[1] "%d oggetti selezionati (%s)" -#: ../src/fr-window.c:1584 +#: ../src/fr-window.c:1587 msgid "Folder" msgstr "Cartella" -#: ../src/fr-window.c:1963 +#: ../src/fr-window.c:1968 msgid "[read only]" msgstr "[sola lettura]" -#: ../src/fr-window.c:2082 +#: ../src/fr-window.c:2087 #, c-format msgid "Could not display the folder \"%s\"" msgstr "Impossibile mostrare la cartella «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2173 ../src/fr-window.c:2211 +#: ../src/fr-window.c:2178 ../src/fr-window.c:2216 #, c-format msgid "Creating \"%s\"" msgstr "Creazione di «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2177 +#: ../src/fr-window.c:2182 #, c-format msgid "Loading \"%s\"" msgstr "Caricamento di «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2181 +#: ../src/fr-window.c:2186 #, c-format msgid "Reading \"%s\"" msgstr "Lettura di «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2185 +#: ../src/fr-window.c:2190 #, c-format msgid "Deleting the files from \"%s\"" msgstr "Eliminazione dei file da «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2189 +#: ../src/fr-window.c:2194 #, c-format msgid "Testing \"%s\"" msgstr "Verifica di «%s»" -#: ../src/fr-window.c:2192 +#: ../src/fr-window.c:2197 msgid "Getting the file list" msgstr "Recupero dell'elenco di file" #. Translators: %s is a filename -#: ../src/fr-window.c:2196 +#: ../src/fr-window.c:2201 #, c-format msgid "Copying the files to add to \"%s\"" msgstr "Copia dei file da aggiungere a «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2200 +#: ../src/fr-window.c:2205 #, c-format msgid "Adding the files to \"%s\"" msgstr "Aggiunta dei file a «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2204 +#: ../src/fr-window.c:2209 #, c-format msgid "Extracting the files from \"%s\"" msgstr "Estrazione dei file da «%s»" -#: ../src/fr-window.c:2207 +#: ../src/fr-window.c:2212 msgid "Copying the extracted files to the destination" msgstr "Copia dei file estratti sulla destinazione" #. Translators: %s is a filename -#: ../src/fr-window.c:2216 +#: ../src/fr-window.c:2221 #, c-format msgid "Saving \"%s\"" msgstr "Salvataggio di «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2223 +#: ../src/fr-window.c:2228 #, c-format msgid "Renaming the files in \"%s\"" msgstr "Rinomina dei file in «%s»" #. Translators: %s is a filename -#: ../src/fr-window.c:2227 +#: ../src/fr-window.c:2232 #, c-format msgid "Updating the files in \"%s\"" msgstr "Aggiornamento dei file in «%s»" # (ndt) pulsante -#: ../src/fr-window.c:2402 +#: ../src/fr-window.c:2407 msgid "_Open the Archive" msgstr "_Apri archivio" -#: ../src/fr-window.c:2403 +#: ../src/fr-window.c:2408 msgid "_Show the Files" msgstr "_Mostra i file" -#: ../src/fr-window.c:2520 +#: ../src/fr-window.c:2525 #, c-format msgid "%d file remaining" msgid_plural "%'d files remaining" msgstr[0] "%d file rimanente" msgstr[1] "%'d file rimanenti" -#: ../src/fr-window.c:2524 ../src/fr-window.c:3097 +#: ../src/fr-window.c:2529 ../src/fr-window.c:3105 msgid "Please wait…" msgstr "Attendere..." -#: ../src/fr-window.c:2580 +#: ../src/fr-window.c:2585 msgid "Extraction completed successfully" msgstr "Estrazione completata con successo" #. Translators: %s is a filename -#: ../src/fr-window.c:2611 ../src/fr-window.c:6142 +#: ../src/fr-window.c:2616 ../src/fr-window.c:6159 #, c-format msgid "\"%s\" created successfully" -msgstr "«%s» estratto con successo" +msgstr "«%s» creato con successo" -#: ../src/fr-window.c:2701 ../src/fr-window.c:2870 +#: ../src/fr-window.c:2706 ../src/fr-window.c:2878 msgid "Command exited abnormally." msgstr "Comando uscito in modo anomalo." -#: ../src/fr-window.c:2819 +#: ../src/fr-window.c:2827 msgid "An error occurred while extracting files." msgstr "Si è verificato un errore durante l'estrazione dei file." -#: ../src/fr-window.c:2825 +#: ../src/fr-window.c:2833 #, c-format msgid "Could not open \"%s\"" msgstr "Impossibile aprire «%s»" -#: ../src/fr-window.c:2830 +#: ../src/fr-window.c:2838 msgid "An error occurred while loading the archive." msgstr "Si è verificato un errore durante il caricamento dell'archivio." -#: ../src/fr-window.c:2834 +#: ../src/fr-window.c:2842 msgid "An error occurred while deleting files from the archive." msgstr "" "Si è verificato un errore durante l'eliminazione dei file dall'archivio." -#: ../src/fr-window.c:2840 +#: ../src/fr-window.c:2848 msgid "An error occurred while adding files to the archive." msgstr "Si è verificato un errore durante l'aggiunta dei file all'archivio." -#: ../src/fr-window.c:2844 +#: ../src/fr-window.c:2852 msgid "An error occurred while testing archive." msgstr "Si è verificato un errore durante la verifica dell'archivio." -#: ../src/fr-window.c:2849 +#: ../src/fr-window.c:2857 msgid "An error occurred while saving the archive." msgstr "Si è verificato un errore durante il salvataggio dell'archivio." -#: ../src/fr-window.c:2853 +#: ../src/fr-window.c:2861 msgid "An error occurred while renaming the files." msgstr "Si è verificato un errore durante la rinomina dei file." -#: ../src/fr-window.c:2857 +#: ../src/fr-window.c:2865 msgid "An error occurred while updating the files." msgstr "Si è verificato un errore durante l'aggiornamento dei file." -#: ../src/fr-window.c:2861 +#: ../src/fr-window.c:2869 msgid "An error occurred." msgstr "Si è verificato un errore." -#: ../src/fr-window.c:2867 +#: ../src/fr-window.c:2875 msgid "Command not found." msgstr "Comando non trovato." -#: ../src/fr-window.c:3025 +#: ../src/fr-window.c:3033 msgid "Test Result" msgstr "Risultato della verifica" -#: ../src/fr-window.c:3964 ../src/fr-window.c:8653 ../src/fr-window.c:8687 -#: ../src/fr-window.c:8966 +#: ../src/fr-window.c:3972 ../src/fr-window.c:8670 ../src/fr-window.c:8704 +#: ../src/fr-window.c:8983 msgid "Could not perform the operation" msgstr "Impossibile eseguire l'operazione" -#: ../src/fr-window.c:3990 +#: ../src/fr-window.c:3998 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" @@ -772,109 +772,109 @@ "Aggiungere questo file all'archivio corrente o aprirlo come un nuovo " "archivio?" -#: ../src/fr-window.c:4020 +#: ../src/fr-window.c:4028 msgid "Do you want to create a new archive with these files?" msgstr "Creare un nuovo archivio con questi file?" -#: ../src/fr-window.c:4023 +#: ../src/fr-window.c:4031 msgid "Create _Archive" msgstr "Crea _archivio" -#: ../src/fr-window.c:4052 ../src/fr-window.c:7123 +#: ../src/fr-window.c:4060 ../src/fr-window.c:7140 msgid "New Archive" msgstr "Nuovo archivio" -#: ../src/fr-window.c:4640 +#: ../src/fr-window.c:4648 msgid "Folders" msgstr "Cartelle" -#: ../src/fr-window.c:4678 ../src/ui/file-selector.ui.h:5 +#: ../src/fr-window.c:4686 ../src/ui/file-selector.ui.h:5 msgctxt "File" msgid "Size" msgstr "Dimensione" -#: ../src/fr-window.c:4679 +#: ../src/fr-window.c:4687 msgctxt "File" msgid "Type" msgstr "Tipo" -#: ../src/fr-window.c:4680 ../src/ui/file-selector.ui.h:6 +#: ../src/fr-window.c:4688 ../src/ui/file-selector.ui.h:6 msgctxt "File" msgid "Modified" msgstr "Modificato" -#: ../src/fr-window.c:4681 +#: ../src/fr-window.c:4689 msgctxt "File" msgid "Location" msgstr "Posizione" -#: ../src/fr-window.c:4690 ../src/ui/file-selector.ui.h:4 +#: ../src/fr-window.c:4698 ../src/ui/file-selector.ui.h:4 msgctxt "File" msgid "Name" msgstr "Nome" -#: ../src/fr-window.c:5517 +#: ../src/fr-window.c:5528 msgid "Find:" msgstr "Trova:" #. Translators: this is the label for the "open recent file" sub-menu. -#: ../src/fr-window.c:5612 +#: ../src/fr-window.c:5623 msgid "Open _Recent" msgstr "Apri _recenti" -#: ../src/fr-window.c:5613 ../src/fr-window.c:5625 +#: ../src/fr-window.c:5624 ../src/fr-window.c:5636 msgid "Open a recently used archive" msgstr "Apre un archivio usato di recente" #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5697 ../src/ui/file-selector.ui.h:1 +#: ../src/fr-window.c:5708 ../src/ui/file-selector.ui.h:1 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "Posi_zione:" -#: ../src/fr-window.c:6538 +#: ../src/fr-window.c:6555 #, c-format msgid "Replace file \"%s\"?" msgstr "Sostituire il file «%s»?" -#: ../src/fr-window.c:6541 +#: ../src/fr-window.c:6558 #, c-format msgid "Another file with the same name already exists in \"%s\"." msgstr "Esiste già un file con lo stesso nome in «%s»." -#: ../src/fr-window.c:6548 +#: ../src/fr-window.c:6565 msgid "Replace _All" msgstr "Sostituisci _tutti" -#: ../src/fr-window.c:6549 +#: ../src/fr-window.c:6566 msgid "_Skip" msgstr "_Salta" -#: ../src/fr-window.c:7305 ../src/fr-window.c:7661 +#: ../src/fr-window.c:7322 ../src/fr-window.c:7678 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Impossibile salvare l'archivio «%s»" -#: ../src/fr-window.c:7432 +#: ../src/fr-window.c:7449 msgid "Save" msgstr "Salva" -#: ../src/fr-window.c:7755 +#: ../src/fr-window.c:7772 msgid "Last Output" msgstr "Ultimo output" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7977 +#: ../src/fr-window.c:7994 msgid "New name is void, please type a name." msgstr "Il nuovo nome è nullo. Digitare un nome." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7982 +#: ../src/fr-window.c:7999 msgid "New name is the same as old one, please type other name." msgstr "Il nuovo nome è identico a quello vecchio. Digitare un altro nome." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7987 +#: ../src/fr-window.c:8004 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " @@ -883,7 +883,7 @@ "Il nome «%s» non è valido perché contiene almeno uno dei seguenti caratteri: " "%s. Digitare un altro nome." -#: ../src/fr-window.c:8023 +#: ../src/fr-window.c:8040 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -894,11 +894,11 @@ "\n" "%s" -#: ../src/fr-window.c:8023 ../src/fr-window.c:8025 +#: ../src/fr-window.c:8040 ../src/fr-window.c:8042 msgid "Please use a different name." msgstr "Utilizzare un nome diverso." -#: ../src/fr-window.c:8025 +#: ../src/fr-window.c:8042 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -909,56 +909,56 @@ "\n" "%s" -#: ../src/fr-window.c:8095 +#: ../src/fr-window.c:8112 msgid "Rename" msgstr "Rinomina" -#: ../src/fr-window.c:8096 +#: ../src/fr-window.c:8113 msgid "_New folder name:" msgstr "_Nuovo nome della cartella:" -#: ../src/fr-window.c:8096 +#: ../src/fr-window.c:8113 msgid "_New file name:" msgstr "Nuovo nome del _file:" -#: ../src/fr-window.c:8100 +#: ../src/fr-window.c:8117 msgid "_Rename" msgstr "_Rinomina" -#: ../src/fr-window.c:8117 ../src/fr-window.c:8136 +#: ../src/fr-window.c:8134 ../src/fr-window.c:8153 msgid "Could not rename the folder" msgstr "Impossibile rinominare la cartella" -#: ../src/fr-window.c:8117 ../src/fr-window.c:8136 +#: ../src/fr-window.c:8134 ../src/fr-window.c:8153 msgid "Could not rename the file" msgstr "Impossibile rinominare il file" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8560 +#: ../src/fr-window.c:8577 #, c-format msgid "Moving the files from \"%s\" to \"%s\"" msgstr "Spostamento dei file da «%s» a «%s»" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8563 +#: ../src/fr-window.c:8580 #, c-format msgid "Copying the files from \"%s\" to \"%s\"" msgstr "Copia dei file da «%s» a «%s»" -#: ../src/fr-window.c:8614 +#: ../src/fr-window.c:8631 msgid "Paste Selection" msgstr "Incolla la selezione" -#: ../src/fr-window.c:8615 +#: ../src/fr-window.c:8632 msgid "_Destination folder:" msgstr "Cartella di _destinazione:" -#: ../src/fr-window.c:9228 +#: ../src/fr-window.c:9245 msgid "Add files to an archive" msgstr "Aggiungi dei file a un archivio" -#: ../src/fr-window.c:9272 ../src/main.c:446 ../src/main.c:482 -#: ../src/main.c:508 ../src/main.c:800 +#: ../src/fr-window.c:9289 ../src/main.c:453 ../src/main.c:489 +#: ../src/main.c:515 ../src/main.c:807 msgid "Extract archive" msgstr "Estrai archivio" @@ -1029,11 +1029,11 @@ msgstr "Mostra la versione" #. manually set name and icon -#: ../src/main.c:627 +#: ../src/main.c:634 msgid "File Roller" msgstr "File Roller" -#: ../src/main.c:658 +#: ../src/main.c:665 msgid "- Create and modify an archive" msgstr "- Crea e modifica un archivio" diff -Nru file-roller-3.6.0/po/lt.po file-roller-3.6.3/po/lt.po --- file-roller-3.6.0/po/lt.po 2012-08-23 06:58:50.000000000 +0000 +++ file-roller-3.6.3/po/lt.po 2012-11-27 20:57:52.000000000 +0000 @@ -9,8 +9,8 @@ msgstr "" "Project-Id-Version: file-roller.HEAD\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-08-11 20:48+0000\n" -"PO-Revision-Date: 2012-08-21 22:56+0300\n" +"POT-Creation-Date: 2012-11-27 20:22+0000\n" +"PO-Revision-Date: 2012-11-27 22:42+0300\n" "Last-Translator: Aurimas Černius \n" "Language-Team: Lietuvių <>\n" "Language: lt\n" @@ -85,8 +85,8 @@ msgstr "Rodyti sesijų valdymo parinktis" #: ../data/file-roller.desktop.in.in.h:1 -#: ../src/fr-window.c:1955 -#: ../src/fr-window.c:5331 +#: ../src/fr-window.c:2005 +#: ../src/fr-window.c:5415 msgid "Archive Manager" msgstr "Archyvų tvarkymo programa" @@ -94,6 +94,10 @@ msgid "Create and modify an archive" msgstr "Kurti ir modifikuoti archyvą" +#: ../data/file-roller.desktop.in.in.h:3 +msgid "zip;tar;extract;unpack;" +msgstr "zip;tar;išskleisti;išpakuoti;" + #: ../data/org.gnome.FileRoller.gschema.xml.in.h:1 msgid "How to sort files" msgstr "Kaip rikiuoti failus" @@ -257,13 +261,13 @@ msgstr "Sukurti suglaudintą archyvą iš pažymėtų objektų" #: ../src/actions.c:112 -#: ../src/fr-window.c:5626 -#: ../src/fr-window.c:6165 +#: ../src/fr-window.c:5710 +#: ../src/fr-window.c:6255 msgid "Open" msgstr "Atverti" #: ../src/actions.c:125 -#: ../src/fr-window.c:5169 +#: ../src/fr-window.c:5254 msgid "All archives" msgstr "Visi archyvai" @@ -300,7 +304,6 @@ msgstr "Įdėti failus" #: ../src/dlg-add.c:193 -#| msgid "_Load Options" msgid "_Options" msgstr "_Parinktys" @@ -312,17 +315,16 @@ #. save options #: ../src/dlg-add.c:209 -#: ../src/dlg-add.c:824 +#: ../src/dlg-add.c:827 msgid "Save Options" msgstr "Išsaugoti nustatymus" #. clear options #: ../src/dlg-add.c:216 -#| msgid "_Reset Options" msgid "Reset Options" msgstr "_Atstatyti parinktis" -#: ../src/dlg-add.c:825 +#: ../src/dlg-add.c:828 msgid "_Options Name:" msgstr "_Nustatymo pavadinimas:" @@ -333,18 +335,17 @@ msgstr "„%s“ reikalauja slaptažodžio" #: ../src/dlg-ask-password.c:139 -#| msgid "Password" msgid "Wrong password." msgstr "Neteisingas slaptažodis." -#: ../src/dlg-batch-add.c:81 -#: ../src/main.c:412 -#: ../src/main.c:778 +#: ../src/dlg-batch-add.c:87 +#: ../src/main.c:417 +#: ../src/main.c:793 msgid "Compress" msgstr "Suglaudinti" #: ../src/dlg-extract.c:96 -#: ../src/fr-window.c:6690 +#: ../src/fr-window.c:6802 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -356,31 +357,31 @@ "Ar norite jį sukurti?" #: ../src/dlg-extract.c:105 -#: ../src/fr-window.c:6699 +#: ../src/fr-window.c:6811 msgid "Create _Folder" msgstr "Sukurti _aplanką" #: ../src/dlg-extract.c:124 #: ../src/dlg-extract.c:142 #: ../src/dlg-extract.c:169 -#: ../src/fr-window.c:4118 -#: ../src/fr-window.c:6595 -#: ../src/fr-window.c:6600 -#: ../src/fr-window.c:6720 -#: ../src/fr-window.c:6739 -#: ../src/fr-window.c:6744 +#: ../src/fr-window.c:4197 +#: ../src/fr-window.c:6706 +#: ../src/fr-window.c:6711 +#: ../src/fr-window.c:6832 +#: ../src/fr-window.c:6851 +#: ../src/fr-window.c:6856 msgid "Extraction not performed" msgstr "Išskleidimas neatliktas" #: ../src/dlg-extract.c:125 -#: ../src/fr-window.c:6716 +#: ../src/fr-window.c:6828 #, c-format msgid "Could not create the destination folder: %s." msgstr "Nepavyko sukurti paskirties aplanko: %s." #: ../src/dlg-extract.c:170 -#: ../src/fr-window.c:4284 -#: ../src/fr-window.c:4368 +#: ../src/fr-window.c:4366 +#: ../src/fr-window.c:4450 #, c-format msgid "You don't have the right permissions to extract archives in the folder \"%s\"" msgstr "Neturite reikiamų teisių išskleisti archyvus aplanke „%s“" @@ -391,23 +392,23 @@ msgid "Extract" msgstr "Išskleisti" -#: ../src/dlg-package-installer.c:107 -#: ../src/dlg-package-installer.c:220 +#: ../src/dlg-package-installer.c:112 +#: ../src/dlg-package-installer.c:225 msgid "There was an internal error trying to search for applications:" msgstr "Vidinė klaida ieškant programų:" -#: ../src/dlg-package-installer.c:269 -#: ../src/dlg-package-installer.c:278 -#: ../src/dlg-package-installer.c:306 -#: ../src/fr-archive.c:819 -#: ../src/fr-window.c:3848 -#: ../src/fr-window.c:7295 -#: ../src/fr-window.c:7651 -#: ../src/fr-window.c:9177 +#: ../src/dlg-package-installer.c:294 +#: ../src/dlg-package-installer.c:303 +#: ../src/dlg-package-installer.c:331 +#: ../src/fr-archive.c:743 +#: ../src/fr-window.c:3927 +#: ../src/fr-window.c:7408 +#: ../src/fr-window.c:7764 +#: ../src/fr-window.c:9311 msgid "Archive type not supported." msgstr "Archyvo tipas nepalaikomas." -#: ../src/dlg-package-installer.c:288 +#: ../src/dlg-package-installer.c:313 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -416,17 +417,16 @@ "Neįdiegta %s failus galinti atverti komanda.\n" "Ar tikrai norite ieškoti komandos, galinčios atverti šį failą?" -#: ../src/dlg-package-installer.c:293 +#: ../src/dlg-package-installer.c:318 msgid "Could not open this file type" msgstr "Nepavyko atverti šio failo tipo" -#: ../src/dlg-package-installer.c:296 +#: ../src/dlg-package-installer.c:321 msgid "_Search Command" msgstr "_Ieškoti komandos" #: ../src/dlg-password.c:91 #, c-format -#| msgid "Enter the password for the archive '%s'." msgid "Enter a password for \"%s\"" msgstr "Įveskite „%s“ slaptažodį" @@ -435,14 +435,14 @@ msgid "%s Properties" msgstr "%s savybės" -#: ../src/dlg-update.c:162 +#: ../src/dlg-update.c:163 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "Atnaujinti failą „%s“ archyve „%s“?" #. secondary text -#: ../src/dlg-update.c:173 -#: ../src/dlg-update.c:198 +#: ../src/dlg-update.c:174 +#: ../src/dlg-update.c:199 #: ../src/ui/update.ui.h:2 #, c-format msgid "The file has been modified with an external application. If you don't update the file in the archive, all of your changes will be lost." @@ -451,34 +451,34 @@ msgstr[1] "%d failai pakeisti išorinės programos. Jei neatnaujinsite failo archyve, visi pakeitimai bus prarasti." msgstr[2] "%d failų pakeisti išorinės programos. Jei neatnaujinsite failo archyve, visi pakeitimai bus prarasti." -#: ../src/dlg-update.c:188 +#: ../src/dlg-update.c:189 #, c-format msgid "Update the files in the archive \"%s\"?" msgstr "Atnaujinti failus archyve „%s“?" -#: ../src/fr-archive.c:1944 +#: ../src/fr-archive.c:1844 msgid "You don't have the right permissions." msgstr "Neturite reikiamų teisių." -#: ../src/fr-archive.c:1944 +#: ../src/fr-archive.c:1844 msgid "This archive type cannot be modified" msgstr "Šio tipo archyvai negali būti keičiami" -#: ../src/fr-archive.c:1958 +#: ../src/fr-archive.c:1858 msgid "You can't add an archive to itself." msgstr "Negalima įdėti archyvo į jį patį." #. Translators: %s is a filename. #: ../src/fr-command-7z.c:297 -#: ../src/fr-command-rar.c:325 +#: ../src/fr-command-rar.c:328 #: ../src/fr-command-tar.c:305 #, c-format msgid "Adding \"%s\"" msgstr "Pridedamas „%s“" #. Translators: %s is a filename. -#: ../src/fr-command-7z.c:420 -#: ../src/fr-command-rar.c:455 +#: ../src/fr-command-7z.c:424 +#: ../src/fr-command-rar.c:460 #: ../src/fr-command-tar.c:426 #, c-format msgid "Extracting \"%s\"" @@ -490,13 +490,13 @@ msgstr "Archyvas nerastas." #. Translators: %s is a filename. -#: ../src/fr-command-rar.c:406 +#: ../src/fr-command-rar.c:409 #: ../src/fr-command-tar.c:371 #, c-format msgid "Removing \"%s\"" msgstr "Šalinamas „%s“" -#: ../src/fr-command-rar.c:581 +#: ../src/fr-command-rar.c:586 #, c-format msgid "Could not find the volume: %s" msgstr "Nepavyko rasti dalies: %s" @@ -509,7 +509,7 @@ msgid "Recompressing archive" msgstr "Iš naujo glaudinamas archyvas" -#: ../src/fr-command-tar.c:725 +#: ../src/fr-command-tar.c:726 msgid "Decompressing archive" msgstr "Išglaudinimas archyvas" @@ -519,44 +519,42 @@ #: ../src/fr-file-selector-dialog.c:1331 #: ../src/fr-file-selector-dialog.c:1376 -#| msgid "Could not perform the operation" msgid "Could not load the location" msgstr "Nepavyko įkelti vietos" -#: ../src/fr-new-archive-dialog.c:331 -#: ../src/fr-new-archive-dialog.c:350 -#: ../src/fr-new-archive-dialog.c:366 -#: ../src/fr-new-archive-dialog.c:414 -#: ../src/fr-window.c:2812 +#: ../src/fr-new-archive-dialog.c:335 +#: ../src/fr-new-archive-dialog.c:354 +#: ../src/fr-new-archive-dialog.c:370 +#: ../src/fr-new-archive-dialog.c:418 +#: ../src/fr-window.c:2868 msgid "Could not create the archive" msgstr "Nepavyko sukurti archyvo" -#: ../src/fr-new-archive-dialog.c:333 -#: ../src/fr-new-archive-dialog.c:352 +#: ../src/fr-new-archive-dialog.c:337 +#: ../src/fr-new-archive-dialog.c:356 msgid "You have to specify an archive name." msgstr "Turite nurodyti archyvo pavadinimą." -#: ../src/fr-new-archive-dialog.c:416 +#: ../src/fr-new-archive-dialog.c:420 msgid "You don't have permission to create an archive in this folder" msgstr "Neturite leidimo sukurti archyvą šiame aplanke" -#: ../src/fr-new-archive-dialog.c:435 +#: ../src/fr-new-archive-dialog.c:439 #, c-format -#| msgid "The archive is already present. Do you want to overwrite it?" msgid "A file named \"%s\" already exists. Do you want to replace it?" msgstr "Failas pavadinimų „%s“ jau yra. Ar norite jį perrašyti?" -#: ../src/fr-new-archive-dialog.c:436 +#: ../src/fr-new-archive-dialog.c:440 #, c-format msgid "The file already exists in \"%s\". Replacing it will overwrite its contents." msgstr "Failas jau yra aplanke „%s“. Jo pakeitimas perrašys turinį" -#: ../src/fr-new-archive-dialog.c:443 -#: ../src/fr-window.c:6533 +#: ../src/fr-new-archive-dialog.c:447 +#: ../src/fr-window.c:6644 msgid "_Replace" msgstr "Pa_keisti" -#: ../src/fr-new-archive-dialog.c:458 +#: ../src/fr-new-archive-dialog.c:462 msgid "Could not delete the old archive." msgstr "Nepavyko ištrinti seno archyvo." @@ -573,12 +571,11 @@ msgid "_Extract" msgstr "_Išskleisti" -#: ../src/fr-window.c:1043 -#| msgid "Extraction completed successfully" +#: ../src/fr-window.c:1125 msgid "Operation completed" msgstr "Veiksmas užbaigtas" -#: ../src/fr-window.c:1160 +#: ../src/fr-window.c:1242 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" @@ -586,7 +583,7 @@ msgstr[1] "%d objektai (%s)" msgstr[2] "%d objektų (%s)" -#: ../src/fr-window.c:1165 +#: ../src/fr-window.c:1247 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" @@ -594,108 +591,103 @@ msgstr[1] "pasirinkti %d objektai (%s)" msgstr[2] "pasirinkta %d objektų (%s)" -#: ../src/fr-window.c:1584 +#: ../src/fr-window.c:1632 msgid "Folder" msgstr "Aplankas" -#: ../src/fr-window.c:1963 +#: ../src/fr-window.c:2013 msgid "[read only]" msgstr "[tik skaitymui]" -#: ../src/fr-window.c:2082 +#: ../src/fr-window.c:2132 #, c-format msgid "Could not display the folder \"%s\"" msgstr "Nepavyko parodyti aplanko „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2169 -#: ../src/fr-window.c:2207 +#: ../src/fr-window.c:2223 +#: ../src/fr-window.c:2261 #, c-format msgid "Creating \"%s\"" msgstr "Kuriamas „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2173 +#: ../src/fr-window.c:2227 #, c-format msgid "Loading \"%s\"" msgstr "Įkeliamas „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2177 +#: ../src/fr-window.c:2231 #, c-format msgid "Reading \"%s\"" msgstr "Skaitomas „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2181 +#: ../src/fr-window.c:2235 #, c-format -#| msgid "Deleting files from \"%s\"" msgid "Deleting the files from \"%s\"" msgstr "Iš „%s“ šalinami failai" #. Translators: %s is a filename -#: ../src/fr-window.c:2185 +#: ../src/fr-window.c:2239 #, c-format msgid "Testing \"%s\"" msgstr "Bandoma „%s“" -#: ../src/fr-window.c:2188 +#: ../src/fr-window.c:2242 msgid "Getting the file list" msgstr "Gaunamas failų sąrašas" #. Translators: %s is a filename -#: ../src/fr-window.c:2192 +#: ../src/fr-window.c:2246 #, c-format msgid "Copying the files to add to \"%s\"" msgstr "Failai kopijuojami pridėjimui į „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2196 +#: ../src/fr-window.c:2250 #, c-format -#| msgid "Adding files to \"%s\"" msgid "Adding the files to \"%s\"" msgstr "Failai dedami į „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2200 +#: ../src/fr-window.c:2254 #, c-format -#| msgid "Extracting files from \"%s\"" msgid "Extracting the files from \"%s\"" msgstr "Failai išskleidžiami iš „%s“" -#: ../src/fr-window.c:2203 +#: ../src/fr-window.c:2257 msgid "Copying the extracted files to the destination" msgstr "Išskleisti failai kopijuojami į paskirties aplanką" #. Translators: %s is a filename -#: ../src/fr-window.c:2212 +#: ../src/fr-window.c:2266 #, c-format msgid "Saving \"%s\"" msgstr "Įrašoma „%s“" #. Translators: %s is a filename -#: ../src/fr-window.c:2219 +#: ../src/fr-window.c:2273 #, c-format -#| msgid "Getting the file list" msgid "Renaming the files in \"%s\"" msgstr "„%s“ failai pervadiname" #. Translators: %s is a filename -#: ../src/fr-window.c:2223 +#: ../src/fr-window.c:2277 #, c-format -#| msgid "Update the files in the archive \"%s\"?" msgid "Updating the files in \"%s\"" msgstr "Atnaujinami „%s“ failai" -#: ../src/fr-window.c:2398 +#: ../src/fr-window.c:2452 msgid "_Open the Archive" msgstr "_Atverti archyvą" -#: ../src/fr-window.c:2399 +#: ../src/fr-window.c:2453 msgid "_Show the Files" msgstr "_Rodyti failus" -#: ../src/fr-window.c:2516 +#: ../src/fr-window.c:2570 #, c-format msgid "%d file remaining" msgid_plural "%'d files remaining" @@ -703,210 +695,202 @@ msgstr[1] "liko %d failai" msgstr[2] "liko %d failų" -#: ../src/fr-window.c:2520 -#: ../src/fr-window.c:3099 +#: ../src/fr-window.c:2574 +#: ../src/fr-window.c:3153 msgid "Please wait…" msgstr "Palaukite..." -#: ../src/fr-window.c:2578 +#: ../src/fr-window.c:2630 msgid "Extraction completed successfully" msgstr "Išskleidimas sėkmingai baigtas" #. Translators: %s is a filename -#: ../src/fr-window.c:2609 -#: ../src/fr-window.c:6144 +#: ../src/fr-window.c:2662 +#: ../src/fr-window.c:6234 #, c-format -#| msgid "Archive created successfully" msgid "\"%s\" created successfully" msgstr "„%s“ sėkmingai sukurtas" -#: ../src/fr-window.c:2699 -#: ../src/fr-window.c:2868 +#: ../src/fr-window.c:2752 +#: ../src/fr-window.c:2924 msgid "Command exited abnormally." msgstr "Komanda baigė darbą nesėkmingai." -#: ../src/fr-window.c:2817 +#: ../src/fr-window.c:2873 msgid "An error occurred while extracting files." msgstr "Įvyko klaida išskleidžiant failus." -#: ../src/fr-window.c:2823 +#: ../src/fr-window.c:2879 #, c-format msgid "Could not open \"%s\"" msgstr "Nepavyko atverti „%s“" -#: ../src/fr-window.c:2828 +#: ../src/fr-window.c:2884 msgid "An error occurred while loading the archive." msgstr "Įvyko klaida įkeliant archyvą." -#: ../src/fr-window.c:2832 +#: ../src/fr-window.c:2888 msgid "An error occurred while deleting files from the archive." msgstr "Įvyko klaida šalinant failus iš archyvo." -#: ../src/fr-window.c:2838 +#: ../src/fr-window.c:2894 msgid "An error occurred while adding files to the archive." msgstr "Įvyko klaida įtraukiant failus į archyvą." -#: ../src/fr-window.c:2842 +#: ../src/fr-window.c:2898 msgid "An error occurred while testing archive." msgstr "Įvyko klaida testuojant archyvą." -#: ../src/fr-window.c:2847 +#: ../src/fr-window.c:2903 msgid "An error occurred while saving the archive." msgstr "Įvyko klaida įrašant archyvą." -#: ../src/fr-window.c:2851 -#| msgid "An error occurred while extracting files." +#: ../src/fr-window.c:2907 msgid "An error occurred while renaming the files." msgstr "Įvyko klaida pervadinant failus." -#: ../src/fr-window.c:2855 -#| msgid "An error occurred while extracting files." +#: ../src/fr-window.c:2911 msgid "An error occurred while updating the files." msgstr "Įvyko klaida atnaujinant failus." -#: ../src/fr-window.c:2859 +#: ../src/fr-window.c:2915 msgid "An error occurred." msgstr "Įvyko klaida." -#: ../src/fr-window.c:2865 +#: ../src/fr-window.c:2921 msgid "Command not found." msgstr "Komanda nerasta." -#: ../src/fr-window.c:3023 +#: ../src/fr-window.c:3081 msgid "Test Result" msgstr "Tikrinimo rezultatas" -#: ../src/fr-window.c:3966 -#: ../src/fr-window.c:8635 -#: ../src/fr-window.c:8669 -#: ../src/fr-window.c:8935 +#: ../src/fr-window.c:4045 +#: ../src/fr-window.c:8757 +#: ../src/fr-window.c:8791 +#: ../src/fr-window.c:9070 msgid "Could not perform the operation" msgstr "Nepavyko atlikti operacijos" -#: ../src/fr-window.c:3992 +#: ../src/fr-window.c:4071 msgid "Do you want to add this file to the current archive or open it as a new archive?" msgstr "Ar norite įdėti šį failą į esamą archyvą, ar atverti jį kaip naują archyvą?" -#: ../src/fr-window.c:4022 +#: ../src/fr-window.c:4101 msgid "Do you want to create a new archive with these files?" msgstr "Ar norite sukurti naują archyvą su šiais failais?" -#: ../src/fr-window.c:4025 +#: ../src/fr-window.c:4104 msgid "Create _Archive" msgstr "Sukurti _archyvą" -#: ../src/fr-window.c:4054 -#: ../src/fr-window.c:7105 -#| msgid "_Archive" +#: ../src/fr-window.c:4133 +#: ../src/fr-window.c:7218 msgid "New Archive" msgstr "Naujas archyvas" -#: ../src/fr-window.c:4642 +#: ../src/fr-window.c:4724 msgid "Folders" msgstr "Aplankai" -#: ../src/fr-window.c:4680 +#: ../src/fr-window.c:4762 #: ../src/ui/file-selector.ui.h:5 msgctxt "File" msgid "Size" msgstr "Dydis" -#: ../src/fr-window.c:4681 +#: ../src/fr-window.c:4763 msgctxt "File" msgid "Type" msgstr "Tipas" -#: ../src/fr-window.c:4682 +#: ../src/fr-window.c:4764 #: ../src/ui/file-selector.ui.h:6 -#| msgctxt "File" -#| msgid "Date Modified" msgctxt "File" msgid "Modified" msgstr "Keitimo data" -#: ../src/fr-window.c:4683 +#: ../src/fr-window.c:4765 msgctxt "File" msgid "Location" msgstr "Vieta" -#: ../src/fr-window.c:4692 +#: ../src/fr-window.c:4774 #: ../src/ui/file-selector.ui.h:4 msgctxt "File" msgid "Name" msgstr "Pavadinimas" -#: ../src/fr-window.c:5519 +#: ../src/fr-window.c:5603 msgid "Find:" msgstr "Rasti:" #. Translators: this is the label for the "open recent file" sub-menu. -#: ../src/fr-window.c:5614 +#: ../src/fr-window.c:5698 msgid "Open _Recent" msgstr "Atverti _vėliausius" -#: ../src/fr-window.c:5615 -#: ../src/fr-window.c:5627 +#: ../src/fr-window.c:5699 +#: ../src/fr-window.c:5711 msgid "Open a recently used archive" msgstr "Atverti neseniai naudotą archyvą" #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5699 +#: ../src/fr-window.c:5783 #: ../src/ui/file-selector.ui.h:1 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "_Vieta:" -#: ../src/fr-window.c:6521 +#: ../src/fr-window.c:6632 #, c-format msgid "Replace file \"%s\"?" msgstr "Pakeisti failą „%s“?" -#: ../src/fr-window.c:6524 +#: ../src/fr-window.c:6635 #, c-format msgid "Another file with the same name already exists in \"%s\"." msgstr "Kitas failas tuo pačiu vardu jau yra vietoje „%s“." -#: ../src/fr-window.c:6531 +#: ../src/fr-window.c:6642 msgid "Replace _All" msgstr "P_akeisti visus" -#: ../src/fr-window.c:6532 +#: ../src/fr-window.c:6643 msgid "_Skip" msgstr "P_raleisti" -#: ../src/fr-window.c:7287 -#: ../src/fr-window.c:7643 +#: ../src/fr-window.c:7400 +#: ../src/fr-window.c:7756 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Nepavyko išsaugoti archyvo „%s“" -#: ../src/fr-window.c:7414 -#| msgctxt "File" -#| msgid "Save" +#: ../src/fr-window.c:7527 msgid "Save" msgstr "Įrašyti" -#: ../src/fr-window.c:7737 +#: ../src/fr-window.c:7850 msgid "Last Output" msgstr "Paskutinė išvestis" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7959 +#: ../src/fr-window.c:8072 msgid "New name is void, please type a name." msgstr "Naujas vardas tuščias, įveskite vardą." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7964 +#: ../src/fr-window.c:8077 msgid "New name is the same as old one, please type other name." msgstr "Naujas vardas yra toks pat kaip ir senas, įveskite kitą vardą." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7969 +#: ../src/fr-window.c:8082 #, c-format msgid "Name \"%s\" is not valid because it contains at least one of the following characters: %s, please type other name." msgstr "Vardas „%s“ netinkamas, nes jame yra bent vienas iš šių simbolių: %s, įveskite kitą vardą." -#: ../src/fr-window.c:8005 +#: ../src/fr-window.c:8118 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -917,12 +901,12 @@ "\n" "%s" -#: ../src/fr-window.c:8005 -#: ../src/fr-window.c:8007 +#: ../src/fr-window.c:8118 +#: ../src/fr-window.c:8120 msgid "Please use a different name." msgstr "Naudokite kitą pavadinimą." -#: ../src/fr-window.c:8007 +#: ../src/fr-window.c:8120 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -933,63 +917,61 @@ "\n" "%s" -#: ../src/fr-window.c:8077 +#: ../src/fr-window.c:8190 msgid "Rename" msgstr "Pervadinti" -#: ../src/fr-window.c:8078 +#: ../src/fr-window.c:8191 msgid "_New folder name:" msgstr "_Naujas aplanko pavadinimas:" -#: ../src/fr-window.c:8078 +#: ../src/fr-window.c:8191 msgid "_New file name:" msgstr "N_aujas failo pavadinimas:" -#: ../src/fr-window.c:8082 +#: ../src/fr-window.c:8195 msgid "_Rename" msgstr "Pe_rvardinti" -#: ../src/fr-window.c:8099 -#: ../src/fr-window.c:8118 +#: ../src/fr-window.c:8212 +#: ../src/fr-window.c:8231 msgid "Could not rename the folder" msgstr "Nepavyko pervadinti aplanko" -#: ../src/fr-window.c:8099 -#: ../src/fr-window.c:8118 +#: ../src/fr-window.c:8212 +#: ../src/fr-window.c:8231 msgid "Could not rename the file" msgstr "Nepavyko pervadinti failo" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8542 +#: ../src/fr-window.c:8664 #, c-format -#| msgid "Copying the files to add to \"%s\"" msgid "Moving the files from \"%s\" to \"%s\"" msgstr "Failai perkeliami iš „%s“ į „%s“" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8545 +#: ../src/fr-window.c:8667 #, c-format -#| msgid "Copying the files to add to \"%s\"" msgid "Copying the files from \"%s\" to \"%s\"" msgstr "Failai kopijuojami iš „%s“ į „%s“" -#: ../src/fr-window.c:8596 +#: ../src/fr-window.c:8718 msgid "Paste Selection" msgstr "Įdėti pažymėtus elementus" -#: ../src/fr-window.c:8597 +#: ../src/fr-window.c:8719 msgid "_Destination folder:" msgstr "_Paskirties aplankas:" -#: ../src/fr-window.c:9195 +#: ../src/fr-window.c:9329 msgid "Add files to an archive" msgstr "Įdėti failus į archyvą" -#: ../src/fr-window.c:9239 -#: ../src/main.c:448 -#: ../src/main.c:484 -#: ../src/main.c:510 -#: ../src/main.c:802 +#: ../src/fr-window.c:9374 +#: ../src/main.c:453 +#: ../src/main.c:489 +#: ../src/main.c:515 +#: ../src/main.c:817 msgid "Extract archive" msgstr "Išskleisti archyvą" @@ -1004,66 +986,65 @@ msgid "Could not display help" msgstr "Nepavyko parodyti žinyno" -#: ../src/main.c:68 +#: ../src/main.c:66 msgid "Add files to the specified archive and quit the program" msgstr "Įdėti failus į nurodytą archyvą ir uždaryti programą" -#: ../src/main.c:69 +#: ../src/main.c:67 msgid "ARCHIVE" msgstr "ARCHYVAS" -#: ../src/main.c:72 +#: ../src/main.c:70 msgid "Add files asking the name of the archive and quit the program" msgstr "Pridėti failus į archyvą paklausus archyvo vardo ir uždaryti programą" -#: ../src/main.c:76 +#: ../src/main.c:74 msgid "Extract archives to the specified folder and quit the program" msgstr "Išskleisti archyvus į nurodytą aplanką ir uždaryti programą" -#: ../src/main.c:77 -#: ../src/main.c:89 +#: ../src/main.c:75 +#: ../src/main.c:87 msgid "FOLDER" msgstr "APLANKAS" -#: ../src/main.c:80 +#: ../src/main.c:78 msgid "Extract archives asking the destination folder and quit the program" msgstr "Išskleisti archyvus paklausus paskirties aplanko ir uždaryti programą" -#: ../src/main.c:84 +#: ../src/main.c:82 msgid "Extract the contents of the archives in the archive folder and quit the program" msgstr "Išskleisti archyvus į archyvų aplanką ir užverti programą" -#: ../src/main.c:88 +#: ../src/main.c:86 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "Numatytasis aplankas, naudojamas „--add“ ir „--extract“ komandų" -#: ../src/main.c:92 +#: ../src/main.c:90 msgid "Create destination folder without asking confirmation" msgstr "Sukurti paskirties aplanką neklausiant patvirtinimo" -#: ../src/main.c:96 +#: ../src/main.c:94 msgid "Use the notification system to notify the operation completion" msgstr "Naudoti pranešimų sistemą pranešti apie veiksmo užbaigimą" -#: ../src/main.c:99 +#: ../src/main.c:97 msgid "Start as a service" msgstr "Paleisti kaip tarnybą" -#: ../src/main.c:102 +#: ../src/main.c:100 msgid "Show version" msgstr "Rodyti versiją" #. manually set name and icon -#: ../src/main.c:629 +#: ../src/main.c:644 msgid "File Roller" msgstr "File Roller" -#: ../src/main.c:660 +#: ../src/main.c:675 msgid "- Create and modify an archive" msgstr "- Kurti ir modifikuoti archyvą" #: ../src/ui/add-dialog-options.ui.h:1 -#| msgid "_Add" msgid "Add" msgstr "Įdėti" @@ -1098,7 +1079,6 @@ msgstr "_Sekti simbolinėmis nuorodomis" #: ../src/ui/app-menu.ui.h:1 -#| msgid "_Archive" msgid "_New Archive" msgstr "_Naujas archyvas" @@ -1153,7 +1133,6 @@ msgstr "Išlai_kyti katalogų struktūrą" #: ../src/ui/extract-dialog-options.ui.h:8 -#| msgid "Do not overwrite newer files" msgid "Do not _overwrite newer files" msgstr "Neper_rašyti naujesnių failų" @@ -1167,7 +1146,6 @@ msgstr "Vietos" #: ../src/ui/file-selector.ui.h:7 -#| msgid "Dese_lect All" msgid "_Select All" msgstr "Žymėti _visus" @@ -1177,7 +1155,6 @@ msgstr "Nežymėti _jokių" #: ../src/ui/file-selector.ui.h:9 -#| msgid "_Show the Files" msgid "Show Hidden Files" msgstr "_Rodyti paslėptus failus" @@ -1453,8 +1430,6 @@ #. after the colon there is a file type. #: ../src/ui/properties.ui.h:10 -#| msgctxt "File" -#| msgid "Type" msgid "Type:" msgstr "Tipas:" diff -Nru file-roller-3.6.0/po/or.po file-roller-3.6.3/po/or.po --- file-roller-3.6.0/po/or.po 2011-08-04 07:46:36.000000000 +0000 +++ file-roller-3.6.3/po/or.po 2012-11-24 08:06:03.000000000 +0000 @@ -4,429 +4,375 @@ # # Subhransu Behera , 2006. # Manoj Kumar Giri , 2008. -# Manoj Kumar Giri , 2009. +# Manoj Kumar Giri , 2009, 2012. msgid "" msgstr "" "Project-Id-Version: or\n" -"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-roller&component=general\n" -"POT-Creation-Date: 2009-07-13 20:19+0000\n" -"PO-Revision-Date: 2009-08-26 16:09+0530\n" +"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-" +"roller&keywords=I18N+L10N&component=general\n" +"POT-Creation-Date: 2012-08-11 20:48+0000\n" +"PO-Revision-Date: 2012-11-19 16:34+0530\n" "Last-Translator: Manoj Kumar Giri \n" "Language-Team: Oriya \n" +"Language: or\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=2; plural=(n!=1);\n\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" "\n" "\n" -"X-Generator: KBabel 1.11.4\n" +"\n" +"X-Generator: Lokalize 1.5\n" #: ../copy-n-paste/eggdesktopfile.c:165 #, c-format msgid "File is not a valid .desktop file" msgstr "ଫାଇଲଟି ଗୋଟିଏ ବୈଧ .desktop ଫାଇଲ ନୁହଁ" -#: ../copy-n-paste/eggdesktopfile.c:188 +#: ../copy-n-paste/eggdesktopfile.c:190 #, c-format msgid "Unrecognized desktop file Version '%s'" msgstr "ଅଚିହ୍ନା ଡେସ୍କଟପ ଫାଇଲ ସଂସ୍କରଣ '%s'" -#: ../copy-n-paste/eggdesktopfile.c:958 +#: ../copy-n-paste/eggdesktopfile.c:970 #, c-format msgid "Starting %s" msgstr "%s କୁ ଆରମ୍ଭ କରୁଅଛି" -#: ../copy-n-paste/eggdesktopfile.c:1100 +#: ../copy-n-paste/eggdesktopfile.c:1112 #, c-format msgid "Application does not accept documents on command line" msgstr "ପ୍ରୟୋଗଟି ପାଠ୍ୟ ନିର୍ଦ୍ଦେଶରେ ଦଲିଲ ଗ୍ରହଣ କରେ ନାହିଁ" -#: ../copy-n-paste/eggdesktopfile.c:1168 +#: ../copy-n-paste/eggdesktopfile.c:1180 #, c-format msgid "Unrecognized launch option: %d" msgstr "ଅଚିହ୍ନା ଆରମ୍ଭ ବିକଳ୍ପ: %d" -#: ../copy-n-paste/eggdesktopfile.c:1373 +#: ../copy-n-paste/eggdesktopfile.c:1385 #, c-format -msgid "Can't pass document URIs to a 'Type=Link' desktop entry" -msgstr "ଦଲିଲ URIs କୁ 'Type=Link' ଡେସ୍କଟପ ଭରଣରେ ପାସ କରିପାରେ ନାହିଁ।" +#| msgid "Can't pass document URIs to a 'Type=Link' desktop entry" +msgid "Can't pass documents to this desktop element" +msgstr "ଦଲିଲଗୁଡ଼ିକୁ ଡେସ୍କଟପ ଉପାଦାନକୁ ପଠାଇ ପାରିବେ ନାହିଁ" -#: ../copy-n-paste/eggdesktopfile.c:1392 +#: ../copy-n-paste/eggdesktopfile.c:1406 #, c-format msgid "Not a launchable item" msgstr "ଗୋଟିଏ ଆରମ୍ଭଯୋଗ୍ୟ ବସ୍ତୁ ନୁହଁ" -#: ../copy-n-paste/eggsmclient.c:225 +#: ../copy-n-paste/eggsmclient.c:226 msgid "Disable connection to session manager" msgstr "ଅଧିବେଶନ ପରିଚାଳକଙ୍କ ସହିତ ସଂଯୋଗକୁ ନିଷ୍କ୍ରିୟ କରନ୍ତୁ" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "Specify file containing saved configuration" msgstr "ସଂରକ୍ଷିତ ବିନ୍ୟାସକୁ ଧାରଣ କରିଥିବା ଫାଇଲ ଉଲ୍ଲେଖ କରନ୍ତୁ" -#: ../copy-n-paste/eggsmclient.c:228 +#: ../copy-n-paste/eggsmclient.c:229 msgid "FILE" msgstr "FILE" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "Specify session management ID" msgstr "ଅଧିବେଶନ ପରିଚାଳକ ID ଉଲ୍ଲେଖ କରନ୍ତୁ" -#: ../copy-n-paste/eggsmclient.c:231 +#: ../copy-n-paste/eggsmclient.c:232 msgid "ID" msgstr "ID" -#: ../copy-n-paste/eggsmclient.c:252 +#: ../copy-n-paste/eggsmclient.c:253 msgid "Session management options:" msgstr "ଅଧିବେଶନ ପରିଚାଳନା ବିକଳ୍ପଗୁଡ଼ିକ:" -#: ../copy-n-paste/eggsmclient.c:253 +#: ../copy-n-paste/eggsmclient.c:254 msgid "Show session management options" msgstr "ଅଧିବେଶନ ପରିଚାଳନା ବିକଳ୍ପଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" -#: ../data/ui/add-options.ui.h:1 -msgid "Load Options" -msgstr "ବିକଲ୍ପ ଧାରଣ କରନ୍ତୁ" - -#: ../data/ui/batch-add-files.ui.h:1 ../src/fr-stock.c:42 -msgid "C_reate" -msgstr "ସ୍ରୁଷ୍ଟି କରନ୍ତୁ (_r)" - -#: ../data/ui/batch-add-files.ui.h:2 -#| msgid "Compression ratio:" -msgid "Compress" -msgstr "ସଙ୍କୋଚନ କରନ୍ତୁ" - -#: ../data/ui/batch-add-files.ui.h:3 ../src/fr-window.c:4638 -msgid "Location" -msgstr "ଅବସ୍ଥାନ" - -#. MB means megabytes -#: ../data/ui/batch-add-files.ui.h:5 ../data/ui/new.ui.h:3 -msgid "MB" -msgstr "MB" - -#: ../data/ui/batch-add-files.ui.h:6 ../data/ui/new.ui.h:4 -msgid "Split in _volumes of" -msgstr "ବିସୃତ ଭଲ୍ୟୁମ (_v)" - -#: ../data/ui/batch-add-files.ui.h:7 ../data/ui/new.ui.h:5 -#: ../data/ui/password.ui.h:3 -msgid "_Encrypt the file list too" -msgstr "ଫାଇଲ ତାଲିକାକୁ ମଧ୍ଯ ସଂଗୁପ୍ତ କରନ୍ତୁ (_E)" - -#: ../data/ui/batch-add-files.ui.h:8 -#| msgid "_Files:" -msgid "_Filename:" -msgstr "ଫାଇଲ ନାମ (_F):" - -#: ../data/ui/batch-add-files.ui.h:9 ../src/fr-window.c:5769 -msgid "_Location:" -msgstr "ଅବସ୍ଥାନ (_L):" - -#: ../data/ui/batch-add-files.ui.h:10 ../data/ui/new.ui.h:6 -msgid "_Other Options" -msgstr "ଅନ୍ୟାନ୍ୟ ବିକଳ୍ପଗୁଡ଼ିକ (_O)" +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1955 +#: ../src/fr-window.c:5331 +msgid "Archive Manager" +msgstr "ଅଭିଲେଖ ପରିଚାଳକ" -#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/batch-password.ui.h:2 -#: ../data/ui/new.ui.h:7 ../data/ui/password.ui.h:4 -msgid "_Password:" -msgstr "ପ୍ରବେଶ ସଂଙ୍କେତ (_P):" +#: ../data/file-roller.desktop.in.in.h:2 +msgid "Create and modify an archive" +msgstr "ଗୋଟିଏ ଅଭିଲେଖକୁ ସ୍ରୁଷ୍ଟି ଏବଂ ରୂପାନ୍ତରିତ କରନ୍ତୁ" -#: ../data/ui/batch-password.ui.h:1 -msgid "Password required" -msgstr "ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:1 +msgid "How to sort files" +msgstr "ଫାଇଲଗୁଡ଼ିକୁ କିପରି ସଜାଡ଼ିବେ" -#: ../data/ui/delete.ui.h:1 -msgid "Delete" -msgstr "ଅପସାରଣ କରନ୍ତୁ" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:2 +msgid "" +"What criteria must be used to arrange files. Possible values: name, size, " +"type, time, path." +msgstr "" +"ଫାଇଲଗୁଡ଼ିକୁ ସଜାଡ଼ିବା ପାଇଁ କେଉଁ ଉପାୟକୁ ନିଶ୍ଚିତ ଭାବରେ ବ୍ୟବହାର କରିବା ଉଚିତ। " +"ସମ୍ଭାବ୍ୟ ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି: ନାମ, ଆକାର, " +"ପ୍ରକାର, ସମୟ, ପଥ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:3 +msgid "Sort type" +msgstr "ସଜାଡ଼ିବା ପ୍ରକାର" -#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:362 -msgid "_All files" -msgstr "ସମସ୍ତ ଫାଇଲ (_A)" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:4 +msgid "" +"Whether to sort in ascending or descending direction. Possible values: " +"ascending, descending." +msgstr "" +"ଛୋଟରୁ ବଡ଼ ଅଥବା ବଡ଼ରୁ ଛୋଟ କ୍ରମ ମଧ୍ଯରୁ କେଉଁ କ୍ରମରେ ସଜାଡ଼ିବା ଉଚିତ। ସମ୍ଭାବ୍ୟ " +"ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି: " +"ଛୋଟରୁ ବଡ଼, ବଡ଼ରୁ ଛୋଟ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:5 +msgid "List Mode" +msgstr "ତାଲିକା ଧାରା" -#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:348 -msgid "_Files:" -msgstr "ଫାଇଲ (_F):" +#: ../data/org.gnome.FileRoller.gschema.xml.in.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." +msgstr "" +"ଆଲେଖିର ତାଲିକାରେ ଥିବା ସମସ୍ତ ଫାଇଲଗୁଡ଼ିକୁ ଦେଖିବା ପାଇଁ 'ସମସ୍ତ ଫାଇଲଗୁଡିକ' ବ୍ଯବହାର " +"କରନ୍ତୁ, ଆଲେଖିକୁ ଫୋଲଡର " +"ଭାବରେ ଦେଖିବା ପାଇଁ 'ଫୋଲଡର-ଭାବରେ' ବ୍ୟବହାର କରନ୍ତୁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:7 +msgid "Display type" +msgstr "ପ୍ରଦର୍ଶନୀ ପ୍ରକାର" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:8 +msgid "Display the type column in the main window." +msgstr "ମୂଖ୍ୟ ୱିଣ୍ଡୋରେ ପ୍ରକାରକୁ ଦର୍ଶାନ୍ତୁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:9 +msgid "Display size" +msgstr "ପ୍ରଦର୍ଶନୀ ଆକାର" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:10 +msgid "Display the size column in the main window." +msgstr "ମୂଖ୍ୟ ୱିଣ୍ଡୋରେ ଆକାର ସ୍ତମ୍ଭକୁ ଦର୍ଶାନ୍ତୁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:11 +msgid "Display time" +msgstr "ପ୍ରଦର୍ଶନୀ ସମୟ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:12 +msgid "Display the time column in the main window." +msgstr "ମୂଖ୍ୟ ୱିଣ୍ଡୋରେ ସମୟ ସ୍ତମ୍ଭକୁ ଦର୍ଶାନ୍ତୁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:13 +msgid "Display path" +msgstr "ପଥ ଦର୍ଶାନ୍ତୁ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:14 +msgid "Display the path column in the main window." +msgstr "ମୂଖ୍ୟ ୱିଣ୍ଡୋରେ ପଥ ସ୍ତମ୍ଭକୁ ଦର୍ଶାନ୍ତୁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:15 +msgid "Name column width" +msgstr "ସ୍ତମ୍ଭ ଓସାରକୁ ନାମକରଣ କରନ୍ତୁ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:16 +msgid "The default width of the name column in the file list." +msgstr "ଫାଇଲ ତାଲିକାରେ ନାମ ସ୍ତମ୍ଭର ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଓସାର।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:17 +msgid "Max history length" +msgstr "ସର୍ବାଧିକ ପୁରୁଣାତଥ୍ୟ ଲମ୍ବ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:18 +msgid "Max number of items in the 'Open Recents' submenu." +msgstr "'ସାମ୍ପ୍ରତିକଗୁଡ଼ିକୁ ଖୋଲନ୍ତୁ' ଉପତାଲିକାରେ ସର୍ବାଧିକ ସଂଖ୍ୟକ ବସ୍ତୁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19 +#| msgid "View the main toolbar" +msgid "View toolbar" +msgstr "ସାଧନ ପଟିକୁ ଦେଖନ୍ତୁ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20 +msgid "Whether to display the toolbar." +msgstr "ସାଧନପଟିକୁ ପ୍ରଦର୍ଶିତ କରାଯିବା ଉଚିତ କି ନୁହଁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 +#| msgid "View the statusbar" +msgid "View statusbar" +msgstr "ଅବସ୍ଥିତି ପଟିକୁ ଦେଖନ୍ତୁ" -#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:369 -msgid "_Selected files" -msgstr "ଚୟିତ ଫାଇଲ (_S)" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22 +msgid "Whether to display the statusbar." +msgstr "ସ୍ଥିତପଟିକୁ ପ୍ରଦର୍ଶିତ କରାଯିବା ଉଚିତ କି ନୁହେଁ।" -#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:359 -msgid "example: *.txt; *.doc" -msgstr "ଉଦାହରଣ: *.txt; *.doc" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 ../src/ui.h:212 +msgid "View the folders pane" +msgstr "ଫୋଲଡର ପରଦାଖଣ୍ଡକୁ ଦେଖନ୍ତୁ" -#: ../data/ui/new.ui.h:1 -msgid "Archive _type:" -msgstr "ଅଭିଲେଖ ପ୍ରକାର (_t):" - -#: ../data/ui/open-with.ui.h:1 -msgid "A_vailable application:" -msgstr "ଉପଲବ୍ଧ ପ୍ରୟୋଗ (_v):" - -#: ../data/ui/open-with.ui.h:2 -msgid "Open Files" -msgstr "ଫାଇଲ ମାନଙ୍କୁ ଖୋଲନ୍ତୁ" - -#: ../data/ui/open-with.ui.h:3 -msgid "R_ecent applications:" -msgstr "ସମ୍ପ୍ରତିକ ପ୍ରୟୋଗ (_e):" - -#: ../data/ui/open-with.ui.h:4 -msgid "_Application:" -msgstr "ପ୍ରୟୋଗ (_A):" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24 +#| msgid "Close the folders pane" +msgid "Whether to display the folders pane." +msgstr "ଫୋଲଡର ଫଳକକୁ ପ୍ରଦର୍ଶିତ କରାଯିବା ଉଚିତ କି ନୁହେଁ।" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25 +#| msgid "_Edit" +msgid "Editors" +msgstr "ସମ୍ପାଦକ ମାନେ" -#: ../data/ui/password.ui.h:1 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26 msgid "" -"Note: the password will be used to encrypt files you add to the " -"current archive, and to decrypt files you extract from the current archive. " -"When the archive is closed the password will be deleted." +"List of applications entered in the 'Open File' dialog and not associated " +"with the file type." msgstr "" -"ଟିପ୍ପଣୀ: ସାମ୍ପ୍ରତିକ ଅଭିଲେଖରେ ଆପଣ ଯୋଗ କରୁଥିବା ଫାଇଲ ମାନଙ୍କୁ ଏନକ୍ରିପ୍ଟ କରିବା ପାଇଁ, " -"ଏବଂ ସାମ୍ପ୍ରତିକ ଅଭିଲେଖରୁ ଆପଣ କାଢୁଥିବା ଫାଇଲ ମାନଙ୍କୁ ଡିକ୍ରିପ୍ଟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଙ୍କେତକୁ ବ୍ଯବହାର " -"କରାଯିବ। ଅଭିଲେଖଟି ବନ୍ଦ ହେଲେ ପ୍ରବେଶ ସଙ୍କେତଟି ମଧ୍ଯ ଅପସାରିତ ହୋଇଯିବ।" - -#: ../data/ui/password.ui.h:2 -msgid "Password" -msgstr "ପ୍ରବେଶ ସଙ୍କେତ" +"'ଫାଇଲ ଖୋଲନ୍ତୁ' ସଂଳାପରେ ଭରଣ ହୋଇଥିବା ଏବଂ ଫାଇଲ ପ୍ରକାର ସହିତ " +"ସମ୍ପୃକ୍ତ ନଥିବା ପ୍ରୟୋଗ ତାଲିକା।" -#: ../data/ui/update.ui.h:1 -msgid "S_elect the files you want to update:" -msgstr "ଆପଣ ଅଦ୍ୟତନ କରିବାକୁ ଚାହୁଁଥିବା ଫାଇଲଗୁଡିକୁ ଚୟନକରନ୍ତୁ (_e)" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27 +#| msgid "Compression ratio:" +msgid "Compression level" +msgstr "ସଂକୋଚନ ସ୍ତର" -#. secondary text -#: ../data/ui/update.ui.h:2 ../src/dlg-update.c:182 -#, c-format +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28 msgid "" -"The file has been modified with an external application. If you don't update " -"the version in the archive, all of your changes will be lost." -msgid_plural "" -"There are %d files that have been modified with an external application. If " -"you don't update the files in the archive, all of your changes will be lost." -msgstr[0] "" -"ଏହି ଫାଇଲଟି ଗୋଟିଏ ବାହ୍ୟ ପ୍ରୟୋଗ ଦ୍ୱାରା ପରିବର୍ତ୍ତିତ ହୋଇଅଛି। ଯଦି ଆପଣ ଅଭିଲେଖନରେ ଥିବା ସଂସ୍କରଣକୁ " -"ଅଦ୍ୟତନ ନକରନ୍ତି, ଆପଣଙ୍କର ସମସ୍ତ ପରିବର୍ତ୍ତନ ନଷ୍ଟ ହୋଇଯିବ।" -msgstr[1] "" -"ଏଠାରେ %d ଟି ଫାଇଲ ଅଛି ଯାହାକି ଗୋଟିଏ ବାହ୍ୟ ପ୍ରୟୋଗ ଦ୍ୱାରା ପରିବର୍ତ୍ତିତ ହୋଇଅଛି। ଯଦି ଆପଣ " -"ଅଭିଲେଖନରେ ଥିବା ସଂସ୍କରଣକୁ ଅଦ୍ୟତନ ନକରନ୍ତି, ଆପଣଙ୍କର ସମସ୍ତ ପରିବର୍ତ୍ତନ ନଷ୍ଟ ହୋଇଯିବ।" +"Compression level used when adding files to an archive. Possible values: " +"very-fast, fast, normal, maximum." +msgstr "" +"ଫାଇଲଗୁଡ଼ିକୁ ଆଲେଖିରେ ଯୋଗ କରିବା ସମୟରେ ସଙ୍କୋଚନ ସ୍ତର। ସମ୍ଭାବ୍ୟ ମୂଲ୍ୟଗୁଡ଼ିକ ହେଉଛି: " +"ଅତି-ତୀବ୍ର, ତୀବ୍ର, ସାଧାରଣ, ସର୍ବାଧିକ।" -#: ../data/ui/update.ui.h:3 -msgid "_Update" -msgstr "ଅଦ୍ୟତନ କରନ୍ତୁ (_U)" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29 +msgid "Encrypt the archive header" +msgstr "ଅଭିଲେଖନ ଶୀର୍ଷକକୁ ସଂଗୁପ୍ତ କରନ୍ତୁ" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1970 -#: ../src/fr-window.c:5348 -msgid "Archive Manager" -msgstr "ଅଭିଲେଖ ପରିଚାଳକ" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30 +msgid "" +"Whether to encrypt the archive header. If the header is encrypted the " +"password will be required to list the archive content as well." +msgstr "" +"ଆଲେଖିକ ଶୀର୍ଷକକୁ ସଂଗୁପ୍ତ କରିବା ଉଚିତ କି ନୁହଁ। ଯଦି ଶୀର୍ଷକକୁ ସଂଗୁପ୍ତ କରାଯାଏ ତେବେ " +"ଆଲେଖିକ ବିଷୟବସ୍ତୁକୁ ତାଲିକାଭୁକ୍ତ କରିବା ପାଇଁ ମଧ୍ଯ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ ହେବ।" -#: ../data/file-roller.desktop.in.in.h:2 -msgid "Create and modify an archive" -msgstr "ଗୋଟିଏ ଅଭିଲେଖକୁ ସ୍ରୁଷ୍ଟି ଏବଂ ରୂପାନ୍ତରିତ କରନ୍ତୁ" +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31 +#| msgid "Do not e_xtract older files" +msgid "Do not overwrite newer files" +msgstr "ନୂତନ ଫାଇଲଗୁଡ଼ିକୁ ନବଲିଖନ କରନ୍ତୁ ନାହିଁ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32 +#| msgid "Update the files in the archive \"%s\"?" +msgid "Recreate the folders stored in the archive" +msgstr "ଆଲେଖୀ ମଧ୍ଯରେ ସଂରକ୍ଷିତ ଫୋଲଡରଗୁଡ଼ିକୁ ପୁନଃନିର୍ମାଣ କରନ୍ତୁ" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:33 +msgid "Default volume size" +msgstr "ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଭଲ୍ୟୁମ ଆକାର" + +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:34 +msgid "The default size for volumes." +msgstr "ଭଲ୍ୟୁମଗୁଡ଼ିକ ପାଇଁ ପୂର୍ବନିର୍ଦ୍ଧାରିତ ଆକାର।" -#: ../nautilus/nautilus-fileroller.c:313 +#: ../nautilus/nautilus-fileroller.c:327 msgid "Extract Here" msgstr "ଏଠାରେ କାଢନ୍ତୁ" -#: ../nautilus/nautilus-fileroller.c:314 -msgid "Extract the selected archive in the current position" +#. Translators: the current position is the current folder +#: ../nautilus/nautilus-fileroller.c:329 +#| msgid "Extract the selected archive in the current position" +msgid "Extract the selected archive to the current position" msgstr "ଚୟିତ ଅଭିଲେଖକୁ ବର୍ତ୍ତମାନ ଅବସ୍ଥିତିରେ କାଢନ୍ତୁ" -#: ../nautilus/nautilus-fileroller.c:331 +#: ../nautilus/nautilus-fileroller.c:346 msgid "Extract To..." msgstr "ଏଠାରେ କାଢନ୍ତୁ ..." -#: ../nautilus/nautilus-fileroller.c:332 +#: ../nautilus/nautilus-fileroller.c:347 msgid "Extract the selected archive" msgstr "ଚୟିତ ଅଭିଲେଖକୁ କାଢନ୍ତୁ" -#: ../nautilus/nautilus-fileroller.c:351 +#: ../nautilus/nautilus-fileroller.c:366 msgid "Compress..." msgstr "ସଙ୍କୋଚନ କରନ୍ତୁ..." -#: ../nautilus/nautilus-fileroller.c:352 -#| msgid "Create an archive with the selected objects" +#: ../nautilus/nautilus-fileroller.c:367 msgid "Create a compressed archive with the selected objects" msgstr "ଚୟିତ ବସ୍ତୁ ମାନଙ୍କ ସହିତ ଗୋଟିଏ ସଙ୍କୋଚିତ ଅଭିଲେଖକୁ ସ୍ରୁଷ୍ଟି କରନ୍ତୁ" -#: ../src/actions.c:158 ../src/actions.c:197 ../src/actions.c:233 -#: ../src/dlg-batch-add.c:169 ../src/dlg-batch-add.c:185 -#: ../src/dlg-batch-add.c:214 ../src/dlg-batch-add.c:259 -#: ../src/dlg-batch-add.c:305 ../src/fr-window.c:2916 -msgid "Could not create the archive" -msgstr "ଅଭିଲେଖକୁ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ" - -#: ../src/actions.c:160 ../src/dlg-batch-add.c:171 ../src/dlg-batch-add.c:307 -msgid "You have to specify an archive name." -msgstr "ଆପଣ ଗୋଟିଏ ଅଭିଲେଖର ନାମ ଉଲ୍ଲେଖ କରିବା ଉଚିତ।" - -#: ../src/actions.c:199 -msgid "You don't have permission to create an archive in this folder" -msgstr "ଏହି ଫୋଲଡରରେ ଗୋଟିଏ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଆପଣଙ୍କ ନିକଟରେ ଅନୁମତି ନାହିଁ" - -#: ../src/actions.c:235 ../src/fr-archive.c:880 ../src/fr-window.c:5981 -#: ../src/fr-window.c:6157 -msgid "Archive type not supported." -msgstr "ଅଭିଲେଖ ପ୍ରକାର ସମର୍ଥିତ ନୁହେଁ।" - -#: ../src/actions.c:249 -msgid "Could not delete the old archive." -msgstr "ପୁରାତନ ଅଭିଲେଖକୁ ଅପସାରଣ କରିପାରିଲା ନାହିଁ।" - -#: ../src/actions.c:383 ../src/fr-window.c:5827 +#: ../src/actions.c:112 ../src/fr-window.c:5626 ../src/fr-window.c:6165 msgid "Open" msgstr "ଖୋଲନ୍ତୁ" -#: ../src/actions.c:394 ../src/dlg-new.c:248 ../src/fr-window.c:5179 +#: ../src/actions.c:125 ../src/fr-window.c:5169 msgid "All archives" msgstr "ସମସ୍ତ ଅଭିଲେଖ" -#: ../src/actions.c:401 ../src/dlg-new.c:255 +#: ../src/actions.c:132 msgid "All files" msgstr "ସମସ୍ତ ଫାଇଲ" -#: ../src/actions.c:780 ../src/fr-window.c:6934 -msgid "Last Output" -msgstr "ଅନ୍ତିମ ନିର୍ଗମ" - -#: ../src/actions.c:844 -msgid "" -"File Roller is free software; you can redistribute it and/or modify it under " -"the terms of the GNU General Public License as published by the Free " -"Software Foundation; either version 2 of the License, or (at your option) " -"any later version." -msgstr "" -"ଫାଇଲ ରୋଲର ଗୋଟିଏ ମୁକ୍ତ ସଫ୍ଟୱେର; ଆପଣ ଏହାକୁ ମୁକ୍ତ ସଫ୍ଟୱେର ପ୍ରତିଷ୍ଠାନ ; ପ୍ରମାଣପତ୍ରର ସଂସ୍କରଣ ୨, " -"ଅଥବା (ଆପଣଙ୍କ ପସନ୍ଦ ଅନୁଯାୟୀ) କୌଣସି ପରବର୍ତ୍ତୀ ସଂସ୍କରଣ ଦ୍ୱାରା ପ୍ରକାଶିତ GNU ସାଧାରଣ " -"ସାର୍ବଜନୀନ ପ୍ରମାଣପତ୍ରର ନିୟମାନୁସାରେ ପୁନର୍ବଣ୍ଟନ କରିପାରିବେ ଏବଂ/କିମ୍ୱା ପରିବର୍ତ୍ତନ କରିପାରିବେ।" - -#: ../src/actions.c:848 -msgid "" -"File Roller is distributed in the hope that it will be useful, but WITHOUT " -"ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or " -"FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " -"more details." -msgstr "" -"ଫାଇଲ ରୋଲରଟି ବ୍ୟବହାର ଉପଯୋଗୀ ହେବା ଆଶାରେ ବଣ୍ଟନ କରାଯାଇଥିଲା, କିନ୍ତୁ କୌଣସି ନିର୍ଭରୋକ୍ତି ବିନା; " -"ବିକ୍ରୟଯୋଗ୍ଯତା ନିର୍ଭରୋକ୍ତି କିମ୍ଭା କୌଣସି ନିର୍ଦ୍ଦିଷ୍ଠ କାର୍ଯ୍ଯ ପାଇଁ ମେଳକ ବିନା ମଧ୍ଯ। ଅଧିକ ବିସ୍ତ୍ରୁତ ବିବରଣୀ " -"ପାଇଁ GNU ସାଧାରଣ ସାର୍ବଜନୀନ ଅନୁମତି ପତ୍ର ଦେଖନ୍ତୁ।" - -#: ../src/actions.c:852 -msgid "" -"You should have received a copy of the GNU General Public License along with " -"File Roller; if not, write to the Free Software Foundation, Inc., 51 " -"Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" -msgstr "" -"ଆପଣ ଫାଇଲ ରୋଲର ସହିତ GNU ସାଧାରଣ ସାର୍ବଜନୀନ ପ୍ରମାଣପତ୍ରର ଗୋଟିଏ ନକଲ ପାଇଥିବା ଉଚିତ; ଯଦି ନୁହଁ, " -"ତେବେ ମୁକ୍ତ ସଫ୍ଟୱେର ପ୍ରତିଷ୍ଠାନ, Inc., 51 Franklin St, Fifth Floor, Boston, MA " -"02110-1301 USA କୁ ଲେଖନ୍ତୁ।" - -#: ../src/actions.c:862 -msgid "Copyright © 2001-2007 Free Software Foundation, Inc." -msgstr "Copyright © 2001-2007 ମୁକ୍ତ ସଫ୍ଟୱେର ପ୍ରତିଷ୍ଠାନ, Inc." +#: ../src/actions.c:499 +#| msgid "Copyright © 2001-2007 Free Software Foundation, Inc." +msgid "Copyright © 2001–2010 Free Software Foundation, Inc." +msgstr "Copyright © 2001–2010 Free Software Foundation, Inc." -#: ../src/actions.c:863 +#: ../src/actions.c:500 msgid "An archive manager for GNOME." msgstr "ନୋମ ପାଇଁ ଗୋଟିଏ ଅଭିଲେଖ ପରିଚାଳକ।" -#: ../src/actions.c:866 +#: ../src/actions.c:503 msgid "translator-credits" msgstr "ଶୁଭ୍ରାଂଶୁ ବେହେରା " -#: ../src/dlg-add-files.c:94 ../src/dlg-add-folder.c:129 +#: ../src/dlg-add.c:116 msgid "Could not add the files to the archive" msgstr "ଏହି ଫାଇଲ ଗୁଡିକୁ ଅଭିଲେଖରେ ଯୋଗ କରିପାରିଲା ନାହିଁ" -#: ../src/dlg-add-files.c:95 ../src/dlg-add-folder.c:130 +#: ../src/dlg-add.c:117 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "\"%s\" ଫୋଲଡରରୁ ଫାଇଲ ପଢିବା ପାଇଁ ଆପଣଙ୍କ ପାଖରେ ଉପଯୁକ୍ତ ଅନୁମତି ନାହିଁ" -#: ../src/dlg-add-files.c:142 ../src/ui.h:48 +#: ../src/dlg-add.c:182 ../src/ui.h:46 msgid "Add Files" msgstr "ଫାଇଲ ଯୋଗ କରନ୍ତୁ" -#: ../src/dlg-add-files.c:156 ../src/dlg-add-folder.c:231 -msgid "Add only if _newer" -msgstr "କେବଳ ନୂତନ ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ (_n)" - -#: ../src/dlg-add-folder.c:217 -msgid "Add a Folder" -msgstr "ଗୋଟିଏ ଫୋଲଡର ଯୋଗ କରନ୍ତୁ" - -#: ../src/dlg-add-folder.c:232 -msgid "_Include subfolders" -msgstr "ଉପ-ଫୋଲଡର ମାନଙ୍କୁ ଅନ୍ତର୍ଭୂକ୍ତ କରନ୍ତୁ (_I)" - -#: ../src/dlg-add-folder.c:233 -msgid "Exclude folders that are symbolic lin_ks" -msgstr "ପ୍ରତୀକାତ୍ମକ ସମ୍ପର୍କ ବିଶିଷ୍ଟ ଫୋଲଡର ମାନଙ୍କୁ ବାଦ ଦିଅନ୍ତୁ (_k)" - -#: ../src/dlg-add-folder.c:236 ../src/dlg-add-folder.c:242 -#: ../src/dlg-add-folder.c:248 -msgid "example: *.o; *.bak" -msgstr "ଉଦାହରଣ: *.o; *.bak" - -#: ../src/dlg-add-folder.c:237 -msgid "Include _files:" -msgstr "ଫାଇଲ ମାନଙ୍କୁ ଅନ୍ତର୍ଭୂକ୍ତ କରନ୍ତୁ (_I):" - -#: ../src/dlg-add-folder.c:243 -msgid "E_xclude files:" -msgstr "ଫାଇଲ ମାନଙ୍କୁ ବାଦ ଦିଅନ୍ତୁ (_x)" - -#: ../src/dlg-add-folder.c:249 -msgid "_Exclude folders:" -msgstr "ଫୋଲଡର ମାନଙ୍କୁ ବାଦ ଦିଅନ୍ତୁ (_E):" +#: ../src/dlg-add.c:193 +#| msgid "_Load Options" +msgid "_Options" +msgstr "ବିକଳ୍ପଗୁଡ଼ିକ (_O)" -#: ../src/dlg-add-folder.c:253 -msgid "_Load Options" -msgstr "ବିକଲ୍ପକୁ ଧାରଣ କରନ୍ତୁ (_L)" - -#: ../src/dlg-add-folder.c:254 -msgid "Sa_ve Options" -msgstr "ବିକଲ୍ପକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_v)" - -#: ../src/dlg-add-folder.c:255 -msgid "_Reset Options" -msgstr "ବିକଲ୍ପକୁ ପୁନ଼ଃସ୍ଥାପନ କରନ୍ତୁ (_R)" +#. load options +#: ../src/dlg-add.c:202 ../src/ui/add-options.ui.h:1 +msgid "Load Options" +msgstr "ବିକଲ୍ପ ଧାରଣ କରନ୍ତୁ" -#: ../src/dlg-add-folder.c:883 +#. save options +#: ../src/dlg-add.c:209 ../src/dlg-add.c:824 msgid "Save Options" msgstr "ବିକଲ୍ପକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../src/dlg-add-folder.c:884 -msgid "Options Name:" -msgstr "ବିକଲ୍ପ ନାମ:" - -#: ../src/dlg-ask-password.c:123 -#, c-format -msgid "Enter the password for the archive '%s'." -msgstr "'%s' ଅଭିଲେଖ ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଙ୍କେତ ଭରଣ କରନ୍ତୁ।" - -#: ../src/dlg-batch-add.c:186 ../src/fr-window.c:7214 -#, c-format -msgid "" -"The name \"%s\" is not valid because it cannot contain the characters: %s\n" -"\n" -"%s" -msgstr "" -"\"%s\" ନାମ ବୈଧ ନୁହେଁ କାରଣ ଏହା ଏଠାରେ ଉଲ୍ଲେଖିତ ଅକ୍ଷର ମାନଙ୍କୁ ଧାରଣ କରିପାରିବ ନାହିଁ: %s\n" -"\n" -"%s" - -#: ../src/dlg-batch-add.c:189 ../src/fr-window.c:7206 ../src/fr-window.c:7210 -#: ../src/fr-window.c:7214 ../src/fr-window.c:7250 ../src/fr-window.c:7252 -msgid "Please use a different name." -msgstr "ଦୟାକରି ଗୋଟିଏ ଭିନ୍ନ ନାମକୁ ବ୍ଯବହାର କରନ୍ତୁ।" +#. clear options +#: ../src/dlg-add.c:216 +#| msgid "_Reset Options" +msgid "Reset Options" +msgstr "ବିକଳ୍ପଗୁଡ଼ିକୁ ପୁନ଼ଃସ୍ଥାପନ କରନ୍ତୁ" + +#: ../src/dlg-add.c:825 +#| msgid "Options Name:" +msgid "_Options Name:" +msgstr "ବିକଳ୍ପଗୁଡ଼ିକର ନାମ (_O):" + +#. Translators: %s is a filename +#: ../src/dlg-ask-password.c:131 +#, c-format +msgid "Password required for \"%s\"" +msgstr "\"%s\" ପାଇଁ ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ" + +#: ../src/dlg-ask-password.c:139 +#| msgid "Password" +msgid "Wrong password." +msgstr "ଭୁଲ ପ୍ରବେଶସଙ୍କେତ।" -#: ../src/dlg-batch-add.c:216 -msgid "" -"You don't have the right permissions to create an archive in the destination " -"folder." -msgstr "ଲକ୍ଷ୍ଯ ଫୋଲଡରରେ ଗୋଟିଏ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଆପଣଙ୍କ ନିକଟରେ ଉପଯୁକ୍ତ ଅନୁମତି ନାହିଁ।" +#: ../src/dlg-batch-add.c:81 ../src/main.c:412 ../src/main.c:778 +msgid "Compress" +msgstr "ସଙ୍କୋଚନ କରନ୍ତୁ" -#: ../src/dlg-batch-add.c:232 ../src/dlg-extract.c:102 ../src/fr-window.c:6509 +#: ../src/dlg-extract.c:96 ../src/fr-window.c:6690 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -437,368 +383,565 @@ "\n" "ଆପଣ ଏହାକୁ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?" -#: ../src/dlg-batch-add.c:241 ../src/dlg-extract.c:111 ../src/fr-window.c:6518 +#: ../src/dlg-extract.c:105 ../src/fr-window.c:6699 msgid "Create _Folder" msgstr "ଫୋଲଡର ସ୍ରୁଷ୍ଟି କରନ୍ତୁ (_F)" -#: ../src/dlg-batch-add.c:260 ../src/dlg-extract.c:131 ../src/fr-window.c:6538 +#: ../src/dlg-extract.c:124 ../src/dlg-extract.c:142 ../src/dlg-extract.c:169 +#: ../src/fr-window.c:4118 ../src/fr-window.c:6595 ../src/fr-window.c:6600 +#: ../src/fr-window.c:6720 ../src/fr-window.c:6739 ../src/fr-window.c:6744 +msgid "Extraction not performed" +msgstr "ନିର୍ଯ୍ଯାସ ପ୍ରକ୍ରିୟା ସମ୍ପାଦିତ ହୋଇନାହିଁ" + +#: ../src/dlg-extract.c:125 ../src/fr-window.c:6716 #, c-format msgid "Could not create the destination folder: %s." msgstr "ଲକ୍ଷ୍ଯ ଫୋଲଡରକୁ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ: %s।" -#: ../src/dlg-batch-add.c:277 -msgid "Archive not created" -msgstr "ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରାଯାଇ ନାହିଁ" - -#: ../src/dlg-batch-add.c:325 -msgid "The archive is already present. Do you want to overwrite it?" -msgstr "ଏହି ଅଭିଲେଖଟି ପୂର୍ବରୁ ଅବସ୍ଥିତ। ଆପଣ ଏହାକୁ ନବଲିଖନ କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?" - -#: ../src/dlg-batch-add.c:328 -msgid "_Overwrite" -msgstr "ନବଲିଖନ କରନ୍ତୁ (_O)" - -#: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 -#: ../src/fr-window.c:4106 ../src/fr-window.c:6537 ../src/fr-window.c:6554 -msgid "Extraction not performed" -msgstr "ନିର୍ଯ୍ଯାସ ପ୍ରକ୍ରିୟା ସମ୍ପାଦିତ ହୋଇନାହିଁ" - -#: ../src/dlg-extract.c:176 ../src/fr-window.c:4268 ../src/fr-window.c:4348 +#: ../src/dlg-extract.c:170 ../src/fr-window.c:4284 ../src/fr-window.c:4368 #, c-format -msgid "You don't have the right permissions to extract archives in the folder \"%s\"" -msgstr "\"%s\" ଫୋଲଡରରେ ଅଭିଲେଖ ମାନଙ୍କୁ କାଢିବା ପାଇଁ ଆପଣଙ୍କ ନିକଟରେ ଉପଯୁକ୍ତ ଅନୁମତି ନାହିଁ" +msgid "" +"You don't have the right permissions to extract archives in the folder \"%s\"" +msgstr "" +"\"%s\" ଫୋଲଡରରେ ଅଭିଲେଖ ମାନଙ୍କୁ କାଢିବା ପାଇଁ ଆପଣଙ୍କ ନିକଟରେ ଉପଯୁକ୍ତ ଅନୁମତି ନାହିଁ" -#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:123 +#: ../src/dlg-extract.c:283 ../src/ui/extract-dialog-options.ui.h:1 +#: ../src/ui.h:113 msgid "Extract" msgstr "କାଢନ୍ତୁ" -#: ../src/dlg-extract.c:380 -msgid "Actions" -msgstr "କାର୍ଯ୍ଯ" +#: ../src/dlg-package-installer.c:107 ../src/dlg-package-installer.c:220 +msgid "There was an internal error trying to search for applications:" +msgstr "ପ୍ରୟୋଗଗୁଡ଼ିକୁ ସନ୍ଧାନ କରିବା ପାଇଁ ଗୋଟିଏ ଆଭ୍ୟନ୍ତରୀଣ ତ୍ରୁଟି ଚେଷ୍ଟା କରୁଅଛି:" + +#: ../src/dlg-package-installer.c:269 ../src/dlg-package-installer.c:278 +#: ../src/dlg-package-installer.c:306 ../src/fr-archive.c:819 +#: ../src/fr-window.c:3848 ../src/fr-window.c:7295 ../src/fr-window.c:7651 +#: ../src/fr-window.c:9177 +msgid "Archive type not supported." +msgstr "ଅଭିଲେଖ ପ୍ରକାର ସମର୍ଥିତ ନୁହେଁ।" -#: ../src/dlg-extract.c:396 -msgid "Re-crea_te folders" -msgstr "ଫୋଲଡର ମାନଙ୍କୁ ପୁନଃ ସୃଷ୍ଟି କରନ୍ତୁ (_t)" - -#: ../src/dlg-extract.c:400 -msgid "Over_write existing files" -msgstr "ଅବସ୍ଥିତ ଫାଇଲ ମାନଙ୍କୁ ନବଲିଖନ କରନ୍ତୁ (_w)" - -#: ../src/dlg-extract.c:404 -msgid "Do not e_xtract older files" -msgstr "ପୁରୁଣା ଫାଇଲ ମାନଙ୍କୁ କାଢନ୍ତୁ ନାହିଁ (_x)" - -#: ../src/dlg-new.c:274 -msgid "Automatic" -msgstr "ସ୍ବୟଂଚାଳିତ" - -#: ../src/dlg-new.c:341 -msgid "New" -msgstr "ନୂତନ" +#: ../src/dlg-package-installer.c:288 +#, c-format +msgid "" +"There is no command installed for %s files.\n" +"Do you want to search for a command to open this file?" +msgstr "" +"%s ଫାଇଲଗୁଡ଼ିକ ପାଇଁ କୌଣସି ନିର୍ଦ୍ଦେଶ ସ୍ଥାପିତ ହୋଇନାହିଁ।\n" +"ଏହି ଫାଇଲକୁ ଖୋଲିବା ପାଇଁ ଆପଣ କୌଣସି ନିର୍ଦ୍ଦେଶକୁ ଖୋଜୁଛନ୍ତି କି?" -#: ../src/dlg-new.c:354 -msgid "Save" -msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ" +#: ../src/dlg-package-installer.c:293 +#| msgid "Could not rename the file" +msgid "Could not open this file type" +msgstr "ଏହି ଫାଇଲ ପ୍ରକାରକୁ ଖୋଲିପାରିବେ ନାହିଁ" -#: ../src/dlg-prop.c:106 -msgid "Location:" -msgstr "ଅବସ୍ଥାନ:" +#: ../src/dlg-package-installer.c:296 +msgid "_Search Command" +msgstr "ନିର୍ଦ୍ଦେଶ ସନ୍ଧାନ କରନ୍ତୁ (_S)" -#: ../src/dlg-prop.c:118 -msgid "Name:" -msgstr "ନାମ:" +#: ../src/dlg-password.c:91 +#, c-format +#| msgid "Enter the password for the archive '%s'." +msgid "Enter a password for \"%s\"" +msgstr "\"%s\" ପାଇଁ ପ୍ରବେଶ ସଙ୍କେତ ଭରଣ କରନ୍ତୁ" -#: ../src/dlg-prop.c:124 +#: ../src/dlg-prop.c:96 #, c-format msgid "%s Properties" msgstr "%s ଗୁଣଧର୍ମ" -#: ../src/dlg-prop.c:133 -msgid "Modified on:" -msgstr "ଏହି ତାରିଖରେ ରୂପାନ୍ତରିତ ହୋଇଛି:" - -#: ../src/dlg-prop.c:143 -msgid "Archive size:" -msgstr "ଅଭିଲେଖ ଆକାର:" - -#: ../src/dlg-prop.c:154 -msgid "Content size:" -msgstr "ସୂଚୀପତ୍ର ଆକାର:" - -#: ../src/dlg-prop.c:174 -msgid "Compression ratio:" -msgstr "ସଙ୍କୋଚନ ହାର:" - -#: ../src/dlg-prop.c:189 -msgid "Number of files:" -msgstr "ଫାଇଲ ମାନଙ୍କ ସଂଖ୍ଯା:" - -#: ../src/dlg-update.c:159 +#: ../src/dlg-update.c:162 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "\"%s\" ଫାଇଲକୁ \"%s\" ଅଭିଲେଖନରେ ଅଦ୍ୟତନ କରନ୍ତୁ?" -#: ../src/dlg-update.c:173 +#. secondary text +#: ../src/dlg-update.c:173 ../src/dlg-update.c:198 ../src/ui/update.ui.h:2 +#, c-format +#| msgid "" +#| "The file has been modified with an external application. If you don't " +#| "update the version in the archive, all of your changes will be lost." +#| msgid_plural "" +#| "There are %d files that have been modified with an external application. " +#| "If you don't update the files in the archive, all of your changes will be " +#| "lost." +msgid "" +"The file has been modified with an external application. If you don't update " +"the file in the archive, all of your changes will be lost." +msgid_plural "" +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." +msgstr[0] "" +"ଏହି ଫାଇଲଟି ଗୋଟିଏ ବାହ୍ୟ ପ୍ରୟୋଗ ଦ୍ୱାରା ପରିବର୍ତ୍ତିତ ହୋଇଅଛି। ଯଦି ଆପଣ ଅଭିଲେଖନରେ " +"ଥିବା ସଂସ୍କରଣକୁ ଅଦ୍ୟତନ ନକରନ୍ତି, ତେବେ ଆପଣଙ୍କର ସମସ୍ତ ପରିବର୍ତ୍ତନ ନଷ୍ଟ ହୋଇଯିବ।" +msgstr[1] "" +"ଏଠାରେ %d ଟି ଫାଇଲ ଅଛି ଯାହାକି ଗୋଟିଏ ବାହ୍ୟ ପ୍ରୟୋଗ ଦ୍ୱାରା ପରିବର୍ତ୍ତିତ ହୋଇଅଛି। ଯଦି " +"ଆପଣ ଅଭିଲେଖନରେ ଥିବା ସଂସ୍କରଣକୁ ଅଦ୍ୟତନ ନକରନ୍ତି, ତେବେ ଆପଣଙ୍କର ସମସ୍ତ ପରିବର୍ତ୍ତନ " +"ନଷ୍ଟ ହୋଇଯିବ।" + +#: ../src/dlg-update.c:188 #, c-format msgid "Update the files in the archive \"%s\"?" msgstr "ଫାଇଲ ଗୁଡିକୁ \"%s\" ଅଭିଲେଖନରେ ଅଦ୍ୟତନ କରନ୍ତୁ?" -#: ../src/fr-archive.c:1919 +#: ../src/fr-archive.c:1944 msgid "You don't have the right permissions." msgstr "ଆପଣଙ୍କ ନିକଟରେ ଉପଯୁକ୍ତ ଅନୁମତି ନାହିଁ।" -#: ../src/fr-archive.c:1919 +#: ../src/fr-archive.c:1944 msgid "This archive type cannot be modified" msgstr "ଏହି ଅଭିଲେଖନ ପ୍ରକାରକୁ ପରିବର୍ତ୍ତନ କରଯାଇପାରିବ ନାହିଁ" -#: ../src/fr-archive.c:1931 +#: ../src/fr-archive.c:1958 msgid "You can't add an archive to itself." msgstr "ଆପଣ ଗୋଟିଏ ଅଭିଲେଖକୁ ତା ନିଜ ସହିତ ଯୋଗ କରିପାରିବେ ନାହିଁ।" -#: ../src/fr-command-rar.c:422 ../src/fr-command-tar.c:301 -#: ../src/fr-command-7z.c:296 -msgid "Adding file: " -msgstr "ଫାଇଲ ଯୋଗ କରୁଅଛି: " - -#: ../src/fr-command-rar.c:500 ../src/fr-command-tar.c:365 -msgid "Removing file: " -msgstr "ଫାଇଲ ଅପସାରଣ କରୁଅଛି: " - -#: ../src/fr-command-rar.c:549 ../src/fr-command-tar.c:418 -#: ../src/fr-command-7z.c:403 -msgid "Extracting file: " -msgstr "ଫାଇଲ କାଢୁଅଛି: " +#. Translators: %s is a filename. +#: ../src/fr-command-7z.c:297 ../src/fr-command-rar.c:325 +#: ../src/fr-command-tar.c:305 +#, c-format +msgid "Adding \"%s\"" +msgstr "\"%s\" କୁ ଯୋଗକରୁଅଛି" + +#. Translators: %s is a filename. +#: ../src/fr-command-7z.c:420 ../src/fr-command-rar.c:455 +#: ../src/fr-command-tar.c:426 +#, c-format +#| msgid "Starting %s" +msgid "Extracting \"%s\"" +msgstr "\"%s\" କୁ ବାହାର କରୁଅଛି" + +#: ../src/fr-command.c:597 +#, c-format +#| msgid "Archive not created" +msgid "Archive not found" +msgstr "ଅଭିଲେଖ ମିଳୁ ନାହିଁ" + +#. Translators: %s is a filename. +#: ../src/fr-command-rar.c:406 ../src/fr-command-tar.c:371 +#, c-format +#| msgid "Removing file: " +msgid "Removing \"%s\"" +msgstr "\"%s\" କୁ କାଢ଼ୁଅଛି" -#: ../src/fr-command-rar.c:677 +#: ../src/fr-command-rar.c:581 #, c-format msgid "Could not find the volume: %s" msgstr "ଭଲ୍ୟୁମ ମିଳିଲା ନାହିଁ: %s" -#: ../src/fr-command-tar.c:374 ../src/fr-window.c:2306 +#: ../src/fr-command-tar.c:381 msgid "Deleting files from archive" msgstr "ଅଭିଲେଖରୁ ଫାଇଲ ମାନଙ୍କୁ ଅପସାରଣ କରୁଅଛି" -#: ../src/fr-command-tar.c:477 +#: ../src/fr-command-tar.c:486 msgid "Recompressing archive" msgstr "ଅଭିଲେଖକୁ ପୁନଃସଙ୍କୁଚିତ କରୁଅଛି" -#: ../src/fr-command-tar.c:708 +#: ../src/fr-command-tar.c:725 msgid "Decompressing archive" msgstr "ଅଭିଲେଖକୁ ନଷ୍ଟ କରୁଅଛି" -#: ../src/fr-stock.c:43 ../src/fr-stock.c:44 +#: ../src/fr-file-selector-dialog.c:588 +msgid "File System" +msgstr "ଫାଇଲ ତନ୍ତ୍ର" + +#: ../src/fr-file-selector-dialog.c:1331 ../src/fr-file-selector-dialog.c:1376 +#| msgid "Could not perform the operation" +msgid "Could not load the location" +msgstr "ଏହି ଅବସ୍ଥାନକୁ ଧାରଣ କରିପାରିଲା ନାହିଁ" + +#: ../src/fr-new-archive-dialog.c:331 ../src/fr-new-archive-dialog.c:350 +#: ../src/fr-new-archive-dialog.c:366 ../src/fr-new-archive-dialog.c:414 +#: ../src/fr-window.c:2812 +msgid "Could not create the archive" +msgstr "ଅଭିଲେଖକୁ ସ୍ରୁଷ୍ଟି କରିପାରିଲା ନାହିଁ" + +#: ../src/fr-new-archive-dialog.c:333 ../src/fr-new-archive-dialog.c:352 +msgid "You have to specify an archive name." +msgstr "ଆପଣ ଗୋଟିଏ ଅଭିଲେଖର ନାମ ଉଲ୍ଲେଖ କରିବା ଉଚିତ।" + +#: ../src/fr-new-archive-dialog.c:416 +msgid "You don't have permission to create an archive in this folder" +msgstr "" +"ଏହି ଫୋଲଡରରେ ଗୋଟିଏ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଆପଣଙ୍କ ନିକଟରେ ଅନୁମତି ନାହିଁ" + +#: ../src/fr-new-archive-dialog.c:435 +#, c-format +#| msgid "The archive is already present. Do you want to overwrite it?" +msgid "A file named \"%s\" already exists. Do you want to replace it?" +msgstr "\"%s\" ନାମର ଫାଇଲ ପୂର୍ବରୁ ଅଛି। ଆପଣ ତାହାକୁ ବଦଳାଇବାକୁ ଚାହାନ୍ତି କି?" + +#: ../src/fr-new-archive-dialog.c:436 +#, c-format +msgid "" +"The file already exists in \"%s\". Replacing it will overwrite its contents." +msgstr "\"%s\"ରେ ଫାଇଲ ପୂର୍ବରୁ ଅଛି। ଏହାକୁ ବଦଳାଇଲେ, ତାହାର ସୂଚୀ ନବଲିଖିତ ହୋଇଯିବ।" + +#: ../src/fr-new-archive-dialog.c:443 ../src/fr-window.c:6533 +msgid "_Replace" +msgstr "ବଦଳାନ୍ତୁ (_R)" + +#: ../src/fr-new-archive-dialog.c:458 +msgid "Could not delete the old archive." +msgstr "ପୁରାତନ ଅଭିଲେଖକୁ ଅପସାରଣ କରିପାରିଲା ନାହିଁ।" + +#: ../src/fr-stock.c:41 +msgid "C_reate" +msgstr "ସ୍ରୁଷ୍ଟି କରନ୍ତୁ (_r)" + +#: ../src/fr-stock.c:42 ../src/fr-stock.c:43 msgid "_Add" msgstr "ଯୋଗ କରନ୍ତୁ (_A)" -#: ../src/fr-stock.c:45 +#: ../src/fr-stock.c:44 msgid "_Extract" msgstr "କାଢନ୍ତୁ (_E)" -#: ../src/fr-window.c:1508 +#: ../src/fr-window.c:1043 +#| msgid "Extraction completed successfully" +msgid "Operation completed" +msgstr "ପ୍ରୟୋଗ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା" + +#: ../src/fr-window.c:1160 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" msgstr[0] "%d ବସ୍ତୁ (%s)" msgstr[1] "%d ବସ୍ତୁଗୁଡିକ (%s)" -#: ../src/fr-window.c:1513 +#: ../src/fr-window.c:1165 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" msgstr[0] "%d ଚୟିତ ବସ୍ତୁ (%s)" msgstr[1] "%d ଚୟିତ ବସ୍ତୁଗୁଡିକ (%s)" -#: ../src/fr-window.c:1581 +#: ../src/fr-window.c:1584 msgid "Folder" msgstr "ଫୋଲଡର" -#: ../src/fr-window.c:1978 +#: ../src/fr-window.c:1963 msgid "[read only]" msgstr "[କେବଳ-ପଠନୀୟ]" -#: ../src/fr-window.c:2229 +#: ../src/fr-window.c:2082 #, c-format msgid "Could not display the folder \"%s\"" msgstr "\"%s\" ଫୋଲଡରକୁ ପ୍ରଦର୍ଶିତ କରିପାରିଲା ନାହିଁ" -#: ../src/fr-window.c:2297 ../src/fr-window.c:2327 -msgid "Creating archive" -msgstr "ଅଭିଲେଖନକୁ ସୃଷ୍ଟିକରୁଅଛି" - -#: ../src/fr-window.c:2300 -msgid "Loading archive" -msgstr "ଅଭିଲେଖନକୁ ଧାରଣ କରୁଅଛି" - -#: ../src/fr-window.c:2303 -msgid "Reading archive" -msgstr "ଅଭିଲେଖକୁ ପଢୁଅଛି" - -#: ../src/fr-window.c:2309 -msgid "Testing archive" -msgstr "ଅଭିଲେଖକୁ ଯାଞ୍ଚ କରୁଅଛି" +#. Translators: %s is a filename +#: ../src/fr-window.c:2169 ../src/fr-window.c:2207 +#, c-format +#| msgid "Starting %s" +msgid "Creating \"%s\"" +msgstr "\"%s\" କୁ ନିର୍ମାଣ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2173 +#, c-format +#| msgid "Starting %s" +msgid "Loading \"%s\"" +msgstr "\"%s” କୁ ଧାରଣ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2177 +#, c-format +#| msgid "Starting %s" +msgid "Reading \"%s\"" +msgstr "\"%s\" କୁ ପଢ଼ୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2181 +#, c-format +#| msgid "Deleting files from archive" +msgid "Deleting the files from \"%s\"" +msgstr "\"%s\" ରୁ ଫାଇଲ ମାନଙ୍କୁ ଅପସାରଣ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2185 +#, c-format +#| msgid "Starting %s" +msgid "Testing \"%s\"" +msgstr "\"%s\" କୁ ପରୀକ୍ଷା କରୁଅଛି" -#: ../src/fr-window.c:2312 +#: ../src/fr-window.c:2188 msgid "Getting the file list" msgstr "ଫାଇଲ ତାଲିକା ପାଉଅଛି" -#: ../src/fr-window.c:2315 ../src/fr-window.c:2324 -msgid "Copying the file list" -msgstr "ଫାଇଲ ତାଲିକାକୁ ନକଲ କରୁଅଛି" - -#: ../src/fr-window.c:2318 -msgid "Adding files to archive" -msgstr "ଫାଇଲ ମାନଙ୍କୁ ଅଭିଲେଖରେ ଯୋଗ କରନ୍ତୁ" - -#: ../src/fr-window.c:2321 -msgid "Extracting files from archive" -msgstr "ଅଭିଲେଖରୁ ଫାଇଲ ମାନଙ୍କୁ କାଢୁଅଛି" - -#: ../src/fr-window.c:2330 -msgid "Saving archive" -msgstr "ଅଭିଲେଖକୁ ସଂରକ୍ଷିତ କରୁଅଛି" +#. Translators: %s is a filename +#: ../src/fr-window.c:2192 +#, c-format +#| msgid "Copying the file list" +msgid "Copying the files to add to \"%s\"" +msgstr "\"%s\" ରେ ଯୋଗ କରିବା ପାଇଁ ଫାଇଲଗୁଡ଼ିକୁ ନକଲ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2196 +#, c-format +#| msgid "Adding files to archive" +msgid "Adding the files to \"%s\"" +msgstr "\"%s\" ରେ ଫାଇଲଗୁଡ଼ିକୁ ଯୋଗକରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2200 +#, c-format +#| msgid "Extracting files from archive" +msgid "Extracting the files from \"%s\"" +msgstr "\"%s\" ରୁ ଫାଇଲଗୁଡ଼ିକୁ କାଢୁଅଛି" + +#: ../src/fr-window.c:2203 +msgid "Copying the extracted files to the destination" +msgstr "ବାହାର କରାଯାଇଥିବା ଫାଇଲଗୁଡ଼ିକୁ ଲକ୍ଷ୍ଯସ୍ଥଳରେ ନକଲ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2212 +#, c-format +#| msgid "Starting %s" +msgid "Saving \"%s\"" +msgstr "\"%s\" କୁ ସଂରକ୍ଷଣ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2219 +#, c-format +#| msgid "Getting the file list" +msgid "Renaming the files in \"%s\"" +msgstr "\"%s\" ରେ ଥିବା ଫାଇଲଗୁଡ଼ିକର ନାମ ପରିବର୍ତ୍ତନ କରୁଅଛି" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2223 +#, c-format +#| msgid "Update the files in the archive \"%s\"?" +msgid "Updating the files in \"%s\"" +msgstr "ଫାଇଲଗୁଡିକୁ \"%s\" ରେ ଅଦ୍ୟତନ କରୁଅଛି" -#: ../src/fr-window.c:2487 +#: ../src/fr-window.c:2398 msgid "_Open the Archive" msgstr "ଅଭିଲେଖନକୁ ଖୋଲନ୍ତୁ (_O)" -#: ../src/fr-window.c:2488 -#| msgid "_Selected files" +#: ../src/fr-window.c:2399 msgid "_Show the Files" msgstr "ଫାଇଲଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ (_S)" -#: ../src/fr-window.c:2534 -msgid "Archive:" -msgstr "ଅଭିଲେଖ:" +#: ../src/fr-window.c:2516 +#, c-format +msgid "%d file remaining" +msgid_plural "%'d files remaining" +msgstr[0] "%d ଫାଇଲ ବଳିଅଛି" +msgstr[1] "%'d ଟି ଫାଇଲ ବଳିଅଛି" + +#: ../src/fr-window.c:2520 ../src/fr-window.c:3099 +msgid "Please wait…" +msgstr "ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ ..." -#: ../src/fr-window.c:2696 +#: ../src/fr-window.c:2578 msgid "Extraction completed successfully" msgstr "ନିର୍ଯ୍ୟାସ ସଫଳତାର ସହିତ ସମ୍ପୂର୍ଣ୍ଣ ହେଲା" -#: ../src/fr-window.c:2719 -msgid "Archive created successfully" -msgstr "ଅଭିଲେଖନ ସଫଳତାର ସହିତ ସୃଷ୍ଟି କରାହେଲା" +#. Translators: %s is a filename +#: ../src/fr-window.c:2609 ../src/fr-window.c:6144 +#, c-format +#| msgid "Archive created successfully" +msgid "\"%s\" created successfully" +msgstr "\"%s\" ସଫଳତାର ସହିତ ସୃଷ୍ଟି କରାହେଲା" -#: ../src/fr-window.c:2767 -msgid "wait please..." -msgstr "ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ ..." +#: ../src/fr-window.c:2699 ../src/fr-window.c:2868 +msgid "Command exited abnormally." +msgstr "ଅସ୍ବଭାବିକ ଭାବରେ ନିର୍ଦ୍ଦେଶଟି ପ୍ରସ୍ଥାନ କଲା।" -#: ../src/fr-window.c:2921 +#: ../src/fr-window.c:2817 msgid "An error occurred while extracting files." msgstr "ଫାଇଲ ମାନଙ୍କୁ କାଢିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିତ ହେଲା।" -#: ../src/fr-window.c:2927 +#: ../src/fr-window.c:2823 #, c-format msgid "Could not open \"%s\"" msgstr "\"%s\" କୁ ଖୋଲି ପାରିଲା ନାହିଁ" -#: ../src/fr-window.c:2932 +#: ../src/fr-window.c:2828 msgid "An error occurred while loading the archive." msgstr "ଅଭିଲେଖକୁ ଧାରଣ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିତ ହେଲା।" -#: ../src/fr-window.c:2936 +#: ../src/fr-window.c:2832 msgid "An error occurred while deleting files from the archive." msgstr "ଅଭିଲେଖରୁ ଫାଇଲ ମାନଙ୍କୁ ଅପସାରଣ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିତ ହେଲା।" -#: ../src/fr-window.c:2942 +#: ../src/fr-window.c:2838 msgid "An error occurred while adding files to the archive." msgstr "ଅଭିଲେଖରେ ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିତ ହେଲା।" -#: ../src/fr-window.c:2946 +#: ../src/fr-window.c:2842 msgid "An error occurred while testing archive." msgstr "ଅଭିଲେଖକୁ ପରୀକ୍ଷଣ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିଲ ହେଲା।" -#: ../src/fr-window.c:2950 +#: ../src/fr-window.c:2847 msgid "An error occurred while saving the archive." msgstr "ଅଭିଲେଖନକୁ ସଂରକ୍ଷଣ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଲା।" -#: ../src/fr-window.c:2954 +#: ../src/fr-window.c:2851 +#| msgid "An error occurred while extracting files." +msgid "An error occurred while renaming the files." +msgstr "ଫାଇଲଗୁଡ଼ିକର ନାମପରିବର୍ତ୍ତନ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିତ ହେଲା।" + +#: ../src/fr-window.c:2855 +#| msgid "An error occurred while extracting files." +msgid "An error occurred while updating the files." +msgstr "ଫାଇଲଗୁଡ଼ିକୁ ଅଦ୍ୟତନ କରିବା ସମୟରେ ଗୋଟିଏ ତ୍ରୁଟି ପରିଲିଖିତ ହେଲା।" + +#: ../src/fr-window.c:2859 msgid "An error occurred." msgstr "ଗୋଟିଏ ତ୍ରୁଟି ଘଟିଲା।" -#: ../src/fr-window.c:2960 +#: ../src/fr-window.c:2865 msgid "Command not found." msgstr "ନିର୍ଦ୍ଦେଶ ମିଳିଲା ନାହିଁ।" -#: ../src/fr-window.c:2963 -msgid "Command exited abnormally." -msgstr "ଅସ୍ବଭାବିକ ଭାବରେ ନିର୍ଦ୍ଦେଶଟି ପ୍ରସ୍ଥାନ କଲା।" - -#: ../src/fr-window.c:3161 +#: ../src/fr-window.c:3023 msgid "Test Result" msgstr "ପରୀକ୍ଷଣ ଫଳାଫଳ" -#: ../src/fr-window.c:3965 ../src/fr-window.c:7791 ../src/fr-window.c:7818 -#: ../src/fr-window.c:8073 +#: ../src/fr-window.c:3966 ../src/fr-window.c:8635 ../src/fr-window.c:8669 +#: ../src/fr-window.c:8935 msgid "Could not perform the operation" msgstr "ଏହି କାର୍ଯ୍ଯକୁ ସମ୍ପାଦିତ କରିପାରିଲା ନାହିଁ" -#: ../src/fr-window.c:3991 +#: ../src/fr-window.c:3992 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" msgstr "" -"ଆପଣ ଏହି ଫାଇଲକୁ ସାମ୍ପ୍ରତିକ ଅଭିଲେଖ ସହିତ ଯୋଗ କରିବା ପାଇଁ କିମ୍ବା ଗୋଟିଏ ନୂତନ ଅଭିଲେଖ ଭାବରେ ଖୋଲିବା " +"ଆପଣ ଏହି ଫାଇଲକୁ ସାମ୍ପ୍ରତିକ ଅଭିଲେଖ ସହିତ ଯୋଗ କରିବା ପାଇଁ କିମ୍ବା ଗୋଟିଏ ନୂତନ ଅଭିଲେଖ " +"ଭାବରେ ଖୋଲିବା " "ପାଇଁ ଚାହୁଁଛନ୍ତି?" -#: ../src/fr-window.c:4021 +#: ../src/fr-window.c:4022 msgid "Do you want to create a new archive with these files?" -msgstr "ଆପଣ ଏହି ଫାଇଲ ମାନଙ୍କ ସହିତ ଗୋଟିଏ ନୂତନ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?" +msgstr "" +"ଆପଣ ଏହି ଫାଇଲ ମାନଙ୍କ ସହିତ ଗୋଟିଏ ନୂତନ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଚାହୁଁଛନ୍ତି କି?" -#: ../src/fr-window.c:4024 +#: ../src/fr-window.c:4025 msgid "Create _Archive" msgstr "ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରନ୍ତୁ (_A)" -#: ../src/fr-window.c:4597 ../src/fr-window.c:5676 +#: ../src/fr-window.c:4054 ../src/fr-window.c:7105 +#| msgid "Archive:" +msgid "New Archive" +msgstr "ନୂତନ ଅଭିଲେଖ" + +#: ../src/fr-window.c:4642 msgid "Folders" msgstr "ଫୋଲଡରଗୁଡିକ" -#: ../src/fr-window.c:4635 +#: ../src/fr-window.c:4680 ../src/ui/file-selector.ui.h:5 +#| msgid "Size" +msgctxt "File" msgid "Size" msgstr "ଆକାର" -#: ../src/fr-window.c:4636 +#: ../src/fr-window.c:4681 +#| msgid "Type" +msgctxt "File" msgid "Type" msgstr "ପ୍ରକାର" -#: ../src/fr-window.c:4637 -msgid "Date Modified" -msgstr "ତାରିଖ ରୂପାନ୍ତରିତ" +#: ../src/fr-window.c:4682 ../src/ui/file-selector.ui.h:6 +#| msgid "Modified on:" +msgctxt "File" +msgid "Modified" +msgstr "ପରିବର୍ତ୍ତିତ" + +#: ../src/fr-window.c:4683 +#| msgid "Location" +msgctxt "File" +msgid "Location" +msgstr "ଅବସ୍ଥାନ" -#: ../src/fr-window.c:4647 +#: ../src/fr-window.c:4692 ../src/ui/file-selector.ui.h:4 +#| msgid "Name" +msgctxt "File" msgid "Name" msgstr "ନାମ" -#: ../src/fr-window.c:5597 +#: ../src/fr-window.c:5519 msgid "Find:" msgstr "ଖୋଜନ୍ତୁ:" -#: ../src/fr-window.c:5684 -msgid "Close the folders pane" -msgstr "ଫୋଲଡର ପରଦାଖଣ୍ଡକୁ ବନ୍ଦ କରନ୍ତୁ" - -#: ../src/fr-window.c:5824 ../src/fr-window.c:5827 ../src/ui.h:141 -#: ../src/ui.h:145 -msgid "Open archive" -msgstr "ଅଭିଲେଖକୁ ଖୋଲନ୍ତୁ" +#. Translators: this is the label for the "open recent file" sub-menu. +#: ../src/fr-window.c:5614 +msgid "Open _Recent" +msgstr "ସମ୍ପ୍ରତିକ ଫାଇଲକୁ ଖୋଲନ୍ତୁ (_R)" -#: ../src/fr-window.c:5825 +#: ../src/fr-window.c:5615 ../src/fr-window.c:5627 msgid "Open a recently used archive" msgstr "ନିକଟ ଅତୀତରେ ବ୍ଯବହ୍ରୁତ ହୋଇଥିବା ଗୋଟିଏ ଅଭିଲେକକୁ ଖୋଲନ୍ତୁ" -#: ../src/fr-window.c:6149 +#. Translators: after the colon there is a folder name. +#: ../src/fr-window.c:5699 ../src/ui/file-selector.ui.h:1 +#: ../src/ui/new-archive-dialog.ui.h:2 +msgid "_Location:" +msgstr "ଅବସ୍ଥାନ (_L):" + +#: ../src/fr-window.c:6521 +#, c-format +#| msgid "_Selected files" +msgid "Replace file \"%s\"?" +msgstr "\"%s\" ଫାଇଲକୁ ବଦଳାଇବେ କି?" + +#: ../src/fr-window.c:6524 +#, c-format +#| msgid "" +#| "A file named \"%s\" already exists.\n" +#| "\n" +#| "%s" +msgid "Another file with the same name already exists in \"%s\"." +msgstr "\"%s\" ରେ ସମାନ ନାମ ବିଶିଷ୍ଟ ଅନ୍ୟ ଏକ ଫାଇଲ ପୂର୍ବରୁ ଅବସ୍ଥିତ ଅଛି।" + +#: ../src/fr-window.c:6531 +msgid "Replace _All" +msgstr "ସବୁ ବଦଳାନ୍ତୁ (_A)" + +#: ../src/fr-window.c:6532 +msgid "_Skip" +msgstr "ଏଡାଇ ଦିଅନ୍ତୁ (_S)" + +#: ../src/fr-window.c:7287 ../src/fr-window.c:7643 #, c-format msgid "Could not save the archive \"%s\"" msgstr "\"%s\" ଅଭିଲେକକୁ ସଂରକ୍ଷିତ କରିପାରିଲା ନାହିଁ" -#: ../src/fr-window.c:7206 -msgid "The new name is void." -msgstr "ନୂତନ ନାମଟି ଶୂନ୍ଯ ଅଟେ।" - -#: ../src/fr-window.c:7210 -msgid "The new name is equal to the old one." -msgstr "ନୂତନ ନାମଟି ପୁରାତନ ନାମ ସହିତ ସମାନ।" +#: ../src/fr-window.c:7414 +msgid "Save" +msgstr "ସଂରକ୍ଷଣ କରନ୍ତୁ" -#: ../src/fr-window.c:7250 +#: ../src/fr-window.c:7737 +msgid "Last Output" +msgstr "ଅନ୍ତିମ ନିର୍ଗମ" + +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7959 +msgid "New name is void, please type a name." +msgstr "ନୂତନ ନାମଟି ଶୂନ୍ୟ ଅଟେ, ଦୟାକରି ଏକ ନାମ ଲେଖନ୍ତୁ।" + +#. Translators: the name references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7964 +msgid "New name is the same as old one, please type other name." +msgstr "ନୂତନ ନାମଟି ପୁରୁଣା ନାମ ସହିତ ସମାନ ଅଟେ, ଦୟାକରି ଅନ୍ୟ ଏକ ନାମ ଲେଖନ୍ତୁ।" + +#. Translators: the %s references to a filename. This message can appear when renaming a file. +#: ../src/fr-window.c:7969 +#, c-format +#| msgid "" +#| "The name \"%s\" is not valid because it cannot contain the characters: " +#| "%s\n" +#| "\n" +#| "%s" +msgid "" +"Name \"%s\" is not valid because it contains at least one of the following " +"characters: %s, please type other name." +msgstr "" +"\"%s\" ନାମ ବୈଧ ନୁହେଁ କାରଣ ଏହା ଏଠାରେ ଉଲ୍ଲେଖିତ ଅକ୍ଷର ମାନଙ୍କ ମଧ୍ଯରୁ ଗୋଟିଏକୁ " +"ଧାରଣ କରିଛି: %s, ଦୟାକରି ଅନ୍ୟ ଏକ ନାମ ଲେଖନ୍ତୁ।" + +#: ../src/fr-window.c:8005 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -809,7 +952,11 @@ "\n" "%s" -#: ../src/fr-window.c:7252 +#: ../src/fr-window.c:8005 ../src/fr-window.c:8007 +msgid "Please use a different name." +msgstr "ଦୟାକରି ଗୋଟିଏ ଭିନ୍ନ ନାମକୁ ବ୍ଯବହାର କରନ୍ତୁ।" + +#: ../src/fr-window.c:8007 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -820,473 +967,798 @@ "\n" "%s" -#: ../src/fr-window.c:7319 +#: ../src/fr-window.c:8077 msgid "Rename" msgstr "ନାମ ବଦଳାନ୍ତୁ" -#: ../src/fr-window.c:7320 -msgid "New folder name" -msgstr "ନୂତନ ଫୋଲଡର ନାମ" - -#: ../src/fr-window.c:7320 -msgid "New file name" -msgstr "ନୂତନ ଫାଇଲ ନାମ" +#: ../src/fr-window.c:8078 +#| msgid "New folder name" +msgid "_New folder name:" +msgstr "ନୂତନ ଫୋଲଡର ନାମ (_N):" + +#: ../src/fr-window.c:8078 +#| msgid "New file name" +msgid "_New file name:" +msgstr "ନୂତନ ଫାଇଲ ନାମ (_N):" -#: ../src/fr-window.c:7324 +#: ../src/fr-window.c:8082 msgid "_Rename" msgstr "ନାମ ବଦଳାନ୍ତୁ (_R)" -#: ../src/fr-window.c:7341 ../src/fr-window.c:7361 +#: ../src/fr-window.c:8099 ../src/fr-window.c:8118 msgid "Could not rename the folder" msgstr "ଫୋଲଡର ନାମକୁ ବଦଳାଇ ପାରିଲା ନାହିଁ" -#: ../src/fr-window.c:7341 ../src/fr-window.c:7361 +#: ../src/fr-window.c:8099 ../src/fr-window.c:8118 msgid "Could not rename the file" msgstr "ଫାଇଲର ନାମକୁ ବଦଳାଇ ପାରିଲା ନାହିଁ" -#: ../src/fr-window.c:7752 +#. Translators: %s are archive filenames +#: ../src/fr-window.c:8542 +#, c-format +msgid "Moving the files from \"%s\" to \"%s\"" +msgstr "ଫାଇଲଗୁଡ଼ିକୁ \"%s\" ରୁ \"%s\" ମଧ୍ଯକୁ ସ୍ଥାନାନ୍ତରିତ କରାଯାଉଛି" + +#. Translators: %s are archive filenames +#: ../src/fr-window.c:8545 +#, c-format +#| msgid "Copying the file list" +msgid "Copying the files from \"%s\" to \"%s\"" +msgstr "ଫାଇଲଗୁଡ଼ିକୁ \"%s\" ରୁ \"%s\" ମଧ୍ଯକୁ ନକଲ କରାଯାଉଛି" + +#: ../src/fr-window.c:8596 msgid "Paste Selection" msgstr "ଚୟିନକୁ ଲଗାନ୍ତୁ" -#: ../src/fr-window.c:7753 -msgid "Destination folder" -msgstr "ଲକ୍ଷ୍ଯ ଫୋଲଡର" +#: ../src/fr-window.c:8597 +#| msgid "Destination folder" +msgid "_Destination folder:" +msgstr "ଲକ୍ଷସ୍ଥଳ ଫୋଲଡର (_D):" -#: ../src/fr-window.c:8343 +#: ../src/fr-window.c:9195 msgid "Add files to an archive" msgstr "ଗୋଟିଏ ଅଭିଲେଖରେ ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ" -#: ../src/fr-window.c:8387 +#: ../src/fr-window.c:9239 ../src/main.c:448 ../src/main.c:484 +#: ../src/main.c:510 ../src/main.c:802 msgid "Extract archive" msgstr "ଅଭିଲେଖକୁ କାଢନ୍ତୁ" #. This is the time format used in the "Date Modified" column and #. * in the Properties dialog. See the man page of strftime for an #. * explanation of the values. -#: ../src/glib-utils.c:536 +#: ../src/glib-utils.c:733 msgid "%d %B %Y, %H:%M" msgstr "%d %B %Y, %H:%M" -#. Expander -#: ../src/gtk-utils.c:439 -msgid "Command _Line Output" -msgstr "ପାଠ୍ଯ ନିର୍ଦ୍ଦେଶ ନିର୍ଗମ (_L)" - -#: ../src/gtk-utils.c:776 +#: ../src/gtk-utils.c:557 msgid "Could not display help" msgstr "ସହାୟତାକୁ ପ୍ରଦର୍ଶନ କରିପାରିଲା ନାହିଁ" -#: ../src/main.c:81 -msgid "7-Zip (.7z)" -msgstr "7-Zip (.7z)" - -#: ../src/main.c:82 -msgid "Tar compressed with 7z (.tar.7z)" -msgstr "7z (.tar.7z) ଦ୍ବାରା ସଙ୍କୁଚିତ Tar" - -#: ../src/main.c:83 -msgid "Ace (.ace)" -msgstr "Ace (.ace)" - -#: ../src/main.c:85 -msgid "Ar (.ar)" -msgstr "Ar (.ar)" - -#: ../src/main.c:86 -msgid "Arj (.arj)" -msgstr "Arj (.arj)" - -#: ../src/main.c:88 -msgid "Tar compressed with bzip2 (.tar.bz2)" -msgstr "bzip2 ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.bz2)" - -#: ../src/main.c:90 -msgid "Tar compressed with bzip (.tar.bz)" -msgstr "bzip ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.bz)" - -#: ../src/main.c:91 -msgid "Cabinet (.cab)" -msgstr "କେବିନେଟ (.cab)" - -#: ../src/main.c:92 -msgid "Rar Archived Comic Book (.cbr)" -msgstr "Rar ଆଲେଖି ହାସ୍ୟାସ୍ପଦ ବହି (.cbr)" - -#: ../src/main.c:93 -msgid "Zip Archived Comic Book (.cbz)" -msgstr "Zip ଆଲେଖି ହାସ୍ୟାସ୍ପଦ ବହି (.cbz)" - -#: ../src/main.c:96 -msgid "Tar compressed with gzip (.tar.gz)" -msgstr "gzip ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.gz)" - -#: ../src/main.c:99 -msgid "Ear (.ear)" -msgstr "Ear (.ear)" - -#: ../src/main.c:100 -msgid "Self-extracting zip (.exe)" -msgstr "ସ୍ୱତ-ନିର୍ଯ୍ଯାସିତ zip (.exe)" - -#: ../src/main.c:102 -msgid "Jar (.jar)" -msgstr "Jar (.jar)" - -#: ../src/main.c:103 -msgid "Lha (.lzh)" -msgstr "Lha (.lzh)" - -#: ../src/main.c:105 -#| msgid "Tar compressed with lzop (.tar.lzo)" -msgid "Tar compressed with lzip (.tar.lz)" -msgstr "lzip ସହିତ Tar ସଙ୍କୁଚିତ ହୋଇଛି (.tar.lz)" - -#: ../src/main.c:107 -msgid "Tar compressed with lzma (.tar.lzma)" -msgstr "lzma (.tar.lzma) ଦ୍ୱାରା ସଙ୍କୁଚିତ Tar " - -#: ../src/main.c:109 -msgid "Tar compressed with lzop (.tar.lzo)" -msgstr "lzop ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.lzo)" - -#: ../src/main.c:110 -msgid "Rar (.rar)" -msgstr "Rar (.rar)" - -#: ../src/main.c:113 -msgid "Tar uncompressed (.tar)" -msgstr "ଅସଙ୍କୁଚିତ tar (.tar)" - -#: ../src/main.c:114 -msgid "Tar compressed with compress (.tar.Z)" -msgstr "ସଙ୍କୋଚନ ଦ୍ବାରା Tar ସଙ୍କୁଚିତ ହୋଇଛି (.tar.Z)" - -#: ../src/main.c:116 -msgid "War (.war)" -msgstr "War (.war)" - -#: ../src/main.c:117 -msgid "Xz (.xz)" -msgstr "Xz (.xz)" - -#: ../src/main.c:118 -#| msgid "Tar compressed with 7z (.tar.7z)" -msgid "Tar compressed with xz (.tar.xz)" -msgstr "xz ସହିତ Tar ସଙ୍କୁଚିତ ହୋଇଛି (.tar.xz)" - -#: ../src/main.c:119 -msgid "Zoo (.zoo)" -msgstr "Zoo (.zoo)" - -#: ../src/main.c:120 -msgid "Zip (.zip)" -msgstr "Zip (.zip)" - -#: ../src/main.c:185 +#: ../src/main.c:68 msgid "Add files to the specified archive and quit the program" -msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଅଭିଲେଖରେ ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ କରନ୍ତୁ" +msgstr "" +"ନିର୍ଦ୍ଦିଷ୍ଟ ଅଭିଲେଖରେ ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/main.c:186 +#: ../src/main.c:69 msgid "ARCHIVE" msgstr "ଅଭିଲେଖ" -#: ../src/main.c:189 +#: ../src/main.c:72 msgid "Add files asking the name of the archive and quit the program" msgstr "ଅଭିଲେଖର ନାମ ପଚାରି ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/main.c:193 +#: ../src/main.c:76 msgid "Extract archives to the specified folder and quit the program" msgstr "ନିର୍ଦ୍ଦିଷ୍ଟ ଫୋଲଡରରେ ଅଭିଲେଖ ମାନଙ୍କୁ କାଢନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/main.c:194 ../src/main.c:206 +#: ../src/main.c:77 ../src/main.c:89 msgid "FOLDER" msgstr "ଫୋଲଡର" -#: ../src/main.c:197 +#: ../src/main.c:80 msgid "Extract archives asking the destination folder and quit the program" -msgstr "ଲକ୍ଷ୍ଯ ଫୋଲଡର କେଉଁଠି ଅଛି ପଚାରି ଅଭିଲେଖ ମାନଙ୍କୁ କାଢନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ କରନ୍ତୁ" +msgstr "" +"ଲକ୍ଷ୍ଯ ଫୋଲଡର କେଉଁଠି ଅଛି ପଚାରି ଅଭିଲେଖ ମାନଙ୍କୁ କାଢନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ " +"କରନ୍ତୁ" -#: ../src/main.c:201 -#| msgid "Extract archives to the specified folder and quit the program" +#: ../src/main.c:84 msgid "" "Extract the contents of the archives in the archive folder and quit the " "program" msgstr "ଅଭିଲେଖ ଫୋଲଡରରେ ଅଭିଲେଖମାନଙ୍କୁ କାଢନ୍ତୁ ଏବଂ ପ୍ରୋଗ୍ରାମକୁ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/main.c:205 +#: ../src/main.c:88 msgid "Default folder to use for the '--add' and '--extract' commands" -msgstr "'--add' ଏବଂ '--extract' ନିର୍ଦ୍ଦେଶ ମାନଙ୍କୁ ବ୍ଯବହାର କରିବା ପାଇଁ ପୂର୍ବ ନିର୍ଦ୍ଧାରିତ ଫୋଲଡର" +msgstr "" +"'--add' ଏବଂ '--extract' ନିର୍ଦ୍ଦେଶ ମାନଙ୍କୁ ବ୍ଯବହାର କରିବା ପାଇଁ ପୂର୍ବ " +"ନିର୍ଦ୍ଧାରିତ ଫୋଲଡର" -#: ../src/main.c:209 +#: ../src/main.c:92 msgid "Create destination folder without asking confirmation" msgstr "ଅନୁମୋଦନ ପାଇଁ ନ ପଚାରି ଲକ୍ଷ୍ଯ ଫୋଲଡରକୁ ସ୍ରୁଷ୍ଟି କରନ୍ତୁ" -#: ../src/main.c:291 -msgid "- Create and modify an archive" -msgstr "- ଗୋଟିଏ ଅଭିଲେଖକୁ ସୃଷ୍ଟି ଏବଂ ରୂପାନ୍ତରିତ କରନ୍ତୁ" +#: ../src/main.c:96 +msgid "Use the notification system to notify the operation completion" +msgstr "" +"ସମ୍ପୂର୍ଣ୍ଣ ହୋଇଥିବା ପ୍ରୟୋଗକୁ ସୂଚାଇବା ପାଇଁ ବିଜ୍ଞପ୍ତି ତନ୍ତ୍ରକୁ ବ୍ୟବହାର କରନ୍ତୁ" + +#: ../src/main.c:99 +msgid "Start as a service" +msgstr "ଏକ ସର୍ଭିସ ଭାବରେ ଆରମ୍ଭ କରନ୍ତୁ" + +#: ../src/main.c:102 +msgid "Show version" +msgstr "ସଂସ୍କରଣ ଦେଖାନ୍ତୁ" -#: ../src/main.c:307 +#. manually set name and icon +#: ../src/main.c:629 msgid "File Roller" msgstr "ଫାଇଲ ରୋଲର" -#: ../src/ui.h:32 -#| msgid "_Files:" -msgid "_File" -msgstr "ଫାଇଲ (_F)" +#: ../src/main.c:660 +msgid "- Create and modify an archive" +msgstr "- ଗୋଟିଏ ଅଭିଲେଖକୁ ସୃଷ୍ଟି ଏବଂ ରୂପାନ୍ତରିତ କରନ୍ତୁ" -#: ../src/ui.h:33 +#: ../src/ui/add-dialog-options.ui.h:1 +#| msgid "_Add" +msgid "Add" +msgstr "ଯୋଗ କରନ୍ତୁ" + +#: ../src/ui/add-dialog-options.ui.h:2 +msgid "Include _files:" +msgstr "ଫାଇଲ ମାନଙ୍କୁ ଅନ୍ତର୍ଭୂକ୍ତ କରନ୍ତୁ (_I):" + +#: ../src/ui/add-dialog-options.ui.h:3 +msgid "E_xclude files:" +msgstr "ଫାଇଲ ମାନଙ୍କୁ ବାଦ ଦିଅନ୍ତୁ (_x)" + +#: ../src/ui/add-dialog-options.ui.h:4 +msgid "_Exclude folders:" +msgstr "ଫୋଲଡର ମାନଙ୍କୁ ବାଦ ଦିଅନ୍ତୁ (_E):" + +#: ../src/ui/add-dialog-options.ui.h:5 ../src/ui/extract-dialog-options.ui.h:5 +msgid "example: *.o; *.bak" +msgstr "ଉଦାହରଣ: *.o; *.bak" + +#: ../src/ui/add-dialog-options.ui.h:6 ../src/ui/extract-dialog-options.ui.h:6 +msgid "Actions" +msgstr "କାର୍ଯ୍ଯ" + +#: ../src/ui/add-dialog-options.ui.h:7 +msgid "Add only if _newer" +msgstr "କେବଳ ନୂତନ ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ (_n)" + +#: ../src/ui/add-dialog-options.ui.h:8 +msgid "_Follow symbolic links" +msgstr "ସାଙ୍କେତିକ ସଂଯୋଗିକୀଗୁଡ଼ିକୁ ଅନୁସରଣ କରନ୍ତୁ (_F)" + +#: ../src/ui/app-menu.ui.h:1 +#| msgid "Archive:" +msgid "_New Archive" +msgstr "ନୂତନ ଅଭିଲେଖ (_N):" + +#: ../src/ui/app-menu.ui.h:2 ../src/ui.h:34 +msgid "_Help" +msgstr "ସହାୟତା (_H)" + +#: ../src/ui/app-menu.ui.h:3 +#| msgid "Archive Manager" +msgid "_About Archive Manager" +msgstr "ଅଭିଲେଖ ପରିଚାଳକ ବିଷୟରେ (_A)" + +#: ../src/ui/app-menu.ui.h:4 +msgid "_Quit" +msgstr "ବିଦାୟ ନିଅନ୍ତୁ (_Q)" + +#: ../src/ui/ask-password.ui.h:1 ../src/ui/new-archive-dialog-options.ui.h:1 +#: ../src/ui/new-archive-dialog.ui.h:4 +msgid "_Password:" +msgstr "ପ୍ରବେଶ ସଂଙ୍କେତ (_P):" + +#: ../src/ui/delete.ui.h:1 +msgid "Delete" +msgstr "ଅପସାରଣ କରନ୍ତୁ" + +#: ../src/ui/delete.ui.h:2 ../src/ui/extract-dialog-options.ui.h:4 +msgid "_Files:" +msgstr "ଫାଇଲ (_F):" + +#: ../src/ui/delete.ui.h:3 +msgid "example: *.txt; *.doc" +msgstr "ଉଦାହରଣ: *.txt; *.doc" + +#: ../src/ui/delete.ui.h:4 ../src/ui/extract-dialog-options.ui.h:2 +msgid "_All files" +msgstr "ସମସ୍ତ ଫାଇଲ (_A)" + +#: ../src/ui/delete.ui.h:5 ../src/ui/extract-dialog-options.ui.h:3 +msgid "_Selected files" +msgstr "ଚୟିତ ଫାଇଲ (_S)" + +#: ../src/ui/error-dialog.ui.h:1 +#| msgid "Command _Line Output" +msgid "C_ommand Line Output:" +msgstr "ନିର୍ଦ୍ଦେଶ ନାମା ଫଳାଫଳ (_o):" + +#: ../src/ui/extract-dialog-options.ui.h:7 +msgid "_Keep directory structure" +msgstr "ଡିରେକ୍ଟୋରୀ ସଂରଚନାକୁ ରଖନ୍ତୁ (_K)" + +#: ../src/ui/extract-dialog-options.ui.h:8 +#| msgid "Do not e_xtract older files" +msgid "Do not _overwrite newer files" +msgstr "ନୂତନ ଫାଇଲଗୁଡ଼ିକୁ ନବଲିଖନ କରନ୍ତୁ ନାହିଁ (_o)" + +#: ../src/ui/file-selector.ui.h:2 ../src/ui.h:188 +msgid "Go up one level" +msgstr "ଗୋଟିଏ ସ୍ତର ଉପରକୁ ଯାଆନ୍ତୁ" + +#: ../src/ui/file-selector.ui.h:3 +msgid "Places" +msgstr "ସ୍ଥାନଗୁଡିକ" + +#: ../src/ui/file-selector.ui.h:7 +#| msgid "Dese_lect All" +msgid "_Select All" +msgstr "ସମସ୍ତଙ୍କୁ ଚୟନ କରନ୍ତୁ (_S)" + +#: ../src/ui/file-selector.ui.h:8 ../src/ui.h:101 +msgid "Dese_lect All" +msgstr "ସବୁକିଛି ବିଚୟନ କରନ୍ତୁ (_l)" + +#: ../src/ui/file-selector.ui.h:9 +#| msgid "_Show the Files" +msgid "Show Hidden Files" +msgstr "ଲୁକ୍କାଇତ ଫାଇଲଗୁଡ଼ିକୁ ଦର୍ଶାନ୍ତୁ" + +#: ../src/ui.h:31 +#| msgid "Archive:" +msgid "_Archive" +msgstr "ଅଭିଲେଖ (_A)" + +#: ../src/ui.h:32 msgid "_Edit" msgstr "ସମ୍ପାଦନ କରନ୍ତୁ (_E)" -#: ../src/ui.h:34 +#: ../src/ui.h:33 msgid "_View" msgstr "ଦ୍ରୁଶ୍ଯ (_V)" #: ../src/ui.h:35 -msgid "_Help" -msgstr "ସହାୟତା (_H)" - -#: ../src/ui.h:36 msgid "_Arrange Files" msgstr "ଫାଇଲ ମାନଙ୍କୁ ସଜାଡନ୍ତୁ (_A)" -#: ../src/ui.h:37 -msgid "Open _Recent" -msgstr "ସମ୍ପ୍ରତିକ ଫାଇଲକୁ ଖୋଲନ୍ତୁ (_R)" - -#: ../src/ui.h:41 +#: ../src/ui.h:39 msgid "Information about the program" msgstr "ପ୍ରୋଗ୍ରାମ ବିଷୟରେ ସୂଚନା" -#: ../src/ui.h:44 -msgid "_Add Files..." -msgstr "ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ ... (_A)" +#: ../src/ui.h:42 +#| msgid "Add Files" +msgid "_Add Files…" +msgstr "ଫାଇଲଗୁଡ଼ିକୁ ଯୋଗକରନ୍ତୁ (_A)…" -#: ../src/ui.h:45 ../src/ui.h:49 +#: ../src/ui.h:43 ../src/ui.h:47 msgid "Add files to the archive" msgstr "ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ" -#: ../src/ui.h:52 -msgid "Add a _Folder..." -msgstr "ଗୋଟିଏ ଫୋଲଡର ଯୋଗ କରନ୍ତୁ ... (_F)" - -#: ../src/ui.h:53 ../src/ui.h:57 -msgid "Add a folder to the archive" -msgstr "ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ" - -#: ../src/ui.h:56 -msgid "Add Folder" -msgstr "ଫୋଲଡର ଯୋଗ କରନ୍ତୁ" - -#: ../src/ui.h:61 +#: ../src/ui.h:51 msgid "Close the current archive" msgstr "ସମ୍ପ୍ରତିକ ଅଭିଲେଖକୁ ବନ୍ଦ କରନ୍ତୁ" -#: ../src/ui.h:64 +#: ../src/ui.h:54 msgid "Contents" msgstr "ସୂଚୀପତ୍ର" -#: ../src/ui.h:65 +#: ../src/ui.h:55 msgid "Display the File Roller Manual" msgstr "ଫାଇଲ ରୋଲର ମେନ୍ଯୁଆଲକୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" -#: ../src/ui.h:70 ../src/ui.h:91 +#: ../src/ui.h:60 ../src/ui.h:81 msgid "Copy the selection" msgstr "ଚୟନକୁ ନକଲ କରନ୍ତୁ" -#: ../src/ui.h:74 ../src/ui.h:95 +#: ../src/ui.h:64 ../src/ui.h:85 msgid "Cut the selection" msgstr "ଚୟନକୁ କାଟନ୍ତୁ" -#: ../src/ui.h:78 ../src/ui.h:99 +#: ../src/ui.h:68 ../src/ui.h:89 msgid "Paste the clipboard" msgstr "କ୍ଲିପବୋର୍ଡକୁ ଲଗାନ୍ତୁ" -#: ../src/ui.h:81 ../src/ui.h:102 -msgid "_Rename..." -msgstr "ନାମ ବଦଳାନ୍ତୁ ... (_R)" +#: ../src/ui.h:71 ../src/ui.h:92 +#| msgid "_Rename" +msgid "_Rename…" +msgstr "ନାମ ବଦଳାନ୍ତୁ (_R)…" -#: ../src/ui.h:82 ../src/ui.h:103 +#: ../src/ui.h:72 ../src/ui.h:93 msgid "Rename the selection" msgstr "ଚୟନର ନାମ ବଦଳାନ୍ତୁ" -#: ../src/ui.h:86 ../src/ui.h:107 +#: ../src/ui.h:76 ../src/ui.h:97 msgid "Delete the selection from the archive" msgstr "ଅଭିଲେଖରୁ ଚୟନକୁ ଅପସାରଣ କରନ୍ତୁ" -#: ../src/ui.h:111 -msgid "Dese_lect All" -msgstr "ସବୁକିଛି ବିଚୟନ କରନ୍ତୁ (_l)" - -#: ../src/ui.h:112 +#: ../src/ui.h:102 msgid "Deselect all files" msgstr "ସମସ୍ତ ଫାଇଲ ମାନଙ୍କୁ ଚୟନ କରନ୍ତୁ" -#: ../src/ui.h:115 ../src/ui.h:119 -msgid "_Extract..." -msgstr "କାଢନ୍ତୁ ... (_E)" +#: ../src/ui.h:105 ../src/ui.h:109 +#| msgid "_Extract" +msgid "_Extract…" +msgstr "କାଢନ୍ତୁ (_E)…" -#: ../src/ui.h:116 ../src/ui.h:120 ../src/ui.h:124 +#: ../src/ui.h:106 ../src/ui.h:110 ../src/ui.h:114 msgid "Extract files from the archive" msgstr "ଅଭିଲେଖରୁ ଫାଇଲ ମାନଙ୍କୁ କାଢନ୍ତୁ" -#: ../src/ui.h:132 -msgid "_Last Output" -msgstr "ଅନ୍ତିମ ନିର୍ଗମ (_L)" - -#: ../src/ui.h:133 -msgid "View the output produced by the last executed command" -msgstr "ଅନ୍ତିମ ନିଷ୍ପିଦିତ ନିର୍ଦ୍ଦେଶ ଦ୍ବାରା ଉତ୍ପନ୍ନ ନିର୍ଗମକୁ ଦେଖନ୍ତୁ" +#: ../src/ui.h:117 +#| msgid "Find:" +msgid "Find…" +msgstr "ଖୋଜନ୍ତୁ ..." + +#: ../src/ui.h:122 +msgid "New…" +msgstr "ନୂତନ ..." -#: ../src/ui.h:137 +#: ../src/ui.h:123 msgid "Create a new archive" msgstr "ଗୋଟିଏ ନୂତନ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରନ୍ତୁ" -#: ../src/ui.h:148 -msgid "_Open With..." -msgstr "-ଏଥିରେ ଖୋଲନ୍ତୁ (_O) ..." +#: ../src/ui.h:126 +#| msgid "Open" +msgid "Open…" +msgstr "ଖୋଲନ୍ତୁ ..." + +#: ../src/ui.h:127 ../src/ui.h:131 +msgid "Open archive" +msgstr "ଅଭିଲେଖକୁ ଖୋଲନ୍ତୁ" + +#: ../src/ui.h:134 +#| msgid "_Open With..." +msgid "_Open With…" +msgstr "ଏଥିରେ ଖୋଲନ୍ତୁ (_O) ..." -#: ../src/ui.h:149 +#: ../src/ui.h:135 msgid "Open selected files with an application" msgstr "ଗୋଟିଏ ପ୍ରୟୋଗ ସହିତ ଫାଇଲ ମାନଙ୍କୁ ଚୟନ କରନ୍ତୁ" -#: ../src/ui.h:152 -msgid "Pass_word..." -msgstr "ପ୍ରବେଶ ସଙ୍କେତ ... (_P)" +#: ../src/ui.h:138 +#| msgid "Password" +msgid "Pass_word…" +msgstr "ପ୍ରବେଶ ସଙ୍କେତ (_w)…" -#: ../src/ui.h:153 +#: ../src/ui.h:139 msgid "Specify a password for this archive" msgstr "ଏହି ଅଭିଲେକ ପାଇଁ ଗୋଟିଏ ପ୍ରବେଶ ସଙ୍କେତ ନିର୍ଦ୍ଦିଷ୍ଟ କରନ୍ତୁ" -#: ../src/ui.h:157 +#: ../src/ui.h:143 msgid "Show archive properties" msgstr "ଅଭିଲେଖ ଗୁଣଧର୍ମକୁ ପ୍ରଦର୍ଶନ କରନ୍ତୁ" -#: ../src/ui.h:161 +#: ../src/ui.h:147 msgid "Reload current archive" msgstr "ସମ୍ପ୍ରତିକ ଅଭିଲେଖକୁ ପୁନର୍ଧାରଣ କରନ୍ତୁ" -#: ../src/ui.h:165 +#: ../src/ui.h:150 +msgid "Save As…" +msgstr "ଏହିପରି ଭାବରେ ସଂରକ୍ଷଣ କରନ୍ତୁ …" + +#: ../src/ui.h:151 msgid "Save the current archive with a different name" msgstr "ବର୍ତ୍ତମାନ ଅଭିଲେଖକୁ ଗୋଟିଏ ଭିନ୍ନ ନାମରେ ସଂରକ୍ଷିତ କରନ୍ତୁ" -#: ../src/ui.h:169 +#: ../src/ui.h:155 msgid "Select all files" msgstr "ସବୁ ଫାଇଲ ମାନଙ୍କୁ ଚୟନ କରନ୍ତୁ" -#: ../src/ui.h:173 -msgid "Stop current operation" -msgstr "ସମ୍ପ୍ରତିକ କାର୍ଯ୍ଯକୁ ବନ୍ଦ କରନ୍ତୁ" - -#: ../src/ui.h:176 +#: ../src/ui.h:158 msgid "_Test Integrity" msgstr "ସମ୍ପୂର୍ଣ୍ଣତାକୁ ଯାଞ୍ଚ କରନ୍ତୁ (_T) " -#: ../src/ui.h:177 +#: ../src/ui.h:159 msgid "Test whether the archive contains errors" msgstr "ଅଭିଲେଖରେ କୌଣସି ତ୍ରୁଟି ଅଛି କି ନାହିଁ ତାହା ଯାଞ୍ଚ କରନ୍ତୁ" -#: ../src/ui.h:181 ../src/ui.h:185 +#: ../src/ui.h:163 ../src/ui.h:167 msgid "Open the selected file" msgstr "ଚୟିତ ଫାଇଲକୁ ଖୋଲନ୍ତୁ" -#: ../src/ui.h:189 ../src/ui.h:193 +#: ../src/ui.h:171 ../src/ui.h:175 msgid "Open the selected folder" msgstr "ଚୟିତ ଫୋଲଡରକୁ ଖୋଲନ୍ତୁ" -#: ../src/ui.h:198 +#: ../src/ui.h:180 msgid "Go to the previous visited location" msgstr "ପୂର୍ବବର୍ତ୍ତୀ ପରିଦର୍ଶିତ ସ୍ଥାନକୁ ଯାଆନ୍ତୁ" -#: ../src/ui.h:202 +#: ../src/ui.h:184 msgid "Go to the next visited location" msgstr "ପରବର୍ତ୍ତୀ ପରିଦର୍ଶିତ ସ୍ଥାନକୁ ଯାଆନ୍ତୁ" -#: ../src/ui.h:206 -msgid "Go up one level" -msgstr "ଗୋଟିଏ ସ୍ତର ଉପରକୁ ଯାଆନ୍ତୁ" - -#: ../src/ui.h:210 +#. Translators: the home location is the home folder. +#: ../src/ui.h:193 msgid "Go to the home location" msgstr "ମୂଳସ୍ଥାନ ପଞ୍ଜିକାକୁ ଯାଆନ୍ତୁ" -#: ../src/ui.h:218 +#: ../src/ui.h:201 msgid "_Toolbar" msgstr "ସାଧନ ପଟି (_T)" -#: ../src/ui.h:219 +#: ../src/ui.h:202 msgid "View the main toolbar" msgstr "ପ୍ରମୂଖ ସାଧନ ପଟିକୁ ଦେଖନ୍ତୁ" -#: ../src/ui.h:223 +#: ../src/ui.h:206 msgid "Stat_usbar" msgstr "ଅବସ୍ଥିତି ପଟି (_u)" -#: ../src/ui.h:224 +#: ../src/ui.h:207 msgid "View the statusbar" msgstr "ଅବସ୍ଥିତି ପଟିକୁ ଦେଖନ୍ତୁ" -#: ../src/ui.h:228 -msgid "_Reversed Order" -msgstr "ବିପରୀତ କ୍ରମ (_R)" - -#: ../src/ui.h:229 -msgid "Reverse the list order" -msgstr "ତାଲିକା କ୍ରମକୁ ଓଲଟାନ୍ତୁ" - -#: ../src/ui.h:233 +#: ../src/ui.h:211 msgid "_Folders" msgstr "ଫୋଲଡର (_F)" -#: ../src/ui.h:234 -msgid "View the folders pane" -msgstr "ଫୋଲଡର ପରଦାଖଣ୍ଡକୁ ଦେଖନ୍ତୁ" - -#: ../src/ui.h:243 +#: ../src/ui.h:221 msgid "View All _Files" msgstr "ସମସ୍ତ ଫାଇଲ ମାନଙ୍କୁ ଦେଖନ୍ତୁ (_F)" -#: ../src/ui.h:246 +#: ../src/ui.h:224 msgid "View as a F_older" msgstr "ଗୋଟିଏ ଫୋଲଡର ଭାବରେ ଦେଖନ୍ତୁ (_o)" -#: ../src/ui.h:254 -msgid "by _Name" -msgstr "ନାମ ଅନୁଯାୟୀ (_N)" - -#: ../src/ui.h:255 -msgid "Sort file list by name" -msgstr "ଫାଇଲକୁ ନାମ ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" - -#: ../src/ui.h:257 -msgid "by _Size" -msgstr "ଆକାର ଅନୁଯାୟୀ (_S)" - -#: ../src/ui.h:258 -msgid "Sort file list by file size" -msgstr "ଫାଇଲକୁ ଆକାର ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" - -#: ../src/ui.h:260 -msgid "by T_ype" -msgstr "ପ୍ରକାର ଅନୁଯାୟୀ (_y)" - -#: ../src/ui.h:261 -msgid "Sort file list by type" -msgstr "ଫାଇଲକୁ ପ୍ରକାର ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" - -#: ../src/ui.h:263 -msgid "by _Date modified" -msgstr "ରୂପାନ୍ତରିତ ତାରିଖ ଅନୁଯାୟୀ (_D)" - -#: ../src/ui.h:264 -msgid "Sort file list by modification time" -msgstr "ଫାଇଲକୁ ରୂପାନ୍ତରିତ ତାରିଖ ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" - -#: ../src/ui.h:266 -msgid "by _Location" -msgstr "ଅବସ୍ଥାନ ଅନୁଯାୟୀ (_L)" - -#: ../src/ui.h:267 -msgid "Sort file list by location" -msgstr "ଫାଇଲକୁ ଅବସ୍ଥାନ ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" +#: ../src/ui/new-archive-dialog-options.ui.h:2 +#: ../src/ui/new-archive-dialog.ui.h:5 +msgid "_Encrypt the file list too" +msgstr "ଫାଇଲ ତାଲିକାକୁ ମଧ୍ଯ ସଂଗୁପ୍ତ କରନ୍ତୁ (_E)" + +#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. +#: ../src/ui/new-archive-dialog-options.ui.h:3 +#: ../src/ui/new-archive-dialog.ui.h:7 +#| msgid "Split in _volumes of" +msgid "Split into _volumes of" +msgstr "ଭଲ୍ୟୁମଗୁଡ଼ିକୁ ଅଲଗାକରନ୍ତୁ (_v)" + +#. MB means megabytes +#: ../src/ui/new-archive-dialog-options.ui.h:5 +#: ../src/ui/new-archive-dialog.ui.h:9 +msgid "MB" +msgstr "MB" + +#: ../src/ui/new-archive-dialog-options.ui.h:6 +#: ../src/ui/new-archive-dialog.ui.h:10 +msgid "_Other Options" +msgstr "ଅନ୍ୟାନ୍ୟ ବିକଳ୍ପଗୁଡ଼ିକ (_O)" + +#: ../src/ui/new-archive-dialog.ui.h:1 +msgid "_Filename:" +msgstr "ଫାଇଲ ନାମ (_F):" + +#: ../src/ui/new-archive-dialog.ui.h:3 +msgid "Location" +msgstr "ଅବସ୍ଥାନ" + +#: ../src/ui/password.ui.h:1 +msgid "Password" +msgstr "ପ୍ରବେଶ ସଙ୍କେତ" + +#: ../src/ui/password.ui.h:2 +#| msgid "_Encrypt the file list too" +msgid "_Encrypt the file list" +msgstr "ଫାଇଲ ତାଲିକାକୁ ସଂଗୁପ୍ତ କରନ୍ତୁ (_E)" + +#: ../src/ui/properties.ui.h:1 +#| msgid "Name:" +msgctxt "File" +msgid "Name:" +msgstr "ନାମ:" + +#: ../src/ui/properties.ui.h:2 +msgid "Archive size:" +msgstr "ଅଭିଲେଖ ଆକାର:" + +#. after the colon there is a folder name. +#: ../src/ui/properties.ui.h:4 +msgid "Location:" +msgstr "ଅବସ୍ଥାନ:" + +#: ../src/ui/properties.ui.h:5 +msgid "Compression ratio:" +msgstr "ସଙ୍କୋଚନ ହାର:" + +#: ../src/ui/properties.ui.h:6 +#| msgid "Date Modified" +msgid "Last modified:" +msgstr "ଶେଷଥର ପରିବର୍ତ୍ତିତ:" + +#: ../src/ui/properties.ui.h:7 +msgid "Content size:" +msgstr "ସୂଚୀପତ୍ର ଆକାର:" + +#: ../src/ui/properties.ui.h:8 +msgid "Number of files:" +msgstr "ଫାଇଲ ମାନଙ୍କ ସଂଖ୍ଯା:" + +#. after the colon there is a file type. +#: ../src/ui/properties.ui.h:10 +#| msgid "Type" +msgid "Type:" +msgstr "ପ୍ରକାର:" + +#: ../src/ui/update.ui.h:1 +msgid "_Update" +msgstr "ଅଦ୍ୟତନ କରନ୍ତୁ (_U)" + +#: ../src/ui/update.ui.h:3 +msgid "S_elect the files you want to update:" +msgstr "ଆପଣ ଅଦ୍ୟତନ କରିବାକୁ ଚାହୁଁଥିବା ଫାଇଲଗୁଡିକୁ ଚୟନକରନ୍ତୁ (_e)" + +#~ msgid "Password required" +#~ msgstr "ପ୍ରବେଶ ସଂକେତ ଆବଶ୍ୟକ" + +#~ msgid "Archive _type:" +#~ msgstr "ଅଭିଲେଖ ପ୍ରକାର (_t):" + +#~ msgid "A_vailable application:" +#~ msgstr "ଉପଲବ୍ଧ ପ୍ରୟୋଗ (_v):" + +#~ msgid "Open Files" +#~ msgstr "ଫାଇଲ ମାନଙ୍କୁ ଖୋଲନ୍ତୁ" + +#~ msgid "R_ecent applications:" +#~ msgstr "ସମ୍ପ୍ରତିକ ପ୍ରୟୋଗ (_e):" + +#~ msgid "_Application:" +#~ msgstr "ପ୍ରୟୋଗ (_A):" + +#~ msgid "" +#~ "Note: the password will be used to encrypt files you add to the " +#~ "current archive, and to decrypt files you extract from the current " +#~ "archive. When the archive is closed the password will be deleted." +#~ msgstr "" +#~ "ଟିପ୍ପଣୀ: ସାମ୍ପ୍ରତିକ ଅଭିଲେଖରେ ଆପଣ ଯୋଗ କରୁଥିବା ଫାଇଲ ମାନଙ୍କୁ ଏନକ୍ରିପ୍ଟ କରିବା " +#~ "ପାଇଁ, ଏବଂ ସାମ୍ପ୍ରତିକ ଅଭିଲେଖରୁ ଆପଣ କାଢୁଥିବା ଫାଇଲ ମାନଙ୍କୁ ଡିକ୍ରିପ୍ଟ କରିବା ପାଇଁ ପ୍ରବେଶ ସଙ୍କେତକୁ " +#~ "ବ୍ଯବହାର କରାଯିବ। ଅଭିଲେଖଟି ବନ୍ଦ ହେଲେ ପ୍ରବେଶ ସଙ୍କେତଟି ମଧ୍ଯ ଅପସାରିତ ହୋଇଯିବ।" + +#~ msgid "" +#~ "File Roller is free software; you can redistribute it and/or modify it " +#~ "under the terms of the GNU General Public License as published by the " +#~ "Free Software Foundation; either version 2 of the License, or (at your " +#~ "option) any later version." +#~ msgstr "" +#~ "ଫାଇଲ ରୋଲର ଗୋଟିଏ ମୁକ୍ତ ସଫ୍ଟୱେର; ଆପଣ ଏହାକୁ ମୁକ୍ତ ସଫ୍ଟୱେର ପ୍ରତିଷ୍ଠାନ ; ପ୍ରମାଣପତ୍ରର ସଂସ୍କରଣ " +#~ "୨, ଅଥବା (ଆପଣଙ୍କ ପସନ୍ଦ ଅନୁଯାୟୀ) କୌଣସି ପରବର୍ତ୍ତୀ ସଂସ୍କରଣ ଦ୍ୱାରା ପ୍ରକାଶିତ GNU ସାଧାରଣ " +#~ "ସାର୍ବଜନୀନ ପ୍ରମାଣପତ୍ରର ନିୟମାନୁସାରେ ପୁନର୍ବଣ୍ଟନ କରିପାରିବେ ଏବଂ/କିମ୍ୱା ପରିବର୍ତ୍ତନ କରିପାରିବେ।" + +#~ msgid "" +#~ "File Roller is distributed in the hope that it will be useful, but " +#~ "WITHOUT ANY WARRANTY; without even the implied warranty of " +#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " +#~ "Public License for more details." +#~ msgstr "" +#~ "ଫାଇଲ ରୋଲରଟି ବ୍ୟବହାର ଉପଯୋଗୀ ହେବା ଆଶାରେ ବଣ୍ଟନ କରାଯାଇଥିଲା, କିନ୍ତୁ କୌଣସି ନିର୍ଭରୋକ୍ତି ବିନା; " +#~ "ବିକ୍ରୟଯୋଗ୍ଯତା ନିର୍ଭରୋକ୍ତି କିମ୍ଭା କୌଣସି ନିର୍ଦ୍ଦିଷ୍ଠ କାର୍ଯ୍ଯ ପାଇଁ ମେଳକ ବିନା ମଧ୍ଯ। ଅଧିକ ବିସ୍ତ୍ରୁତ " +#~ "ବିବରଣୀ ପାଇଁ GNU ସାଧାରଣ ସାର୍ବଜନୀନ ଅନୁମତି ପତ୍ର ଦେଖନ୍ତୁ।" + +#~ msgid "" +#~ "You should have received a copy of the GNU General Public License along " +#~ "with File Roller; if not, write to the Free Software Foundation, Inc., 51 " +#~ "Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" +#~ msgstr "" +#~ "ଆପଣ ଫାଇଲ ରୋଲର ସହିତ GNU ସାଧାରଣ ସାର୍ବଜନୀନ ପ୍ରମାଣପତ୍ରର ଗୋଟିଏ ନକଲ ପାଇଥିବା ଉଚିତ; ଯଦି " +#~ "ନୁହଁ, ତେବେ ମୁକ୍ତ ସଫ୍ଟୱେର ପ୍ରତିଷ୍ଠାନ, Inc., 51 Franklin St, Fifth Floor, Boston, " +#~ "MA 02110-1301 USA କୁ ଲେଖନ୍ତୁ।" + +#~ msgid "Add a Folder" +#~ msgstr "ଗୋଟିଏ ଫୋଲଡର ଯୋଗ କରନ୍ତୁ" + +#~ msgid "_Include subfolders" +#~ msgstr "ଉପ-ଫୋଲଡର ମାନଙ୍କୁ ଅନ୍ତର୍ଭୂକ୍ତ କରନ୍ତୁ (_I)" + +#~ msgid "Exclude folders that are symbolic lin_ks" +#~ msgstr "ପ୍ରତୀକାତ୍ମକ ସମ୍ପର୍କ ବିଶିଷ୍ଟ ଫୋଲଡର ମାନଙ୍କୁ ବାଦ ଦିଅନ୍ତୁ (_k)" + +#~ msgid "Sa_ve Options" +#~ msgstr "ବିକଲ୍ପକୁ ସଂରକ୍ଷଣ କରନ୍ତୁ (_v)" + +#~ msgid "" +#~ "You don't have the right permissions to create an archive in the " +#~ "destination folder." +#~ msgstr "ଲକ୍ଷ୍ଯ ଫୋଲଡରରେ ଗୋଟିଏ ଅଭିଲେଖ ସ୍ରୁଷ୍ଟି କରିବା ପାଇଁ ଆପଣଙ୍କ ନିକଟରେ ଉପଯୁକ୍ତ ଅନୁମତି ନାହିଁ।" + +#~ msgid "_Overwrite" +#~ msgstr "ନବଲିଖନ କରନ୍ତୁ (_O)" + +#~ msgid "Re-crea_te folders" +#~ msgstr "ଫୋଲଡର ମାନଙ୍କୁ ପୁନଃ ସୃଷ୍ଟି କରନ୍ତୁ (_t)" + +#~ msgid "Over_write existing files" +#~ msgstr "ଅବସ୍ଥିତ ଫାଇଲ ମାନଙ୍କୁ ନବଲିଖନ କରନ୍ତୁ (_w)" + +#~ msgid "Automatic" +#~ msgstr "ସ୍ବୟଂଚାଳିତ" + +#~ msgid "New" +#~ msgstr "ନୂତନ" + +#~ msgid "Adding file: " +#~ msgstr "ଫାଇଲ ଯୋଗ କରୁଅଛି: " + +#~ msgid "Extracting file: " +#~ msgstr "ଫାଇଲ କାଢୁଅଛି: " + +#~ msgid "Creating archive" +#~ msgstr "ଅଭିଲେଖନକୁ ସୃଷ୍ଟିକରୁଅଛି" + +#~ msgid "Loading archive" +#~ msgstr "ଅଭିଲେଖନକୁ ଧାରଣ କରୁଅଛି" + +#~ msgid "Reading archive" +#~ msgstr "ଅଭିଲେଖକୁ ପଢୁଅଛି" + +#~ msgid "Testing archive" +#~ msgstr "ଅଭିଲେଖକୁ ଯାଞ୍ଚ କରୁଅଛି" + +#~ msgid "Saving archive" +#~ msgstr "ଅଭିଲେଖକୁ ସଂରକ୍ଷିତ କରୁଅଛି" + +#~ msgid "wait please..." +#~ msgstr "ଦୟାକରି ଅପେକ୍ଷା କରନ୍ତୁ ..." + +#~ msgid "The new name is void." +#~ msgstr "ନୂତନ ନାମଟି ଶୂନ୍ଯ ଅଟେ।" + +#~ msgid "The new name is equal to the old one." +#~ msgstr "ନୂତନ ନାମଟି ପୁରାତନ ନାମ ସହିତ ସମାନ।" + +#~ msgid "7-Zip (.7z)" +#~ msgstr "7-Zip (.7z)" + +#~ msgid "Tar compressed with 7z (.tar.7z)" +#~ msgstr "7z (.tar.7z) ଦ୍ବାରା ସଙ୍କୁଚିତ Tar" + +#~ msgid "Ace (.ace)" +#~ msgstr "Ace (.ace)" + +#~ msgid "Ar (.ar)" +#~ msgstr "Ar (.ar)" + +#~ msgid "Arj (.arj)" +#~ msgstr "Arj (.arj)" + +#~ msgid "Tar compressed with bzip2 (.tar.bz2)" +#~ msgstr "bzip2 ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.bz2)" + +#~ msgid "Tar compressed with bzip (.tar.bz)" +#~ msgstr "bzip ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.bz)" + +#~ msgid "Cabinet (.cab)" +#~ msgstr "କେବିନେଟ (.cab)" + +#~ msgid "Rar Archived Comic Book (.cbr)" +#~ msgstr "Rar ଆଲେଖି ହାସ୍ୟାସ୍ପଦ ବହି (.cbr)" + +#~ msgid "Zip Archived Comic Book (.cbz)" +#~ msgstr "Zip ଆଲେଖି ହାସ୍ୟାସ୍ପଦ ବହି (.cbz)" + +#~ msgid "Tar compressed with gzip (.tar.gz)" +#~ msgstr "gzip ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.gz)" + +#~ msgid "Ear (.ear)" +#~ msgstr "Ear (.ear)" + +#~ msgid "Self-extracting zip (.exe)" +#~ msgstr "ସ୍ୱତ-ନିର୍ଯ୍ଯାସିତ zip (.exe)" + +#~ msgid "Jar (.jar)" +#~ msgstr "Jar (.jar)" + +#~ msgid "Lha (.lzh)" +#~ msgstr "Lha (.lzh)" + +#~| msgid "Tar compressed with lzop (.tar.lzo)" +#~ msgid "Tar compressed with lzip (.tar.lz)" +#~ msgstr "lzip ସହିତ Tar ସଙ୍କୁଚିତ ହୋଇଛି (.tar.lz)" + +#~ msgid "Tar compressed with lzma (.tar.lzma)" +#~ msgstr "lzma (.tar.lzma) ଦ୍ୱାରା ସଙ୍କୁଚିତ Tar " + +#~ msgid "Tar compressed with lzop (.tar.lzo)" +#~ msgstr "lzop ଦ୍ବାରା ସଙ୍କୁଚିତ tar (.tar.lzo)" + +#~ msgid "Rar (.rar)" +#~ msgstr "Rar (.rar)" + +#~ msgid "Tar uncompressed (.tar)" +#~ msgstr "ଅସଙ୍କୁଚିତ tar (.tar)" + +#~ msgid "Tar compressed with compress (.tar.Z)" +#~ msgstr "ସଙ୍କୋଚନ ଦ୍ବାରା Tar ସଙ୍କୁଚିତ ହୋଇଛି (.tar.Z)" + +#~ msgid "War (.war)" +#~ msgstr "War (.war)" + +#~ msgid "Xz (.xz)" +#~ msgstr "Xz (.xz)" + +#~| msgid "Tar compressed with 7z (.tar.7z)" +#~ msgid "Tar compressed with xz (.tar.xz)" +#~ msgstr "xz ସହିତ Tar ସଙ୍କୁଚିତ ହୋଇଛି (.tar.xz)" + +#~ msgid "Zoo (.zoo)" +#~ msgstr "Zoo (.zoo)" + +#~ msgid "Zip (.zip)" +#~ msgstr "Zip (.zip)" + +#~| msgid "_Files:" +#~ msgid "_File" +#~ msgstr "ଫାଇଲ (_F)" + +#~ msgid "_Add Files..." +#~ msgstr "ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ ... (_A)" + +#~ msgid "Add a _Folder..." +#~ msgstr "ଗୋଟିଏ ଫୋଲଡର ଯୋଗ କରନ୍ତୁ ... (_F)" + +#~ msgid "Add a folder to the archive" +#~ msgstr "ଫାଇଲ ମାନଙ୍କୁ ଯୋଗ କରନ୍ତୁ" + +#~ msgid "Add Folder" +#~ msgstr "ଫୋଲଡର ଯୋଗ କରନ୍ତୁ" + +#~ msgid "_Rename..." +#~ msgstr "ନାମ ବଦଳାନ୍ତୁ ... (_R)" + +#~ msgid "_Extract..." +#~ msgstr "କାଢନ୍ତୁ ... (_E)" + +#~ msgid "_Last Output" +#~ msgstr "ଅନ୍ତିମ ନିର୍ଗମ (_L)" + +#~ msgid "View the output produced by the last executed command" +#~ msgstr "ଅନ୍ତିମ ନିଷ୍ପିଦିତ ନିର୍ଦ୍ଦେଶ ଦ୍ବାରା ଉତ୍ପନ୍ନ ନିର୍ଗମକୁ ଦେଖନ୍ତୁ" + +#~ msgid "Pass_word..." +#~ msgstr "ପ୍ରବେଶ ସଙ୍କେତ ... (_P)" + +#~ msgid "Stop current operation" +#~ msgstr "ସମ୍ପ୍ରତିକ କାର୍ଯ୍ଯକୁ ବନ୍ଦ କରନ୍ତୁ" + +#~ msgid "_Reversed Order" +#~ msgstr "ବିପରୀତ କ୍ରମ (_R)" + +#~ msgid "Reverse the list order" +#~ msgstr "ତାଲିକା କ୍ରମକୁ ଓଲଟାନ୍ତୁ" + +#~ msgid "by _Name" +#~ msgstr "ନାମ ଅନୁଯାୟୀ (_N)" + +#~ msgid "Sort file list by name" +#~ msgstr "ଫାଇଲକୁ ନାମ ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" + +#~ msgid "by _Size" +#~ msgstr "ଆକାର ଅନୁଯାୟୀ (_S)" + +#~ msgid "Sort file list by file size" +#~ msgstr "ଫାଇଲକୁ ଆକାର ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" + +#~ msgid "by T_ype" +#~ msgstr "ପ୍ରକାର ଅନୁଯାୟୀ (_y)" + +#~ msgid "Sort file list by type" +#~ msgstr "ଫାଇଲକୁ ପ୍ରକାର ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" + +#~ msgid "by _Date modified" +#~ msgstr "ରୂପାନ୍ତରିତ ତାରିଖ ଅନୁଯାୟୀ (_D)" + +#~ msgid "Sort file list by modification time" +#~ msgstr "ଫାଇଲକୁ ରୂପାନ୍ତରିତ ତାରିଖ ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" + +#~ msgid "by _Location" +#~ msgstr "ଅବସ୍ଥାନ ଅନୁଯାୟୀ (_L)" +#~ msgid "Sort file list by location" +#~ msgstr "ଫାଇଲକୁ ଅବସ୍ଥାନ ଅନୁଯାୟୀ ସଜାଡନ୍ତୁ" diff -Nru file-roller-3.6.0/po/pl.po file-roller-3.6.3/po/pl.po --- file-roller-3.6.0/po/pl.po 2012-09-03 18:34:24.000000000 +0000 +++ file-roller-3.6.3/po/pl.po 2012-11-25 09:54:36.000000000 +0000 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: file-roller\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-09-02 23:11+0200\n" -"PO-Revision-Date: 2012-09-02 23:12+0200\n" +"POT-Creation-Date: 2012-11-24 19:49+0100\n" +"PO-Revision-Date: 2012-11-24 19:50+0100\n" "Last-Translator: Piotr Drąg \n" "Language-Team: Polish \n" "Language: pl\n" @@ -91,8 +91,8 @@ msgid "Show session management options" msgstr "Wyświetla opcje zarządzania sesją" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1955 -#: ../src/fr-window.c:5329 +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1960 +#: ../src/fr-window.c:5340 msgid "Archive Manager" msgstr "Menedżer archiwów" @@ -100,6 +100,10 @@ msgid "Create and modify an archive" msgstr "Tworzenie i modyfikowanie archiwów" +#: ../data/file-roller.desktop.in.in.h:3 +msgid "zip;tar;extract;unpack;" +msgstr "zip;tar;rozpakuj;rozpakowanie;rozpakowywanie;" + #: ../data/org.gnome.FileRoller.gschema.xml.in.h:1 msgid "How to sort files" msgstr "Jak porządkować pliki" @@ -286,11 +290,11 @@ msgid "Create a compressed archive with the selected objects" msgstr "Tworzy skompresowane archiwum z zaznaczonych obiektów" -#: ../src/actions.c:112 ../src/fr-window.c:5624 ../src/fr-window.c:6163 +#: ../src/actions.c:112 ../src/fr-window.c:5635 ../src/fr-window.c:6180 msgid "Open" msgstr "Otwórz" -#: ../src/actions.c:125 ../src/fr-window.c:5167 +#: ../src/actions.c:125 ../src/fr-window.c:5179 msgid "All archives" msgstr "Wszystkie archiwa" @@ -340,7 +344,7 @@ msgstr "Wczytanie opcji" #. save options -#: ../src/dlg-add.c:209 ../src/dlg-add.c:824 +#: ../src/dlg-add.c:209 ../src/dlg-add.c:827 msgid "Save Options" msgstr "Zapis opcji" @@ -349,7 +353,7 @@ msgid "Reset Options" msgstr "Przywróć domyślne opcje" -#: ../src/dlg-add.c:825 +#: ../src/dlg-add.c:828 msgid "_Options Name:" msgstr "Nazwa _opcji:" @@ -363,11 +367,11 @@ msgid "Wrong password." msgstr "Błędne hasło." -#: ../src/dlg-batch-add.c:81 ../src/main.c:410 ../src/main.c:776 +#: ../src/dlg-batch-add.c:87 ../src/main.c:417 ../src/main.c:793 msgid "Compress" msgstr "Kompresja" -#: ../src/dlg-extract.c:96 ../src/fr-window.c:6708 +#: ../src/dlg-extract.c:96 ../src/fr-window.c:6727 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -378,22 +382,22 @@ "\n" "Utworzyć go?" -#: ../src/dlg-extract.c:105 ../src/fr-window.c:6717 +#: ../src/dlg-extract.c:105 ../src/fr-window.c:6736 msgid "Create _Folder" msgstr "U_twórz katalog" #: ../src/dlg-extract.c:124 ../src/dlg-extract.c:142 ../src/dlg-extract.c:169 -#: ../src/fr-window.c:4116 ../src/fr-window.c:6612 ../src/fr-window.c:6617 -#: ../src/fr-window.c:6738 ../src/fr-window.c:6757 ../src/fr-window.c:6762 +#: ../src/fr-window.c:4125 ../src/fr-window.c:6631 ../src/fr-window.c:6636 +#: ../src/fr-window.c:6757 ../src/fr-window.c:6776 ../src/fr-window.c:6781 msgid "Extraction not performed" msgstr "Nie przeprowadzono rozpakowania plików" -#: ../src/dlg-extract.c:125 ../src/fr-window.c:6734 +#: ../src/dlg-extract.c:125 ../src/fr-window.c:6753 #, c-format msgid "Could not create the destination folder: %s." msgstr "Nie można utworzyć katalogu docelowego: %s." -#: ../src/dlg-extract.c:170 ../src/fr-window.c:4282 ../src/fr-window.c:4366 +#: ../src/dlg-extract.c:170 ../src/fr-window.c:4291 ../src/fr-window.c:4375 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" @@ -404,18 +408,18 @@ msgid "Extract" msgstr "Rozpakuj" -#: ../src/dlg-package-installer.c:107 ../src/dlg-package-installer.c:220 +#: ../src/dlg-package-installer.c:112 ../src/dlg-package-installer.c:225 msgid "There was an internal error trying to search for applications:" msgstr "Wystąpił wewnętrzny błąd podczas próby wyszukania programów:" -#: ../src/dlg-package-installer.c:269 ../src/dlg-package-installer.c:278 -#: ../src/dlg-package-installer.c:306 ../src/fr-archive.c:819 -#: ../src/fr-window.c:3846 ../src/fr-window.c:7313 ../src/fr-window.c:7669 -#: ../src/fr-window.c:9210 +#: ../src/dlg-package-installer.c:294 ../src/dlg-package-installer.c:303 +#: ../src/dlg-package-installer.c:331 ../src/fr-archive.c:742 +#: ../src/fr-window.c:3855 ../src/fr-window.c:7333 ../src/fr-window.c:7689 +#: ../src/fr-window.c:9227 msgid "Archive type not supported." msgstr "Nieobsługiwany typ archiwum." -#: ../src/dlg-package-installer.c:288 +#: ../src/dlg-package-installer.c:313 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -424,11 +428,11 @@ "Nie zainstalowano polecenia dla plików %s.\n" "Wyszukać polecenie, aby otworzyć ten plik?" -#: ../src/dlg-package-installer.c:293 +#: ../src/dlg-package-installer.c:318 msgid "Could not open this file type" msgstr "Nie można otworzyć pliku tego typu" -#: ../src/dlg-package-installer.c:296 +#: ../src/dlg-package-installer.c:321 msgid "_Search Command" msgstr "Wy_szukaj polecenie" @@ -472,15 +476,15 @@ msgid "Update the files in the archive \"%s\"?" msgstr "Zaktualizować pliki w archiwum \"%s\"?" -#: ../src/fr-archive.c:1944 +#: ../src/fr-archive.c:1842 msgid "You don't have the right permissions." msgstr "Brak uprawnień." -#: ../src/fr-archive.c:1944 +#: ../src/fr-archive.c:1842 msgid "This archive type cannot be modified" msgstr "Tego typu archiwum nie można modyfikować" -#: ../src/fr-archive.c:1958 +#: ../src/fr-archive.c:1856 msgid "You can't add an archive to itself." msgstr "Nie można dodać pliku archiwum do niego samego." @@ -492,7 +496,7 @@ msgstr "Dodawanie pliku \"%s\"" #. Translators: %s is a filename. -#: ../src/fr-command-7z.c:420 ../src/fr-command-rar.c:455 +#: ../src/fr-command-7z.c:424 ../src/fr-command-rar.c:455 #: ../src/fr-command-tar.c:426 #, c-format msgid "Extracting \"%s\"" @@ -536,7 +540,7 @@ #: ../src/fr-new-archive-dialog.c:335 ../src/fr-new-archive-dialog.c:354 #: ../src/fr-new-archive-dialog.c:370 ../src/fr-new-archive-dialog.c:418 -#: ../src/fr-window.c:2814 +#: ../src/fr-window.c:2823 msgid "Could not create the archive" msgstr "Nie można utworzyć archiwum" @@ -559,7 +563,7 @@ "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:447 ../src/fr-window.c:6550 +#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:6569 msgid "_Replace" msgstr "_Zastąp" @@ -579,11 +583,11 @@ msgid "_Extract" msgstr "R_ozpakuj" -#: ../src/fr-window.c:1043 +#: ../src/fr-window.c:1045 msgid "Operation completed" msgstr "Ukończono działanie" -#: ../src/fr-window.c:1160 +#: ../src/fr-window.c:1162 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" @@ -591,7 +595,7 @@ msgstr[1] "%d obiekty (%s)" msgstr[2] "%d obiektów (%s)" -#: ../src/fr-window.c:1165 +#: ../src/fr-window.c:1167 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" @@ -599,102 +603,102 @@ msgstr[1] "Zaznaczono %d obiekty (%s)" msgstr[2] "Zaznaczono %d obiektów (%s)" -#: ../src/fr-window.c:1584 +#: ../src/fr-window.c:1587 msgid "Folder" msgstr "Katalog" -#: ../src/fr-window.c:1963 +#: ../src/fr-window.c:1968 msgid "[read only]" msgstr "[tylko do odczytu]" -#: ../src/fr-window.c:2082 +#: ../src/fr-window.c:2087 #, 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:2173 ../src/fr-window.c:2211 +#: ../src/fr-window.c:2178 ../src/fr-window.c:2216 #, c-format msgid "Creating \"%s\"" msgstr "Tworzenie pliku \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2177 +#: ../src/fr-window.c:2182 #, c-format msgid "Loading \"%s\"" msgstr "Wczytywanie pliku \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2181 +#: ../src/fr-window.c:2186 #, c-format msgid "Reading \"%s\"" msgstr "Odczytywanie pliku \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2185 +#: ../src/fr-window.c:2190 #, c-format msgid "Deleting the files from \"%s\"" msgstr "Usuwanie plików z \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2189 +#: ../src/fr-window.c:2194 #, c-format msgid "Testing \"%s\"" msgstr "Testowanie pliku \"%s\"" -#: ../src/fr-window.c:2192 +#: ../src/fr-window.c:2197 msgid "Getting the file list" msgstr "Pobieranie listy plików" #. Translators: %s is a filename -#: ../src/fr-window.c:2196 +#: ../src/fr-window.c:2201 #, 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:2200 +#: ../src/fr-window.c:2205 #, c-format msgid "Adding the files to \"%s\"" msgstr "Dodawanie plików do \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2204 +#: ../src/fr-window.c:2209 #, c-format msgid "Extracting the files from \"%s\"" msgstr "Rozpakowywanie plików z \"%s\"" -#: ../src/fr-window.c:2207 +#: ../src/fr-window.c:2212 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:2216 +#: ../src/fr-window.c:2221 #, c-format msgid "Saving \"%s\"" msgstr "Zapisywanie pliku \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2223 +#: ../src/fr-window.c:2228 #, c-format msgid "Renaming the files in \"%s\"" msgstr "Zmienianie nazw plików w \"%s\"" #. Translators: %s is a filename -#: ../src/fr-window.c:2227 +#: ../src/fr-window.c:2232 #, c-format msgid "Updating the files in \"%s\"" msgstr "Aktualizowanie plików w \"%s\"" -#: ../src/fr-window.c:2402 +#: ../src/fr-window.c:2407 msgid "_Open the Archive" msgstr "_Otwórz archiwum" -#: ../src/fr-window.c:2403 +#: ../src/fr-window.c:2408 msgid "_Show the Files" msgstr "_Wyświetl pliki" -#: ../src/fr-window.c:2520 +#: ../src/fr-window.c:2525 #, c-format msgid "%d file remaining" msgid_plural "%'d files remaining" @@ -702,188 +706,188 @@ msgstr[1] "Pozostały %'d pliki" msgstr[2] "Pozostało %'d plików" -#: ../src/fr-window.c:2524 ../src/fr-window.c:3097 +#: ../src/fr-window.c:2529 ../src/fr-window.c:3106 msgid "Please wait…" msgstr "Proszę czekać…" -#: ../src/fr-window.c:2580 +#: ../src/fr-window.c:2585 msgid "Extraction completed successfully" msgstr "Pomyślnie ukończono rozpakowywanie" #. Translators: %s is a filename -#: ../src/fr-window.c:2611 ../src/fr-window.c:6142 +#: ../src/fr-window.c:2617 ../src/fr-window.c:6159 #, c-format msgid "\"%s\" created successfully" msgstr "Pomyślnie utworzono \"%s\"" -#: ../src/fr-window.c:2701 ../src/fr-window.c:2870 +#: ../src/fr-window.c:2707 ../src/fr-window.c:2879 msgid "Command exited abnormally." msgstr "Polecenie zakończyło się z kodem błędu." -#: ../src/fr-window.c:2819 +#: ../src/fr-window.c:2828 msgid "An error occurred while extracting files." msgstr "Wystąpił błąd podczas rozpakowywania plików." -#: ../src/fr-window.c:2825 +#: ../src/fr-window.c:2834 #, c-format msgid "Could not open \"%s\"" msgstr "Nie można otworzyć \"%s\"" -#: ../src/fr-window.c:2830 +#: ../src/fr-window.c:2839 msgid "An error occurred while loading the archive." msgstr "Wystąpił błąd podczas wczytywania archiwum." -#: ../src/fr-window.c:2834 +#: ../src/fr-window.c:2843 msgid "An error occurred while deleting files from the archive." msgstr "Wystąpił błąd podczas podczas usuwania plików z archiwum." -#: ../src/fr-window.c:2840 +#: ../src/fr-window.c:2849 msgid "An error occurred while adding files to the archive." msgstr "Wystąpił błąd podczas podczas dodawania plików do archiwum." -#: ../src/fr-window.c:2844 +#: ../src/fr-window.c:2853 msgid "An error occurred while testing archive." msgstr "Wystąpił błąd podczas testowania archiwum." -#: ../src/fr-window.c:2849 +#: ../src/fr-window.c:2858 msgid "An error occurred while saving the archive." msgstr "Wystąpił błąd podczas zapisywania archiwum." -#: ../src/fr-window.c:2853 +#: ../src/fr-window.c:2862 msgid "An error occurred while renaming the files." msgstr "Wystąpił błąd podczas zmieniania nazw plików." -#: ../src/fr-window.c:2857 +#: ../src/fr-window.c:2866 msgid "An error occurred while updating the files." msgstr "Wystąpił błąd podczas aktualizowania plików." -#: ../src/fr-window.c:2861 +#: ../src/fr-window.c:2870 msgid "An error occurred." msgstr "Wystąpił błąd." -#: ../src/fr-window.c:2867 +#: ../src/fr-window.c:2876 msgid "Command not found." msgstr "Nie odnaleziono polecenia." -#: ../src/fr-window.c:3025 +#: ../src/fr-window.c:3034 msgid "Test Result" msgstr "Wyniki testu" -#: ../src/fr-window.c:3964 ../src/fr-window.c:8653 ../src/fr-window.c:8687 -#: ../src/fr-window.c:8966 +#: ../src/fr-window.c:3973 ../src/fr-window.c:8673 ../src/fr-window.c:8707 +#: ../src/fr-window.c:8986 msgid "Could not perform the operation" msgstr "Nie można wykonać działania" -#: ../src/fr-window.c:3990 +#: ../src/fr-window.c:3999 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:4020 +#: ../src/fr-window.c:4029 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:4023 +#: ../src/fr-window.c:4032 msgid "Create _Archive" msgstr "U_twórz archiwum" -#: ../src/fr-window.c:4052 ../src/fr-window.c:7123 +#: ../src/fr-window.c:4061 ../src/fr-window.c:7143 msgid "New Archive" msgstr "Nowe archiwum" -#: ../src/fr-window.c:4640 +#: ../src/fr-window.c:4649 msgid "Folders" msgstr "Katalogi" -#: ../src/fr-window.c:4678 ../src/ui/file-selector.ui.h:5 +#: ../src/fr-window.c:4687 ../src/ui/file-selector.ui.h:5 msgctxt "File" msgid "Size" msgstr "Rozmiar" -#: ../src/fr-window.c:4679 +#: ../src/fr-window.c:4688 msgctxt "File" msgid "Type" msgstr "Typ" -#: ../src/fr-window.c:4680 ../src/ui/file-selector.ui.h:6 +#: ../src/fr-window.c:4689 ../src/ui/file-selector.ui.h:6 msgctxt "File" msgid "Modified" msgstr "Zmodyfikowany" -#: ../src/fr-window.c:4681 +#: ../src/fr-window.c:4690 msgctxt "File" msgid "Location" msgstr "Położenie" -#: ../src/fr-window.c:4690 ../src/ui/file-selector.ui.h:4 +#: ../src/fr-window.c:4699 ../src/ui/file-selector.ui.h:4 msgctxt "File" msgid "Name" msgstr "Nazwa" -#: ../src/fr-window.c:5517 +#: ../src/fr-window.c:5528 msgid "Find:" msgstr "Znajdź:" #. Translators: this is the label for the "open recent file" sub-menu. -#: ../src/fr-window.c:5612 +#: ../src/fr-window.c:5623 msgid "Open _Recent" msgstr "O_twórz ostatnie" -#: ../src/fr-window.c:5613 ../src/fr-window.c:5625 +#: ../src/fr-window.c:5624 ../src/fr-window.c:5636 msgid "Open a recently used archive" msgstr "Otwiera ostatnio używane archiwum" #. Translators: after the colon there is a folder name. -#: ../src/fr-window.c:5697 ../src/ui/file-selector.ui.h:1 +#: ../src/fr-window.c:5708 ../src/ui/file-selector.ui.h:1 #: ../src/ui/new-archive-dialog.ui.h:2 msgid "_Location:" msgstr "_Położenie:" -#: ../src/fr-window.c:6538 +#: ../src/fr-window.c:6557 #, c-format msgid "Replace file \"%s\"?" msgstr "Zastąpić plik \"%s\"?" -#: ../src/fr-window.c:6541 +#: ../src/fr-window.c:6560 #, 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:6548 +#: ../src/fr-window.c:6567 msgid "Replace _All" msgstr "Z_astąp wszystkie" -#: ../src/fr-window.c:6549 +#: ../src/fr-window.c:6568 msgid "_Skip" msgstr "_Pomiń" -#: ../src/fr-window.c:7305 ../src/fr-window.c:7661 +#: ../src/fr-window.c:7325 ../src/fr-window.c:7681 #, c-format msgid "Could not save the archive \"%s\"" msgstr "Nie można zapisać archiwum \"%s\"" -#: ../src/fr-window.c:7432 +#: ../src/fr-window.c:7452 msgid "Save" msgstr "Zapisz" -#: ../src/fr-window.c:7755 +#: ../src/fr-window.c:7775 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:7977 +#: ../src/fr-window.c:7997 msgid "New name is void, please type a name." msgstr "Nowa nazwa jest pusta. Proszę wpisać nazwę." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7982 +#: ../src/fr-window.c:8002 msgid "New name is the same as old one, please type other name." msgstr "Nowa nazwa jest taka sama jak poprzednia. Proszę wpisać inną." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7987 +#: ../src/fr-window.c:8007 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " @@ -892,7 +896,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:8023 +#: ../src/fr-window.c:8043 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -903,11 +907,11 @@ "\n" "%s" -#: ../src/fr-window.c:8023 ../src/fr-window.c:8025 +#: ../src/fr-window.c:8043 ../src/fr-window.c:8045 msgid "Please use a different name." msgstr "Proszę użyć innej nazwy." -#: ../src/fr-window.c:8025 +#: ../src/fr-window.c:8045 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -918,56 +922,56 @@ "\n" "%s" -#: ../src/fr-window.c:8095 +#: ../src/fr-window.c:8115 msgid "Rename" msgstr "Zmień nazwę" -#: ../src/fr-window.c:8096 +#: ../src/fr-window.c:8116 msgid "_New folder name:" msgstr "_Nowa nazwa katalogu:" -#: ../src/fr-window.c:8096 +#: ../src/fr-window.c:8116 msgid "_New file name:" msgstr "_Nowa nazwa pliku:" -#: ../src/fr-window.c:8100 +#: ../src/fr-window.c:8120 msgid "_Rename" msgstr "Zmień n_azwę" -#: ../src/fr-window.c:8117 ../src/fr-window.c:8136 +#: ../src/fr-window.c:8137 ../src/fr-window.c:8156 msgid "Could not rename the folder" msgstr "Nie można zmienić nazwy katalogu" -#: ../src/fr-window.c:8117 ../src/fr-window.c:8136 +#: ../src/fr-window.c:8137 ../src/fr-window.c:8156 msgid "Could not rename the file" msgstr "Nie można zmienić nazwy pliku" #. Translators: %s are archive filenames -#: ../src/fr-window.c:8560 +#: ../src/fr-window.c:8580 #, 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:8563 +#: ../src/fr-window.c:8583 #, c-format msgid "Copying the files from \"%s\" to \"%s\"" msgstr "Kopiowanie plików z \"%s\" do \"%s\"" -#: ../src/fr-window.c:8614 +#: ../src/fr-window.c:8634 msgid "Paste Selection" msgstr "Wklejanie zaznaczenia" -#: ../src/fr-window.c:8615 +#: ../src/fr-window.c:8635 msgid "_Destination folder:" msgstr "Katalog _docelowy:" -#: ../src/fr-window.c:9228 +#: ../src/fr-window.c:9245 msgid "Add files to an archive" msgstr "Dodaje pliki do archiwum" -#: ../src/fr-window.c:9272 ../src/main.c:446 ../src/main.c:482 -#: ../src/main.c:508 ../src/main.c:800 +#: ../src/fr-window.c:9290 ../src/main.c:453 ../src/main.c:489 +#: ../src/main.c:515 ../src/main.c:817 msgid "Extract archive" msgstr "Rozpakowanie plików z archiwum" @@ -1037,11 +1041,11 @@ msgstr "Wyświetla wersję" #. manually set name and icon -#: ../src/main.c:627 +#: ../src/main.c:644 msgid "File Roller" msgstr "File Roller" -#: ../src/main.c:658 +#: ../src/main.c:675 msgid "- Create and modify an archive" msgstr "- Tworzenie i modyfikowanie archiwów" diff -Nru file-roller-3.6.0/po/sk.po file-roller-3.6.3/po/sk.po --- file-roller-3.6.0/po/sk.po 2012-04-16 19:15:56.000000000 +0000 +++ file-roller-3.6.3/po/sk.po 2012-10-13 11:25:15.000000000 +0000 @@ -1,24 +1,25 @@ # Slovak translation for file-roller. -# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2010, 2011, 2012 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2010-2012 Free Software Foundation, Inc. # This file is distributed under the same license as the file-roller package. # Stanislav Visnovsky , 2003. # Stanislav Visnovsky , 2004. # Peter Tuhársky , 2007. # Marcel Telka , 2005, 2006, 2010. -# Peter Mráz , 2010, 2011, 2012. +# Peter Mráz , 2010-2012. # msgid "" msgstr "" "Project-Id-Version: file-roller\n" "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=file-" "roller&keywords=I18N+L10N&component=general\n" -"POT-Creation-Date: 2012-02-29 09:03+0000\n" -"PO-Revision-Date: 2012-04-16 14:27+0200\n" +"POT-Creation-Date: 2012-10-09 14:25+0000\n" +"PO-Revision-Date: 2012-10-12 15:14+0200\n" "Last-Translator: Peter Mráz \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" +"Language: sk\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 1 : (n>=2 && n<=4) ? 2 : 0;\n" #: ../copy-n-paste/eggdesktopfile.c:165 @@ -30,7 +31,7 @@ #: ../copy-n-paste/eggdesktopfile.c:190 #, c-format msgid "Unrecognized desktop file Version '%s'" -msgstr "Nerozpoznaná verzia '%s' súboru pracovnej plochy" +msgstr "Nerozpoznaná verzia „%s“ súboru pracovnej plochy" #: ../copy-n-paste/eggdesktopfile.c:970 #, c-format @@ -85,8 +86,8 @@ msgid "Show session management options" msgstr "Zobraziť voľby správy relácie" -#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1981 -#: ../src/fr-window.c:5452 +#: ../data/file-roller.desktop.in.in.h:1 ../src/fr-window.c:1960 +#: ../src/fr-window.c:5340 msgid "Archive Manager" msgstr "Správca archívov" @@ -164,63 +165,51 @@ msgstr "Zobraziť stĺpec s cestou v hlavnom okne." #: ../data/org.gnome.FileRoller.gschema.xml.in.h:15 -msgid "Use mime icons" -msgstr "Použiť ikony mime" - -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:16 -msgid "" -"If true will display icons depending on the file type (slower), otherwise " -"will use always the same icon for all files (faster)." -msgstr "" -"Ak je hodnota true, zobrazené ikony závisia od typu súboru (pomalšie), v " -"opačnom prípade sa vždy použije rovnaká ikona pre všetky súbory (rýchlejšie)." - -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:17 msgid "Name column width" msgstr "Šírka stĺpca s názvom" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:18 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:16 msgid "The default width of the name column in the file list." msgstr "Predvolená šírka stĺpca s názvom v zozname súborov." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:17 msgid "Max history length" msgstr "Maximálna dĺžka histórie" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:18 msgid "Max number of items in the 'Open Recents' submenu." msgstr "Maximálny počet položiek v ponuke 'Otvoriť nedávne'." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:19 msgid "View toolbar" msgstr "Zobraziť lištu s nástrojmi" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:20 msgid "Whether to display the toolbar." msgstr "Či sa má zobraziť lišta s nástrojmi." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:21 msgid "View statusbar" msgstr "Zobraziť stavovú lištu" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:22 msgid "Whether to display the statusbar." msgstr "Či sa má zobraziť stavová lišta." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25 ../src/ui.h:229 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:23 ../src/ui.h:212 msgid "View the folders pane" msgstr "Zobraziť panel priečinkov" -# PK: panel s priecinkami -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26 +# PK: panel s priecinkami? +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:24 msgid "Whether to display the folders pane." msgstr "Či sa má zobraziť panel priečinkov." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:25 msgid "Editors" msgstr "Editory" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:26 msgid "" "List of applications entered in the 'Open File' dialog and not associated " "with the file type." @@ -228,11 +217,11 @@ "Zoznam aplikácií zadaných v dialógovom okne 'Otvoriť súbor', ktoré nie sú " "priradené k typom súborov." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:27 msgid "Compression level" msgstr "Úroveň kompresie" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:28 msgid "" "Compression level used when adding files to an archive. Possible values: " "very-fast, fast, normal, maximum." @@ -241,11 +230,11 @@ "very-fast (veľmi rýchla), fast (rýchla), normal (normálna), maximum " "(maximálna)." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:29 msgid "Encrypt the archive header" msgstr "Zašifrovať hlavičku archívu" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:30 msgid "" "Whether to encrypt the archive header. If the header is encrypted the " "password will be required to list the archive content as well." @@ -253,211 +242,68 @@ "Či sa má zašifrovať hlavička archívu. Ak je hlavička zašifrovaná, bude sa na " "zobrazenie obsahu archívu tiež vyžadovať heslo." -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:33 -msgid "Overwrite existing files" -msgstr "Prepísať existujúce súbory" - -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:34 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:31 msgid "Do not overwrite newer files" msgstr "Neprepisovať novšie súbory" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:35 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:32 msgid "Recreate the folders stored in the archive" msgstr "Znova vytvoriť priečinky uložené v archíve" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:36 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:33 msgid "Default volume size" msgstr "Predvolená veľkosť zväzku" -#: ../data/org.gnome.FileRoller.gschema.xml.in.h:37 +#: ../data/org.gnome.FileRoller.gschema.xml.in.h:34 msgid "The default size for volumes." msgstr "Predvolená veľkosť pre zväzky." -#: ../data/ui/add-options.ui.h:1 -msgid "Load Options" -msgstr "Načítať voľby" - -#: ../data/ui/batch-add-files.ui.h:1 -msgid "Compress" -msgstr "Komprimovať" - -#: ../data/ui/batch-add-files.ui.h:2 -msgid "_Filename:" -msgstr "Názov _súboru:" - -#. Translators: after the colon there is a folder name. -#: ../data/ui/batch-add-files.ui.h:3 ../src/fr-window.c:5905 -msgid "_Location:" -msgstr "_Umiestnenie:" - -# * https://bugzilla.gnome.org/show_bug.cgi?id=611359 -#: ../data/ui/batch-add-files.ui.h:4 -msgid "Location" -msgstr "Umiestnenie" - -#: ../data/ui/batch-add-files.ui.h:5 ../data/ui/batch-password.ui.h:2 -#: ../data/ui/new.ui.h:1 ../data/ui/password.ui.h:3 -msgid "_Password:" -msgstr "_Heslo:" - -#: ../data/ui/batch-add-files.ui.h:6 ../data/ui/new.ui.h:2 -msgid "_Encrypt the file list too" -msgstr "_Zašifrovať aj zoznam súborov" - -#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. -#: ../data/ui/batch-add-files.ui.h:8 ../data/ui/new.ui.h:3 -msgid "Split into _volumes of" -msgstr "_Rozdeliť na zväzky po" - -#. MB means megabytes -#: ../data/ui/batch-add-files.ui.h:10 ../data/ui/new.ui.h:5 -msgid "MB" -msgstr "MB" - -#: ../data/ui/batch-add-files.ui.h:11 ../data/ui/new.ui.h:6 -msgid "_Other Options" -msgstr "Ďalšie _možnosti" - -#: ../data/ui/batch-password.ui.h:1 -msgid "Password required" -msgstr "Je potrebné heslo" - -#: ../data/ui/delete.ui.h:1 -msgid "Delete" -msgstr "Odstrániť" - -#: ../data/ui/delete.ui.h:2 ../src/dlg-extract.c:348 -msgid "_Files:" -msgstr "_Súbory:" - -#: ../data/ui/delete.ui.h:3 ../src/dlg-extract.c:359 -msgid "example: *.txt; *.doc" -msgstr "príklad: *.txt; *.doc" - -#: ../data/ui/delete.ui.h:4 ../src/dlg-extract.c:362 -msgid "_All files" -msgstr "_Všetky súbory" - -#: ../data/ui/delete.ui.h:5 ../src/dlg-extract.c:369 -msgid "_Selected files" -msgstr "Vy_brané súbory" - -#: ../data/ui/password.ui.h:1 -msgid "Password" -msgstr "Heslo" - -#: ../data/ui/password.ui.h:2 -msgid "_Encrypt the file list" -msgstr "_Zašifrovať zoznam súborov" - -#: ../data/ui/password.ui.h:4 -msgid "" -"Note: the password will be used to encrypt files you add to the " -"current archive, and to decrypt files you extract from the current archive. " -"When the archive is closed the password will be deleted." -msgstr "" -"Poznámka: heslo bude použité na šifrovanie súborov, ktoré pridáte " -"do aktuálneho archívu a na dešifrovanie súborov, ktoré rozbaľujete z " -"aktuálneho archívu. Po zatvorení archívu bude heslo odstránené." - -#. secondary text -#: ../data/ui/update.ui.h:1 ../src/dlg-update.c:175 ../src/dlg-update.c:203 -#, c-format -msgid "" -"The file has been modified with an external application. If you don't update " -"the file in the archive, all of your changes will be lost." -msgid_plural "" -"%d files have been modified with an external application. If you don't " -"update the files in the archive, all of your changes will be lost." -msgstr[0] "" -"Týchto %d súborov bolo zmenených externou aplikáciou. Ak neaktualizujete " -"verzie súborov v archíve, všetky vykonané zmeny sa stratia." -msgstr[1] "" -"Tento súbor bol zmenený externou aplikáciou. Ak neaktualizujete verziu " -"súboru v archíve, všetky vykonané zmeny sa stratia." -msgstr[2] "" -"Tieto %d súbory boli zmenené externou aplikáciou. Ak neaktualizujete verzie " -"súborov v archíve, všetky vykonané zmeny sa stratia." - -#: ../data/ui/update.ui.h:2 -msgid "_Update" -msgstr "_Aktualizovať" - -#: ../data/ui/update.ui.h:3 -msgid "S_elect the files you want to update:" -msgstr "Vyb_erte súbory, ktoré chcete aktualizovať:" - -#: ../nautilus/nautilus-fileroller.c:325 +#: ../nautilus/nautilus-fileroller.c:327 msgid "Extract Here" msgstr "Rozbaliť sem" #. Translators: the current position is the current folder -#: ../nautilus/nautilus-fileroller.c:327 +#: ../nautilus/nautilus-fileroller.c:329 msgid "Extract the selected archive to the current position" msgstr "Rozbaliť zvolený archív do aktuálneho priečinka" -#: ../nautilus/nautilus-fileroller.c:344 +#: ../nautilus/nautilus-fileroller.c:346 msgid "Extract To..." msgstr "Rozbaliť do..." -#: ../nautilus/nautilus-fileroller.c:345 +#: ../nautilus/nautilus-fileroller.c:347 msgid "Extract the selected archive" msgstr "Rozbaliť zvolený archív" -#: ../nautilus/nautilus-fileroller.c:364 +#: ../nautilus/nautilus-fileroller.c:366 msgid "Compress..." msgstr "Komprimovať..." -#: ../nautilus/nautilus-fileroller.c:365 +#: ../nautilus/nautilus-fileroller.c:367 msgid "Create a compressed archive with the selected objects" msgstr "Vytvoriť komprimovaný archív so zvolenými objektmi" -#: ../src/actions.c:156 ../src/actions.c:195 ../src/actions.c:231 -#: ../src/dlg-batch-add.c:157 ../src/dlg-batch-add.c:173 -#: ../src/dlg-batch-add.c:202 ../src/dlg-batch-add.c:247 -#: ../src/dlg-batch-add.c:293 ../src/fr-window.c:2980 -msgid "Could not create the archive" -msgstr "Nepodarilo sa vytvoriť archív" - -#: ../src/actions.c:158 ../src/dlg-batch-add.c:159 ../src/dlg-batch-add.c:295 -msgid "You have to specify an archive name." -msgstr "Musíte zadať názov archívu." - -#: ../src/actions.c:197 -msgid "You don't have permission to create an archive in this folder" -msgstr "Nemáte oprávnenia na vytvorenie archívu v tomto priečinku" - -#: ../src/actions.c:233 ../src/dlg-package-installer.c:268 -#: ../src/dlg-package-installer.c:277 ../src/dlg-package-installer.c:305 -#: ../src/fr-archive.c:1178 ../src/fr-window.c:6090 ../src/fr-window.c:6266 -msgid "Archive type not supported." -msgstr "Nepodporovaný typ archívu." - -#: ../src/actions.c:247 -msgid "Could not delete the old archive." -msgstr "Nepodarilo sa odstrániť starý archív." - -#: ../src/actions.c:381 ../src/fr-window.c:5827 +#: ../src/actions.c:112 ../src/fr-window.c:5635 ../src/fr-window.c:6180 msgid "Open" msgstr "Otvoriť" -#: ../src/actions.c:392 ../src/fr-window.c:5266 +#: ../src/actions.c:125 ../src/fr-window.c:5178 msgid "All archives" msgstr "Všetky archívy" -#: ../src/actions.c:399 +#: ../src/actions.c:132 msgid "All files" msgstr "Všetky súbory" -#: ../src/actions.c:844 +#: ../src/actions.c:499 msgid "Copyright © 2001–2010 Free Software Foundation, Inc." msgstr "Copyright © 2001–2010 Free Software Foundation, Inc." -#: ../src/actions.c:845 +#: ../src/actions.c:500 msgid "An archive manager for GNOME." msgstr "Správca archívov pre GNOME." -#: ../src/actions.c:848 +#: ../src/actions.c:503 msgid "translator-credits" msgstr "" "Stanislav Višňovský\n" @@ -465,102 +311,57 @@ "Peter Tuhársky \n" "Peter Mráz " -#: ../src/dlg-add-files.c:99 ../src/dlg-add-folder.c:129 +#: ../src/dlg-add.c:116 msgid "Could not add the files to the archive" msgstr "Nepodarilo sa pridať súbory do archívu" -#: ../src/dlg-add-files.c:100 ../src/dlg-add-folder.c:130 +#: ../src/dlg-add.c:117 #, c-format msgid "You don't have the right permissions to read files from folder \"%s\"" msgstr "Nemáte dostatočné oprávnenia na čítanie súborov z priečinka „%s“" -#: ../src/dlg-add-files.c:148 ../src/ui.h:46 +#: ../src/dlg-add.c:182 ../src/ui.h:46 msgid "Add Files" msgstr "Pridať súbory" -#. Translators: add a file to the archive only if the disk version is -#. * newer than the archive version. -#: ../src/dlg-add-files.c:164 ../src/dlg-add-folder.c:230 -msgid "Add only if _newer" -msgstr "Pridať iba ak je _novší" - -#: ../src/dlg-add-folder.c:216 -msgid "Add a Folder" -msgstr "Pridať priečinok" - -#: ../src/dlg-add-folder.c:231 -msgid "_Include subfolders" -msgstr "_Zahrnúť podpriečinky" - -#: ../src/dlg-add-folder.c:232 -msgid "Exclude folders that are symbolic lin_ks" -msgstr "Vynechať priečinky, ktoré sú symbolickými _odkazmi" - -#: ../src/dlg-add-folder.c:235 ../src/dlg-add-folder.c:241 -#: ../src/dlg-add-folder.c:247 -msgid "example: *.o; *.bak" -msgstr "príklad: *.o; *.bak" - -#: ../src/dlg-add-folder.c:236 -msgid "Include _files:" -msgstr "Zahrnúť _súbory:" +#: ../src/dlg-add.c:193 +msgid "_Options" +msgstr "_Voľby" -#: ../src/dlg-add-folder.c:242 -msgid "E_xclude files:" -msgstr "V_ynechať súbory:" - -#: ../src/dlg-add-folder.c:248 -msgid "_Exclude folders:" -msgstr "Vyn_echať priečinky:" - -#: ../src/dlg-add-folder.c:252 -msgid "_Load Options" -msgstr "N_ačítať voľby" - -#: ../src/dlg-add-folder.c:253 -msgid "Sa_ve Options" -msgstr "_Uložiť voľby" - -#: ../src/dlg-add-folder.c:254 -msgid "_Reset Options" -msgstr "_Obnoviť voľby" +#. load options +#: ../src/dlg-add.c:202 ../src/ui/add-options.ui.h:1 +msgid "Load Options" +msgstr "Načítať voľby" -#: ../src/dlg-add-folder.c:882 +#. save options +#: ../src/dlg-add.c:209 ../src/dlg-add.c:825 msgid "Save Options" msgstr "Uložiť voľby" -#: ../src/dlg-add-folder.c:883 +#. clear options +#: ../src/dlg-add.c:216 +msgid "Reset Options" +msgstr "Obnoviť voľby" + +#: ../src/dlg-add.c:826 msgid "_Options Name:" msgstr "Názov pre _voľby:" -#: ../src/dlg-ask-password.c:122 +#. Translators: %s is a filename +#: ../src/dlg-ask-password.c:131 #, c-format -msgid "Enter the password for the archive '%s'." -msgstr "Zadajte heslo pre archív '%s'." +msgid "Password required for \"%s\"" +msgstr "Heslo vyžadované pre „%s“" -#: ../src/dlg-batch-add.c:174 -#, c-format -msgid "" -"The name \"%s\" is not valid because it cannot contain the characters: %s\n" -"\n" -"%s" -msgstr "" -"Názov „%s“ nie je platný, pretože nemôže obsahovať znaky: %s\n" -"\n" -"%s" - -#: ../src/dlg-batch-add.c:177 ../src/fr-window.c:7644 ../src/fr-window.c:7646 -msgid "Please use a different name." -msgstr "Prosím, použite iný názov." +#: ../src/dlg-ask-password.c:139 +msgid "Wrong password." +msgstr "Nesprávne heslo." -#: ../src/dlg-batch-add.c:204 -msgid "" -"You don't have the right permissions to create an archive in the destination " -"folder." -msgstr "" -"Nemáte dostatočné oprávnenia na vytvorenie archívu v cieľovom priečinku." +#: ../src/dlg-batch-add.c:85 ../src/main.c:417 ../src/main.c:783 +msgid "Compress" +msgstr "Komprimovať" -#: ../src/dlg-batch-add.c:220 ../src/dlg-extract.c:102 ../src/fr-window.c:6865 +#: ../src/dlg-extract.c:96 ../src/fr-window.c:6725 #, c-format msgid "" "Destination folder \"%s\" does not exist.\n" @@ -571,74 +372,44 @@ "\n" "Chcete ho vytvoriť?" -#: ../src/dlg-batch-add.c:229 ../src/dlg-extract.c:111 ../src/fr-window.c:6874 +#: ../src/dlg-extract.c:105 ../src/fr-window.c:6734 msgid "Create _Folder" msgstr "Vytvoriť _priečinok" -#: ../src/dlg-batch-add.c:248 ../src/dlg-extract.c:131 ../src/fr-window.c:6891 +#: ../src/dlg-extract.c:124 ../src/dlg-extract.c:142 ../src/dlg-extract.c:169 +#: ../src/fr-window.c:4124 ../src/fr-window.c:6629 ../src/fr-window.c:6634 +#: ../src/fr-window.c:6755 ../src/fr-window.c:6774 ../src/fr-window.c:6779 +msgid "Extraction not performed" +msgstr "Rozbalenie sa neuskutočnilo" + +#: ../src/dlg-extract.c:125 ../src/fr-window.c:6751 #, c-format msgid "Could not create the destination folder: %s." msgstr "Nepodarilo sa vytvoriť cieľový priečinok: %s." -#: ../src/dlg-batch-add.c:265 -msgid "Archive not created" -msgstr "Archív nebol vytvorený" - -#: ../src/dlg-batch-add.c:313 -msgid "The archive is already present. Do you want to overwrite it?" -msgstr "Archív je už prítomný. Chcete ho prepísať?" - -#: ../src/dlg-batch-add.c:316 -msgid "_Overwrite" -msgstr "_Prepísať" - -#: ../src/dlg-extract.c:130 ../src/dlg-extract.c:148 ../src/dlg-extract.c:175 -#: ../src/fr-window.c:4205 ../src/fr-window.c:6895 ../src/fr-window.c:6914 -#: ../src/fr-window.c:6919 -msgid "Extraction not performed" -msgstr "Rozbalenie sa neuskutočnilo" - -#: ../src/dlg-extract.c:176 ../src/fr-window.c:4368 ../src/fr-window.c:4448 +#: ../src/dlg-extract.c:170 ../src/fr-window.c:4290 ../src/fr-window.c:4374 #, c-format msgid "" "You don't have the right permissions to extract archives in the folder \"%s\"" msgstr "Nemáte dostatočné oprávnenia na rozbalenie archívu v priečinku „%s“." -#: ../src/dlg-extract.c:331 ../src/dlg-extract.c:429 ../src/ui.h:121 +#: ../src/dlg-extract.c:283 ../src/ui/extract-dialog-options.ui.h:1 +#: ../src/ui.h:113 msgid "Extract" msgstr "Rozbaliť" -#: ../src/dlg-extract.c:380 -msgid "Actions" -msgstr "Akcie" - -#: ../src/dlg-extract.c:396 -msgid "Re-crea_te folders" -msgstr "_Znovu vytvoriť priečiky" - -#: ../src/dlg-extract.c:400 -msgid "Over_write existing files" -msgstr "_Prepísať existujúce súbory" - -#: ../src/dlg-extract.c:404 -msgid "Do not e_xtract older files" -msgstr "_Nerozbaľovať staršie súbory" - -#: ../src/dlg-new.c:427 -msgctxt "File" -msgid "New" -msgstr "Nový" - -#: ../src/dlg-new.c:440 -msgctxt "File" -msgid "Save" -msgstr "Uložiť" - -#: ../src/dlg-package-installer.c:107 ../src/dlg-package-installer.c:219 +#: ../src/dlg-package-installer.c:112 ../src/dlg-package-installer.c:225 msgid "There was an internal error trying to search for applications:" msgstr "Pri pokuse nájsť aplikácie nastala vnútorná chyba:" -#: ../src/dlg-package-installer.c:287 +#: ../src/dlg-package-installer.c:294 ../src/dlg-package-installer.c:303 +#: ../src/dlg-package-installer.c:331 ../src/fr-archive.c:742 +#: ../src/fr-window.c:3854 ../src/fr-window.c:7330 ../src/fr-window.c:7686 +#: ../src/fr-window.c:9227 +msgid "Archive type not supported." +msgstr "Nepodporovaný typ archívu." + +#: ../src/dlg-package-installer.c:313 #, c-format msgid "" "There is no command installed for %s files.\n" @@ -647,276 +418,147 @@ "Pre súbory %s nie je nainštalovaný žiadny príkaz.\n" "Chcete vyhľadať príkaz na otvorenie tohto súboru?" -#: ../src/dlg-package-installer.c:292 +#: ../src/dlg-package-installer.c:318 msgid "Could not open this file type" msgstr "Nepodarilo sa otvoriť tento typ súboru" -#: ../src/dlg-package-installer.c:295 +#: ../src/dlg-package-installer.c:321 msgid "_Search Command" msgstr "_Hľadať príkaz" -#. Translators: after the colon there is a folder name. -#: ../src/dlg-prop.c:106 -msgid "Location:" -msgstr "Umiestnenie:" - -#: ../src/dlg-prop.c:118 -msgctxt "File" -msgid "Name:" -msgstr "Názov:" +#: ../src/dlg-password.c:91 +#, c-format +msgid "Enter a password for \"%s\"" +msgstr "Zadajte heslo pre „%s“." -#: ../src/dlg-prop.c:124 +#: ../src/dlg-prop.c:96 #, c-format msgid "%s Properties" msgstr "Vlastnosti %s" -#: ../src/dlg-prop.c:133 -msgid "Last modified:" -msgstr "Dátum zmeny:" - -#: ../src/dlg-prop.c:143 -msgid "Archive size:" -msgstr "Veľkosť archívu:" - -#: ../src/dlg-prop.c:154 -msgid "Content size:" -msgstr "Veľkosť obsahu:" - -#: ../src/dlg-prop.c:174 -msgid "Compression ratio:" -msgstr "Kompresný pomer:" - -#: ../src/dlg-prop.c:189 -msgid "Number of files:" -msgstr "Počet súborov:" - -#: ../src/dlg-update.c:163 +#: ../src/dlg-update.c:162 #, c-format msgid "Update the file \"%s\" in the archive \"%s\"?" msgstr "Aktualizovať súbor „%s“ v archíve „%s“?" -#: ../src/dlg-update.c:192 -#, c-format -msgid "Update the files in the archive \"%s\"?" -msgstr "Aktualizovať súbory v archíve „%s“?" - -#: ../src/eggfileformatchooser.c:236 -#, c-format -msgid "File _Format: %s" -msgstr "_Formát súboru: %s" - -#: ../src/eggfileformatchooser.c:397 -msgid "All Files" -msgstr "Všetky súbory" - -#: ../src/eggfileformatchooser.c:398 -msgid "All Supported Files" -msgstr "Všetky podporované súbory" - -#: ../src/eggfileformatchooser.c:407 -msgid "By Extension" -msgstr "Podľa prípony" - -#: ../src/eggfileformatchooser.c:422 -msgid "File Format" -msgstr "Formát súboru" - -#: ../src/eggfileformatchooser.c:440 -msgid "Extension(s)" -msgstr "Prípona(y)" - -#: ../src/eggfileformatchooser.c:675 +#. secondary text +#: ../src/dlg-update.c:173 ../src/dlg-update.c:198 ../src/ui/update.ui.h:2 #, c-format msgid "" -"The program was not able to find out the file format you want to use for `%" -"s'. Please make sure to use a known extension for that file or manually " -"choose a file format from the list below." -msgstr "" -"Program nebol schopný rozpoznať formát súboru, ktorý chcete použiť pre `%s'. " -"Prosím, uistite sa, že pre tento súbor používate známu príponu, alebo ručne " -"vyberte formát súboru z nasledujúceho zoznamu." - -#: ../src/eggfileformatchooser.c:682 -msgid "File format not recognized" -msgstr "Formát súboru nebol rozpoznaný" - -#: ../src/fr-archive.c:1158 -msgid "File not found." -msgstr "Súbor nenájdený." +"The file has been modified with an external application. If you don't update " +"the file in the archive, all of your changes will be lost." +msgid_plural "" +"%d files have been modified with an external application. If you don't " +"update the files in the archive, all of your changes will be lost." +msgstr[0] "" +"Týchto %d súborov bolo zmenených externou aplikáciou. Ak neaktualizujete " +"verzie súborov v archíve, všetky vykonané zmeny sa stratia." +msgstr[1] "" +"Tento súbor bol zmenený externou aplikáciou. Ak neaktualizujete verziu " +"súboru v archíve, všetky vykonané zmeny sa stratia." +msgstr[2] "" +"Tieto %d súbory boli zmenené externou aplikáciou. Ak neaktualizujete verzie " +"súborov v archíve, všetky vykonané zmeny sa stratia." -#: ../src/fr-archive.c:1261 +#: ../src/dlg-update.c:188 #, c-format -msgid "Archive not found" -msgstr "Archív nenájdený." +msgid "Update the files in the archive \"%s\"?" +msgstr "Aktualizovať súbory v archíve „%s“?" -#: ../src/fr-archive.c:2427 +#: ../src/fr-archive.c:1842 msgid "You don't have the right permissions." msgstr "Nemáte dostatočné oprávnenia." -#: ../src/fr-archive.c:2427 +#: ../src/fr-archive.c:1842 msgid "This archive type cannot be modified" msgstr "Tento typ archívu nemôže byť zmenený" -#: ../src/fr-archive.c:2439 +#: ../src/fr-archive.c:1856 msgid "You can't add an archive to itself." msgstr "Nemôžete pridať archív do seba samého." -#. Translators: after the colon there is a filename. -#: ../src/fr-command-7z.c:297 ../src/fr-command-rar.c:324 -#: ../src/fr-command-tar.c:307 -msgid "Adding file: " -msgstr "Pridáva sa súbor: " +#. Translators: %s is a filename. +#: ../src/fr-command-7z.c:297 ../src/fr-command-rar.c:325 +#: ../src/fr-command-tar.c:305 +#, c-format +msgid "Adding \"%s\"" +msgstr "Pridáva sa „%s“" -#. Translators: after the colon there is a filename. -#: ../src/fr-command-7z.c:418 ../src/fr-command-rar.c:451 +#. Translators: %s is a filename. +#: ../src/fr-command-7z.c:420 ../src/fr-command-rar.c:455 #: ../src/fr-command-tar.c:426 -msgid "Extracting file: " -msgstr "Rozbaľuje sa súbor: " +#, c-format +msgid "Extracting \"%s\"" +msgstr "Rozbaľuje sa „%s“" -#. Translators: after the colon there is a filename. -#: ../src/fr-command-rar.c:402 ../src/fr-command-tar.c:372 -msgid "Removing file: " -msgstr "Odstraňuje sa súbor: " +#: ../src/fr-command.c:597 +#, c-format +msgid "Archive not found" +msgstr "Archív nenájdený." -#: ../src/fr-command-rar.c:584 +#. Translators: %s is a filename. +#: ../src/fr-command-rar.c:406 ../src/fr-command-tar.c:371 +#, c-format +msgid "Removing \"%s\"" +msgstr "Odstraňuje sa „%s“ " + +#: ../src/fr-command-rar.c:581 #, c-format msgid "Could not find the volume: %s" msgstr "Nepodarilo sa nájsť zväzok: %s" -#: ../src/fr-command-tar.c:381 ../src/fr-window.c:2315 +#: ../src/fr-command-tar.c:381 msgid "Deleting files from archive" msgstr "Odstraňujú sa súbory z archívu" -#: ../src/fr-command-tar.c:485 +#: ../src/fr-command-tar.c:486 msgid "Recompressing archive" msgstr "Archív sa nanovo komprimuje" -#: ../src/fr-command-tar.c:736 +#: ../src/fr-command-tar.c:725 msgid "Decompressing archive" msgstr "Archív sa rozbaľuje" -#: ../src/fr-init.c:58 -msgid "7-Zip (.7z)" -msgstr "7-Zip (.7z)" - -#: ../src/fr-init.c:59 -msgid "Tar compressed with 7z (.tar.7z)" -msgstr "Tar komprimovaný pomocou 7z (.tar.7z)" - -#: ../src/fr-init.c:60 -msgid "Ace (.ace)" -msgstr "Ace (.ace)" - -#: ../src/fr-init.c:62 -msgid "Ar (.ar)" -msgstr "Ar (.ar)" - -#: ../src/fr-init.c:63 -msgid "Arj (.arj)" -msgstr "Arj (.arj)" - -#: ../src/fr-init.c:65 -msgid "Tar compressed with bzip2 (.tar.bz2)" -msgstr "Tar komprimovaný pomocou bzip2 (.tar.bz2)" - -#: ../src/fr-init.c:67 -msgid "Tar compressed with bzip (.tar.bz)" -msgstr "Tar komprimovaný pomocou bzip (.tar.bz)" - -#: ../src/fr-init.c:68 -msgid "Cabinet (.cab)" -msgstr "Cabinet (.cab)" - -# * http://en.wikipedia.org/wiki/Comic_Book_Archive_file -#: ../src/fr-init.c:69 -msgid "Rar Archived Comic Book (.cbr)" -msgstr "Komiks v archíve rar (.cbr)" - -# * http://en.wikipedia.org/wiki/Comic_Book_Archive_file -#: ../src/fr-init.c:70 -msgid "Zip Archived Comic Book (.cbz)" -msgstr "Komiks v archíve zip (.cbz)" - -#: ../src/fr-init.c:73 -msgid "Tar compressed with gzip (.tar.gz)" -msgstr "Tar komprimovaný pomocou gzip (.tar.gz)" - -#: ../src/fr-init.c:76 -msgid "Ear (.ear)" -msgstr "Ear (.ear)" - -#: ../src/fr-init.c:77 -msgid "Self-extracting zip (.exe)" -msgstr "Samorozbaľujúci zip (.exe)" - -#: ../src/fr-init.c:79 -msgid "Jar (.jar)" -msgstr "Jar (.jar)" - -#: ../src/fr-init.c:80 -msgid "Lha (.lzh)" -msgstr "Lha (.lzh)" - -#: ../src/fr-init.c:81 -msgid "Lrzip (.lrz)" -msgstr "Lrzip (.lrz)" - -#: ../src/fr-init.c:82 -msgid "Tar compressed with lrzip (.tar.lrz)" -msgstr "Tar komprimovaný pomocou lrzip (.tar.lrz)" - -#: ../src/fr-init.c:84 -msgid "Tar compressed with lzip (.tar.lz)" -msgstr "Tar komprimovaný pomocou lzip (.tar.lz)" - -#: ../src/fr-init.c:86 -msgid "Tar compressed with lzma (.tar.lzma)" -msgstr "Tar komprimovaný pomocou lzma (.tar.lzma)" - -#: ../src/fr-init.c:88 -msgid "Tar compressed with lzop (.tar.lzo)" -msgstr "Tar komprimovaný pomocou lzop (.tar.lzo)" - -# neviem či toto prekladať -# PK: podla mna na 99% nie, dal som prec fuzzy -# PŠ: a podľa mňa zase áno, predchádzajúce reťazce sú podobného typu a sú preložené -# peter: tak navrhni ako by som to mal preložiť -# PŠ: nie je náhodou Windows Imaging "Maľovanie" vo Windows a toto jeho vlastný formát? -#: ../src/fr-init.c:89 -msgid "Windows Imaging Format (.wim)" -msgstr "Windows Imaging Format (.wim)" - -#: ../src/fr-init.c:90 -msgid "Rar (.rar)" -msgstr "Rar (.rar)" - -#: ../src/fr-init.c:93 -msgid "Tar uncompressed (.tar)" -msgstr "Nekomprimovaný tar (.tar)" - -#: ../src/fr-init.c:94 -msgid "Tar compressed with compress (.tar.Z)" -msgstr "Tar komprimovaný pomocou compress (.tar.Z)" - -#: ../src/fr-init.c:96 -msgid "War (.war)" -msgstr "War (.war)" - -#: ../src/fr-init.c:97 -msgid "Xz (.xz)" -msgstr "Xz (.xz)" - -#: ../src/fr-init.c:98 -msgid "Tar compressed with xz (.tar.xz)" -msgstr "Tar komprimovaný pomocou xz (.tar.xz)" - -#: ../src/fr-init.c:99 -msgid "Zoo (.zoo)" -msgstr "Zoo (.zoo)" - -#: ../src/fr-init.c:100 -msgid "Zip (.zip)" -msgstr "Zip (.zip)" +#: ../src/fr-file-selector-dialog.c:588 +msgid "File System" +msgstr "Súborový systém" + +#: ../src/fr-file-selector-dialog.c:1331 ../src/fr-file-selector-dialog.c:1376 +msgid "Could not load the location" +msgstr "Umiestnenie sa nepodarilo načítať" + +#: ../src/fr-new-archive-dialog.c:335 ../src/fr-new-archive-dialog.c:354 +#: ../src/fr-new-archive-dialog.c:370 ../src/fr-new-archive-dialog.c:418 +#: ../src/fr-window.c:2822 +msgid "Could not create the archive" +msgstr "Nepodarilo sa vytvoriť archív" + +#: ../src/fr-new-archive-dialog.c:337 ../src/fr-new-archive-dialog.c:356 +msgid "You have to specify an archive name." +msgstr "Musíte zadať názov archívu." + +#: ../src/fr-new-archive-dialog.c:420 +msgid "You don't have permission to create an archive in this folder" +msgstr "Nemáte oprávnenia na vytvorenie archívu v tomto priečinku" + +#: ../src/fr-new-archive-dialog.c:439 +#, c-format +msgid "A file named \"%s\" already exists. Do you want to replace it?" +msgstr "Súbor s názvom „%s“ už existuje. Chcete ho nahradiť?" + +#: ../src/fr-new-archive-dialog.c:440 +#, c-format +msgid "" +"The file already exists in \"%s\". Replacing it will overwrite its contents." +msgstr "Súbor už v „%s“ existuje. Nahradenie prepíše jeho obsah." + +#: ../src/fr-new-archive-dialog.c:447 ../src/fr-window.c:6567 +msgid "_Replace" +msgstr "_Nahradiť" + +#: ../src/fr-new-archive-dialog.c:462 +msgid "Could not delete the old archive." +msgstr "Nepodarilo sa odstrániť starý archív." #: ../src/fr-stock.c:41 msgid "C_reate" @@ -930,7 +572,11 @@ msgid "_Extract" msgstr "_Rozbaliť" -#: ../src/fr-window.c:1517 +#: ../src/fr-window.c:1045 +msgid "Operation completed" +msgstr "Operácia dokončená" + +#: ../src/fr-window.c:1162 #, c-format msgid "%d object (%s)" msgid_plural "%d objects (%s)" @@ -938,7 +584,7 @@ msgstr[1] "%d objekt (%s)" msgstr[2] "%d objekty (%s)" -#: ../src/fr-window.c:1522 +#: ../src/fr-window.c:1167 #, c-format msgid "%d object selected (%s)" msgid_plural "%d objects selected (%s)" @@ -946,130 +592,183 @@ msgstr[1] "vybraný %d objekt (%s)" msgstr[2] "vybrané %d objekty (%s)" -#: ../src/fr-window.c:1592 +#: ../src/fr-window.c:1587 msgid "Folder" msgstr "Priečinok" -#: ../src/fr-window.c:1989 +#: ../src/fr-window.c:1968 msgid "[read only]" msgstr "[len na čítanie]" -#: ../src/fr-window.c:2238 +#: ../src/fr-window.c:2087 #, c-format msgid "Could not display the folder \"%s\"" msgstr "Nepodarilo sa zobraziť priečinok „%s“" -#: ../src/fr-window.c:2306 ../src/fr-window.c:2336 -msgid "Creating archive" -msgstr "Vytvára sa archív" - -#: ../src/fr-window.c:2309 -msgid "Loading archive" -msgstr "Načítava sa archív" - -#: ../src/fr-window.c:2312 -msgid "Reading archive" -msgstr "Číta sa obsah archívu" - -#: ../src/fr-window.c:2318 -msgid "Testing archive" -msgstr "Testuje sa archív" +#. Translators: %s is a filename +#: ../src/fr-window.c:2178 ../src/fr-window.c:2216 +#, c-format +msgid "Creating \"%s\"" +msgstr "Vytvára sa „%s“" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2182 +#, c-format +msgid "Loading \"%s\"" +msgstr "Načítava sa „%s“" -#: ../src/fr-window.c:2321 +#. Translators: %s is a filename +#: ../src/fr-window.c:2186 +#, c-format +msgid "Reading \"%s\"" +msgstr "Číta sa „%s“" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2190 +#, c-format +msgid "Deleting the files from \"%s\"" +msgstr "Odstraňujú sa súbory z „%s“" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2194 +#, c-format +msgid "Testing \"%s\"" +msgstr "Testuje sa „%s“" + +#: ../src/fr-window.c:2197 msgid "Getting the file list" msgstr "Získava sa zoznam súborov" -#: ../src/fr-window.c:2324 ../src/fr-window.c:2333 -msgid "Copying the file list" -msgstr "Kopíruje sa zoznam súborov" - -#: ../src/fr-window.c:2327 -msgid "Adding files to archive" -msgstr "Pridávajú sa súbory do archívu" - -#: ../src/fr-window.c:2330 -msgid "Extracting files from archive" -msgstr "Rozbaľujú sa súbory z archívu" - -#: ../src/fr-window.c:2339 -msgid "Saving archive" -msgstr "Ukladá sa archív" +# PM: pre pridanie mi znelo divne a vsetko ostatné zas bolo dlhé +#. Translators: %s is a filename +#: ../src/fr-window.c:2201 +#, c-format +msgid "Copying the files to add to \"%s\"" +msgstr "Kopírujú sa súbory kvôli pridaniu do „%s“" -#: ../src/fr-window.c:2509 +#. Translators: %s is a filename +#: ../src/fr-window.c:2205 +#, c-format +msgid "Adding the files to \"%s\"" +msgstr "Pridávajú sa súbory do „%s“" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2209 +#, c-format +msgid "Extracting the files from \"%s\"" +msgstr "Rozbaľujú sa súbory z „%s“" + +#: ../src/fr-window.c:2212 +msgid "Copying the extracted files to the destination" +msgstr "Kopírujú sa rozbalené súbory do cieľa" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2221 +#, c-format +msgid "Saving \"%s\"" +msgstr "Ukladá sa „%s“" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2228 +#, c-format +msgid "Renaming the files in \"%s\"" +msgstr "Premenovávajú sa súbory v „%s“" + +#. Translators: %s is a filename +#: ../src/fr-window.c:2232 +#, c-format +msgid "Updating the files in \"%s\"" +msgstr "Aktualizujú sa súbory v „%s“" + +#: ../src/fr-window.c:2407 msgid "_Open the Archive" msgstr "_Otvoriť archív" -#: ../src/fr-window.c:2510 +#: ../src/fr-window.c:2408 msgid "_Show the Files" msgstr "_Zobraziť súbory" -#: ../src/fr-window.c:2565 -msgid "Archive:" -msgstr "Archív:" +#: ../src/fr-window.c:2525 +#, c-format +msgid "%d file remaining" +msgid_plural "%'d files remaining" +msgstr[0] "Zostáva %d súborov" +msgstr[1] "Zostáva %d súbor" +msgstr[2] "Zostávajú %d súbory" + +#: ../src/fr-window.c:2529 ../src/fr-window.c:3105 +msgid "Please wait…" +msgstr "Prosím, čakajte…" -#: ../src/fr-window.c:2736 +#: ../src/fr-window.c:2585 msgid "Extraction completed successfully" msgstr "Rozbaľovanie bolo úspešne dokončené" -#: ../src/fr-window.c:2759 -msgid "Archive created successfully" -msgstr "Archív bol úspešne vytvorený" - -#: ../src/fr-window.c:2807 -msgid "please wait…" -msgstr "prosím, čakajte…" +#. Translators: %s is a filename +#: ../src/fr-window.c:2616 ../src/fr-window.c:6159 +#, c-format +msgid "\"%s\" created successfully" +msgstr "„%s“ bol úspešne vytvorený" -#: ../src/fr-window.c:2892 ../src/fr-window.c:3027 +#: ../src/fr-window.c:2706 ../src/fr-window.c:2878 msgid "Command exited abnormally." msgstr "Príkaz skončil neobvykle." -#: ../src/fr-window.c:2985 +#: ../src/fr-window.c:2827 msgid "An error occurred while extracting files." msgstr "Pri rozbaľovaní súborov nastala chyba." -#: ../src/fr-window.c:2991 +#: ../src/fr-window.c:2833 #, c-format msgid "Could not open \"%s\"" msgstr "Nepodarilo sa otvoriť „%s“" -#: ../src/fr-window.c:2996 +#: ../src/fr-window.c:2838 msgid "An error occurred while loading the archive." msgstr "Pri načítavaní archívu nastala chyba." -#: ../src/fr-window.c:3000 +#: ../src/fr-window.c:2842 msgid "An error occurred while deleting files from the archive." msgstr "Pri odstraňovaní súborov z archívu nastala chyba." -#: ../src/fr-window.c:3006 +#: ../src/fr-window.c:2848 msgid "An error occurred while adding files to the archive." msgstr "Pri pridávaní súborov do archívu nastala chyba." -#: ../src/fr-window.c:3010 +#: ../src/fr-window.c:2852 msgid "An error occurred while testing archive." msgstr "Pri testovaní archívu nastala chyba." -#: ../src/fr-window.c:3014 +#: ../src/fr-window.c:2857 msgid "An error occurred while saving the archive." msgstr "Pri ukladaní archívu nastala chyba." -#: ../src/fr-window.c:3018 +#: ../src/fr-window.c:2861 +msgid "An error occurred while renaming the files." +msgstr "Pri premenovávaní súborov nastala chyba." + +#: ../src/fr-window.c:2865 +msgid "An error occurred while updating the files." +msgstr "Pri aktualizovaní súborov nastala chyba." + +#: ../src/fr-window.c:2869 msgid "An error occurred." msgstr "Nastala chyba." -#: ../src/fr-window.c:3024 +#: ../src/fr-window.c:2875 msgid "Command not found." msgstr "Príkaz nenájdený." -#: ../src/fr-window.c:3226 +#: ../src/fr-window.c:3033 msgid "Test Result" msgstr "Výsledok testu" -#: ../src/fr-window.c:4048 ../src/fr-window.c:8197 ../src/fr-window.c:8231 -#: ../src/fr-window.c:8481 +#: ../src/fr-window.c:3972 ../src/fr-window.c:8670 ../src/fr-window.c:8704 +#: ../src/fr-window.c:8983 msgid "Could not perform the operation" msgstr "Operáciu sa nepodarilo vykonať" -#: ../src/fr-window.c:4074 +#: ../src/fr-window.c:3998 msgid "" "Do you want to add this file to the current archive or open it as a new " "archive?" @@ -1077,109 +776,109 @@ "Chcete pridať tento súbor do aktuálneho archívu, alebo ho otvoriť ako nový " "archív?" -#: ../src/fr-window.c:4104 +#: ../src/fr-window.c:4028 msgid "Do you want to create a new archive with these files?" msgstr "Chcete vytvoriť nový archív obsahujúci tieto súbory?" -#: ../src/fr-window.c:4107 +#: ../src/fr-window.c:4031 msgid "Create _Archive" msgstr "_Vytvoriť archív" -#: ../src/fr-window.c:4700 ../src/fr-window.c:5776 +#: ../src/fr-window.c:4060 ../src/fr-window.c:7140 +msgid "New Archive" +msgstr "Nový archív" + +#: ../src/fr-window.c:4648 msgid "Folders" msgstr "Priečinky" -#: ../src/fr-window.c:4738 +#: ../src/fr-window.c:4686 ../src/ui/file-selector.ui.h:5 msgctxt "File" msgid "Size" msgstr "Veľkosť" -#: ../src/fr-window.c:4739 +#: ../src/fr-window.c:4687 msgctxt "File" msgid "Type" msgstr "Typ" -#: ../src/fr-window.c:4740 +#: ../src/fr-window.c:4688 ../src/ui/file-selector.ui.h:6 msgctxt "File" -msgid "Date Modified" -msgstr "Dátum zmeny" +msgid "Modified" +msgstr "Zmenený" -#: ../src/fr-window.c:4741 +#: ../src/fr-window.c:4689 msgctxt "File" msgid "Location" msgstr "Umiestnenie" -#: ../src/fr-window.c:4750 +#: ../src/fr-window.c:4698 ../src/ui/file-selector.ui.h:4 msgctxt "File" msgid "Name" msgstr "Názov" -#: ../src/fr-window.c:5697 +#: ../src/fr-window.c:5528 msgid "Find:" msgstr "Nájsť:" -#: ../src/fr-window.c:5784 -msgid "Close the folders pane" -msgstr "Zavrieť panel priečinkov" - #. Translators: this is the label for the "open recent file" sub-menu. -#: ../src/fr-window.c:5815 +#: ../src/fr-window.c:5623 msgid "Open _Recent" msgstr "Otvoriť n_edávny" -#: ../src/fr-window.c:5816 ../src/fr-window.c:5828 +#: ../src/fr-window.c:5624 ../src/fr-window.c:5636 msgid "Open a recently used archive" msgstr "Otvoriť nedávno použitý archív" -#: ../src/fr-window.c:6258 -#, c-format -msgid "Could not save the archive \"%s\"" -msgstr "Nepodarilo sa uložiť archív „%s“" +#. Translators: after the colon there is a folder name. +#: ../src/fr-window.c:5708 ../src/ui/file-selector.ui.h:1 +#: ../src/ui/new-archive-dialog.ui.h:2 +msgid "_Location:" +msgstr "_Umiestnenie:" -#: ../src/fr-window.c:6774 -#, fuzzy, c-format -#| msgid "_Selected files" +#: ../src/fr-window.c:6555 +#, c-format msgid "Replace file \"%s\"?" -msgstr "_Vybrané súbory" +msgstr "Nahradiť súbor „%s“?" -#: ../src/fr-window.c:6777 +#: ../src/fr-window.c:6558 #, c-format -#| msgid "" -#| "A file named \"%s\" already exists.\n" -#| "\n" -#| "%s" msgid "Another file with the same name already exists in \"%s\"." msgstr "Iný súbor s rovnakým názvom už existuje v „%s“." -#: ../src/fr-window.c:6784 +#: ../src/fr-window.c:6565 msgid "Replace _All" msgstr "Nahr_adiť všetky" -#: ../src/fr-window.c:6785 +#: ../src/fr-window.c:6566 msgid "_Skip" msgstr "Pre_kočiť" -#: ../src/fr-window.c:6786 -#| msgid "_Rename" -msgid "_Replace" -msgstr "_Nahradiť" +#: ../src/fr-window.c:7322 ../src/fr-window.c:7678 +#, c-format +msgid "Could not save the archive \"%s\"" +msgstr "Nepodarilo sa uložiť archív „%s“" -#: ../src/fr-window.c:7293 +#: ../src/fr-window.c:7449 +msgid "Save" +msgstr "Uložiť" + +#: ../src/fr-window.c:7772 msgid "Last Output" msgstr "Posledný výstup" #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7598 +#: ../src/fr-window.c:7994 msgid "New name is void, please type a name." msgstr "Nový názov je prázdny, prosím, zadajte názov." #. Translators: the name references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7603 +#: ../src/fr-window.c:7999 msgid "New name is the same as old one, please type other name." msgstr "Nový názov je rovnaký ako starý, prosím, zadajte iný názov." #. Translators: the %s references to a filename. This message can appear when renaming a file. -#: ../src/fr-window.c:7608 +#: ../src/fr-window.c:8004 #, c-format msgid "" "Name \"%s\" is not valid because it contains at least one of the following " @@ -1188,7 +887,7 @@ "Názov „%s“ nie je platný, pretože obsahuje najmenej jeden z nasledujúcich " "znakov: %s. Prosím, zadajte iný názov." -#: ../src/fr-window.c:7644 +#: ../src/fr-window.c:8040 #, c-format msgid "" "A folder named \"%s\" already exists.\n" @@ -1199,7 +898,11 @@ "\n" "%s" -#: ../src/fr-window.c:7646 +#: ../src/fr-window.c:8040 ../src/fr-window.c:8042 +msgid "Please use a different name." +msgstr "Prosím, použite iný názov." + +#: ../src/fr-window.c:8042 #, c-format msgid "" "A file named \"%s\" already exists.\n" @@ -1210,109 +913,246 @@ "\n" "%s" -#: ../src/fr-window.c:7716 +#: ../src/fr-window.c:8112 msgid "Rename" msgstr "Premenovať" -#: ../src/fr-window.c:7717 +#: ../src/fr-window.c:8113 msgid "_New folder name:" msgstr "_Nový názov priečinka:" -#: ../src/fr-window.c:7717 +#: ../src/fr-window.c:8113 msgid "_New file name:" msgstr "_Nový názov súboru:" -#: ../src/fr-window.c:7721 +#: ../src/fr-window.c:8117 msgid "_Rename" msgstr "Pre_menovať" -#: ../src/fr-window.c:7738 ../src/fr-window.c:7758 +#: ../src/fr-window.c:8134 ../src/fr-window.c:8153 msgid "Could not rename the folder" msgstr "Nepodarilo sa premenovať priečinok" -#: ../src/fr-window.c:7738 ../src/fr-window.c:7758 +#: ../src/fr-window.c:8134 ../src/fr-window.c:8153 msgid "Could not rename the file" msgstr "Nepodarilo sa premenovať súbor" -#: ../src/fr-window.c:8158 +#. Translators: %s are archive filenames +#: ../src/fr-window.c:8577 +#, c-format +msgid "Moving the files from \"%s\" to \"%s\"" +msgstr "Presúvajú sa súbory z „%s“ do „%s“" + +#. Translators: %s are archive filenames +#: ../src/fr-window.c:8580 +#, c-format +msgid "Copying the files from \"%s\" to \"%s\"" +msgstr "Kopírujú sa súbory z „%s“ do „%s“" + +#: ../src/fr-window.c:8631 msgid "Paste Selection" msgstr "Vložiť výber" -#: ../src/fr-window.c:8159 +#: ../src/fr-window.c:8632 msgid "_Destination folder:" msgstr "_Cieľový priečinok:" -#: ../src/fr-window.c:8760 +#: ../src/fr-window.c:9245 msgid "Add files to an archive" msgstr "Pridať súbory do archívu" -#: ../src/fr-window.c:8804 +#: ../src/fr-window.c:9289 ../src/main.c:453 ../src/main.c:489 +#: ../src/main.c:515 ../src/main.c:807 msgid "Extract archive" msgstr "Rozbaliť archív" #. This is the time format used in the "Date Modified" column and #. * in the Properties dialog. See the man page of strftime for an #. * explanation of the values. -#: ../src/glib-utils.c:560 +#: ../src/glib-utils.c:733 msgid "%d %B %Y, %H:%M" msgstr "%e. %B %Y o %H:%M" -#. Expander -#: ../src/gtk-utils.c:421 -msgid "Command _Line Output" -msgstr "Výstup _príkazového riadka" - -#: ../src/gtk-utils.c:750 +#: ../src/gtk-utils.c:557 msgid "Could not display help" msgstr "Nepodarilo sa zobraziť pomocníka" -#: ../src/main.c:51 +# cmd option +#: ../src/main.c:66 msgid "Add files to the specified archive and quit the program" -msgstr "Pridať súbory do zadaného archívu a ukončiť program" +msgstr "Pridá súbory do zadaného archívu a ukončí program" -#: ../src/main.c:52 +#: ../src/main.c:67 msgid "ARCHIVE" msgstr "ARCHÍV" -#: ../src/main.c:55 +# cmd option +#: ../src/main.c:70 msgid "Add files asking the name of the archive and quit the program" -msgstr "Pridať súbory, vyžiadať si názov archívu a ukončiť program" +msgstr "Pridá súbory, vyžiada názov archívu a ukončí program" -#: ../src/main.c:59 +# cmd option +#: ../src/main.c:74 msgid "Extract archives to the specified folder and quit the program" -msgstr "Rozbaliť archívy do zadaného cieľového priečinka a ukončiť program" +msgstr "Rozbalí archívy do zadaného cieľového priečinka a ukončí program" -#: ../src/main.c:60 ../src/main.c:72 +#: ../src/main.c:75 ../src/main.c:87 msgid "FOLDER" msgstr "PRIEČINOK" -#: ../src/main.c:63 +# cmd option +#: ../src/main.c:78 msgid "Extract archives asking the destination folder and quit the program" -msgstr "Rozbaliť archívy, vyžiadať cieľový priečinok a ukončiť program" +msgstr "Rozbalí archívy, vyžiada cieľový priečinok a ukončí program" -#: ../src/main.c:67 +# cmd option +#: ../src/main.c:82 msgid "" "Extract the contents of the archives in the archive folder and quit the " "program" -msgstr "Rozbaliť obsah archívov v priečinku archívu a ukončiť program" +msgstr "Rozbalí obsah archívov v priečinku archívu a ukončí program" -#: ../src/main.c:71 +# cmd option +#: ../src/main.c:86 msgid "Default folder to use for the '--add' and '--extract' commands" msgstr "" -"Predvolený priečinok, ktorý sa má použiť pri príkazoch '--add' a '--extract'" +"Predvolený priečinok, ktorý sa má použiť pri príkazoch „--add“ a „--extract“" -#: ../src/main.c:75 +# cmd option +#: ../src/main.c:90 msgid "Create destination folder without asking confirmation" -msgstr "Vytvoriť cieľový priečinok bez vyžiadania potvrdenia" +msgstr "Vytvorí cieľový priečinok bez vyžiadania potvrdenia" -#: ../src/main.c:296 ../src/server.c:444 -msgid "- Create and modify an archive" -msgstr "- Vytvoriť a upraviť archív" +# cmd option +#: ../src/main.c:94 +msgid "Use the notification system to notify the operation completion" +msgstr "Použije systém upozornení na upozornenie o dokončení operácie" + +# cmd option +#: ../src/main.c:97 +msgid "Start as a service" +msgstr "Spustí ako službu" + +# cmd option +#: ../src/main.c:100 +msgid "Show version" +msgstr "Zobrazí verziu" -#: ../src/main.c:312 ../src/server.c:457 +#. manually set name and icon +#: ../src/main.c:634 msgid "File Roller" msgstr "File Roller" +# PK: to je nieco ako bublina co robi ten program, ale v cmd, je to spravny tvar? +#: ../src/main.c:665 +msgid "- Create and modify an archive" +msgstr "- Vytvoriť a upraviť archív" + +#: ../src/ui/add-dialog-options.ui.h:1 +msgid "Add" +msgstr "Pridať" + +#: ../src/ui/add-dialog-options.ui.h:2 +msgid "Include _files:" +msgstr "Zahrnúť _súbory:" + +#: ../src/ui/add-dialog-options.ui.h:3 +msgid "E_xclude files:" +msgstr "V_ynechať súbory:" + +#: ../src/ui/add-dialog-options.ui.h:4 +msgid "_Exclude folders:" +msgstr "Vyn_echať priečinky:" + +#: ../src/ui/add-dialog-options.ui.h:5 ../src/ui/extract-dialog-options.ui.h:5 +msgid "example: *.o; *.bak" +msgstr "príklad: *.o; *.bak" + +#: ../src/ui/add-dialog-options.ui.h:6 ../src/ui/extract-dialog-options.ui.h:6 +msgid "Actions" +msgstr "Akcie" + +#: ../src/ui/add-dialog-options.ui.h:7 +msgid "Add only if _newer" +msgstr "Pridať iba ak je _novší" + +#: ../src/ui/add-dialog-options.ui.h:8 +msgid "_Follow symbolic links" +msgstr "_Nasledovať symbolické odkazy" + +#: ../src/ui/app-menu.ui.h:1 +msgid "_New Archive" +msgstr "_Nový archív" + +#: ../src/ui/app-menu.ui.h:2 ../src/ui.h:34 +msgid "_Help" +msgstr "_Pomocník" + +#: ../src/ui/app-menu.ui.h:3 +msgid "_About Archive Manager" +msgstr "_O programe Správca archívov" + +#: ../src/ui/app-menu.ui.h:4 +msgid "_Quit" +msgstr "U_končiť" + +#: ../src/ui/ask-password.ui.h:1 ../src/ui/new-archive-dialog-options.ui.h:1 +#: ../src/ui/new-archive-dialog.ui.h:4 +msgid "_Password:" +msgstr "_Heslo:" + +#: ../src/ui/delete.ui.h:1 +msgid "Delete" +msgstr "Odstrániť" + +#: ../src/ui/delete.ui.h:2 ../src/ui/extract-dialog-options.ui.h:4 +msgid "_Files:" +msgstr "_Súbory:" + +#: ../src/ui/delete.ui.h:3 +msgid "example: *.txt; *.doc" +msgstr "príklad: *.txt; *.doc" + +#: ../src/ui/delete.ui.h:4 ../src/ui/extract-dialog-options.ui.h:2 +msgid "_All files" +msgstr "_Všetky súbory" + +#: ../src/ui/delete.ui.h:5 ../src/ui/extract-dialog-options.ui.h:3 +msgid "_Selected files" +msgstr "Vy_brané súbory" + +#: ../src/ui/error-dialog.ui.h:1 +msgid "C_ommand Line Output:" +msgstr "Výstup _príkazového riadka:" + +#: ../src/ui/extract-dialog-options.ui.h:7 +msgid "_Keep directory structure" +msgstr "_Zachovať šturktúru adresárov" + +#: ../src/ui/extract-dialog-options.ui.h:8 +msgid "Do not _overwrite newer files" +msgstr "_Neprepisovať novšie súbory" + +#: ../src/ui/file-selector.ui.h:2 ../src/ui.h:188 +msgid "Go up one level" +msgstr "Prejde o jednu úroveň vyššie" + +#: ../src/ui/file-selector.ui.h:3 +msgid "Places" +msgstr "Miesta" + +#: ../src/ui/file-selector.ui.h:7 +msgid "_Select All" +msgstr "Vybr_ať všetko" + +#: ../src/ui/file-selector.ui.h:8 ../src/ui.h:101 +msgid "Dese_lect All" +msgstr "_Odznačiť všetko" + +#: ../src/ui/file-selector.ui.h:9 +msgid "Show Hidden Files" +msgstr "Zobraziť skryté súbory" + #: ../src/ui.h:31 msgid "_Archive" msgstr "_Archív" @@ -1325,10 +1165,6 @@ msgid "_View" msgstr "_Zobraziť" -#: ../src/ui.h:34 -msgid "_Help" -msgstr "_Pomocník" - #: ../src/ui.h:35 msgid "_Arrange Files" msgstr "_Usporiadať súbory" @@ -1339,331 +1175,253 @@ #: ../src/ui.h:42 msgid "_Add Files…" -msgstr "Pri_dať súbory…" +msgstr "_Pridať súbory…" #: ../src/ui.h:43 ../src/ui.h:47 msgid "Add files to the archive" msgstr "Pridá súbory do archívu" -#: ../src/ui.h:50 -msgid "Add a _Folder…" -msgstr "Pridať _priečinok…" - -#: ../src/ui.h:51 ../src/ui.h:55 -msgid "Add a folder to the archive" -msgstr "Pridá priečinok do archívu" - -#: ../src/ui.h:54 -msgid "Add Folder" -msgstr "Pridať priečinok" - -#: ../src/ui.h:59 +#: ../src/ui.h:51 msgid "Close the current archive" msgstr "Zatvorí aktuálny archív" -#: ../src/ui.h:62 +#: ../src/ui.h:54 msgid "Contents" msgstr "Obsah" -#: ../src/ui.h:63 +#: ../src/ui.h:55 msgid "Display the File Roller Manual" msgstr "Zobrazí príručku pre File Roller" -#: ../src/ui.h:68 ../src/ui.h:89 +#: ../src/ui.h:60 ../src/ui.h:81 msgid "Copy the selection" msgstr "Kopíruje výber" -#: ../src/ui.h:72 ../src/ui.h:93 +#: ../src/ui.h:64 ../src/ui.h:85 msgid "Cut the selection" msgstr "Vystrihne výber" -#: ../src/ui.h:76 ../src/ui.h:97 +#: ../src/ui.h:68 ../src/ui.h:89 msgid "Paste the clipboard" msgstr "Vloží obsah schránky" -#: ../src/ui.h:79 ../src/ui.h:100 +#: ../src/ui.h:71 ../src/ui.h:92 msgid "_Rename…" msgstr "Pre_menovať…" -#: ../src/ui.h:80 ../src/ui.h:101 +#: ../src/ui.h:72 ../src/ui.h:93 msgid "Rename the selection" msgstr "Premenuje výber" -#: ../src/ui.h:84 ../src/ui.h:105 +#: ../src/ui.h:76 ../src/ui.h:97 msgid "Delete the selection from the archive" msgstr "Odstráni výber z archívu" -#: ../src/ui.h:109 -msgid "Dese_lect All" -msgstr "_Odznačiť všetko" - -#: ../src/ui.h:110 +#: ../src/ui.h:102 msgid "Deselect all files" msgstr "Zruší výber všetkých súborov" -#: ../src/ui.h:113 ../src/ui.h:117 +#: ../src/ui.h:105 ../src/ui.h:109 msgid "_Extract…" msgstr "_Rozbaliť…" -#: ../src/ui.h:114 ../src/ui.h:118 ../src/ui.h:122 +#: ../src/ui.h:106 ../src/ui.h:110 ../src/ui.h:114 msgid "Extract files from the archive" msgstr "Rozbalí súbory z archívu" -#: ../src/ui.h:125 +#: ../src/ui.h:117 msgid "Find…" msgstr "Nájsť…" -#: ../src/ui.h:130 +#: ../src/ui.h:122 msgid "New…" msgstr "Nový…" -#: ../src/ui.h:131 +#: ../src/ui.h:123 msgid "Create a new archive" msgstr "Vytvorí nový archív" -#: ../src/ui.h:134 +#: ../src/ui.h:126 msgid "Open…" msgstr "Otvoriť…" -#: ../src/ui.h:135 ../src/ui.h:139 +#: ../src/ui.h:127 ../src/ui.h:131 msgid "Open archive" msgstr "Otvorí archív" -#: ../src/ui.h:142 +#: ../src/ui.h:134 msgid "_Open With…" msgstr "Otvoriť _pomocou…" -#: ../src/ui.h:143 +#: ../src/ui.h:135 msgid "Open selected files with an application" msgstr "Otvorí vybrané súbory pomocou aplikácie" -#: ../src/ui.h:146 +#: ../src/ui.h:138 msgid "Pass_word…" msgstr "_Heslo…" -#: ../src/ui.h:147 +#: ../src/ui.h:139 msgid "Specify a password for this archive" msgstr "Zadajte heslo pre tento archív" -#: ../src/ui.h:151 +#: ../src/ui.h:143 msgid "Show archive properties" msgstr "Zobrazí vlastnosti archívu" -#: ../src/ui.h:155 +#: ../src/ui.h:147 msgid "Reload current archive" msgstr "Znovu načíta aktuálny archív" -#: ../src/ui.h:158 +#: ../src/ui.h:150 msgid "Save As…" msgstr "Uložiť ako…" -#: ../src/ui.h:159 +#: ../src/ui.h:151 msgid "Save the current archive with a different name" msgstr "Uloží aktuálny archív pod iným názvom" -#: ../src/ui.h:163 +#: ../src/ui.h:155 msgid "Select all files" msgstr "Vyberie všetky súbory" -#: ../src/ui.h:167 -msgid "Stop current operation" -msgstr "Zastaví aktuálnu operáciu" - -#: ../src/ui.h:170 +#: ../src/ui.h:158 msgid "_Test Integrity" msgstr "_Kontrola integrity" -#: ../src/ui.h:171 +#: ../src/ui.h:159 msgid "Test whether the archive contains errors" msgstr "Otestuje, či archív obsahuje chyby" -#: ../src/ui.h:175 ../src/ui.h:179 +#: ../src/ui.h:163 ../src/ui.h:167 msgid "Open the selected file" msgstr "Otvorí vybraný súbor" -#: ../src/ui.h:183 ../src/ui.h:187 +#: ../src/ui.h:171 ../src/ui.h:175 msgid "Open the selected folder" msgstr "Otvorí vybraný priečinok" -#: ../src/ui.h:192 +#: ../src/ui.h:180 msgid "Go to the previous visited location" msgstr "Prejde na predchádzajúce navštívené umiestnenie" -#: ../src/ui.h:196 +#: ../src/ui.h:184 msgid "Go to the next visited location" msgstr "Prejde na nasledujúce navštívené umiestnenie" -#: ../src/ui.h:200 -msgid "Go up one level" -msgstr "Prejde o jednu úroveň vyššie" - #. Translators: the home location is the home folder. -#: ../src/ui.h:205 +#: ../src/ui.h:193 msgid "Go to the home location" msgstr "Prejde do domovského priečinka" -#: ../src/ui.h:213 +#: ../src/ui.h:201 msgid "_Toolbar" msgstr "_Lišta s nástrojmi" -#: ../src/ui.h:214 +# tooltip +#: ../src/ui.h:202 msgid "View the main toolbar" -msgstr "Zobraziť hlavnú lištu s nástrojmi" +msgstr "Zobrazí hlavnú lištu s nástrojmi" -#: ../src/ui.h:218 +#: ../src/ui.h:206 msgid "Stat_usbar" msgstr "_Stavová lišta" -#: ../src/ui.h:219 +# tooltip +#: ../src/ui.h:207 msgid "View the statusbar" -msgstr "Zobraziť stavovú lištu" - -#: ../src/ui.h:223 -msgid "_Reversed Order" -msgstr "_Opačné poradie" - -#: ../src/ui.h:224 -msgid "Reverse the list order" -msgstr "Obráti usporiadanie zoznamu" +msgstr "Zobrazí stavovú lištu" -#: ../src/ui.h:228 +#: ../src/ui.h:211 msgid "_Folders" msgstr "_Priečinky" -#: ../src/ui.h:238 +#: ../src/ui.h:221 msgid "View All _Files" -msgstr "Zobraziť všetky _súbory" +msgstr "_Zobraziť všetky súbory" -#: ../src/ui.h:241 +#: ../src/ui.h:224 msgid "View as a F_older" msgstr "Zobraziť _ako priečinok" -#: ../src/ui.h:249 -msgid "by _Name" -msgstr "podľa _názvu" - -#: ../src/ui.h:250 -msgid "Sort file list by name" -msgstr "Zoradí zoznam súborov podľa názvu" - -#: ../src/ui.h:252 -msgid "by _Size" -msgstr "podľa _veľkosti" - -#: ../src/ui.h:253 -msgid "Sort file list by file size" -msgstr "Zoradí zoznam súborov podľa veľkosti" - -#: ../src/ui.h:255 -msgid "by T_ype" -msgstr "podľa _typu" - -#: ../src/ui.h:256 -msgid "Sort file list by type" -msgstr "Zoradí zoznam súborov podľa typu" - -#: ../src/ui.h:258 -msgid "by _Date Modified" -msgstr "podľa _dátumu zmeny" - -#: ../src/ui.h:259 -msgid "Sort file list by modification time" -msgstr "Zoradí zoznam súborov podľa času zmeny" - -#. Translators: this is the "sort by file location" menu item -#: ../src/ui.h:262 -msgid "by _Location" -msgstr "podľa u_miestnenia" - -#. Translators: location is the file location -#: ../src/ui.h:264 -msgid "Sort file list by location" -msgstr "Zoradí zoznam súborov podľa ich umiestnenia" - -#~ msgid "Modified on:" -#~ msgstr "Zmenený:" - -#~ msgid "The file doesn't exist" -#~ msgstr "Súbor neexistuje" - -#~ msgid "The new name is void." -#~ msgstr "Nový názov je prázdny." - -#~ msgid "The new name is equal to the old one." -#~ msgstr "Nový názov je rovnaký ako starý." - -#~ msgid "_Add Files..." -#~ msgstr "Pridať _súbory..." - -#~ msgid "Add a _Folder..." -#~ msgstr "Pridať p_riečinok..." - -#~ msgid "_Rename..." -#~ msgstr "Pre_menovať..." - -#~ msgid "_Extract..." -#~ msgstr "_Rozbaliť..." - -#~ msgid "Find..." -#~ msgstr "Nájsť..." - -#~ msgid "_Last Output" -#~ msgstr "Posledný _výstup" - -#~ msgid "View the output produced by the last executed command" -#~ msgstr "Zobraziť výstup vyprodukovaný posledným spusteným príkazom" - -#~ msgid "New..." -#~ msgstr "Nový..." - -#~ msgid "Open..." -#~ msgstr "Otvoriť..." - -#~ msgid "Pass_word..." -#~ msgstr "H_eslo..." - -#~ msgid "A_vailable application:" -#~ msgstr "_Dostupná aplikácia:" - -#~ msgid "Open Files" -#~ msgstr "Otvoriť súbory" - -#~ msgid "R_ecent applications:" -#~ msgstr "N_edávne aplikácie:" - -#~ msgid "_Application:" -#~ msgstr "_Aplikácia:" - -#~ msgid "" -#~ "File Roller is free software; you can redistribute it and/or modify it " -#~ "under the terms of the GNU General Public License as published by the " -#~ "Free Software Foundation; either version 2 of the License, or (at your " -#~ "option) any later version." -#~ msgstr "" -#~ "File Roller je slobodný softvér; môžete ho ďalej šíriť a/alebo upravovať " -#~ "podľa ustanovení Všeobecnej verejnej licencie GNU tak, ako bola vydaná " -#~ "organizáciou Free Software Foundation, a to buď verzie 2 tejto licencie, " -#~ "alebo (podľa vášho uváženia) ktorejkoľvek neskoršej verzie." - -#~ msgid "" -#~ "File Roller is distributed in the hope that it will be useful, but " -#~ "WITHOUT ANY WARRANTY; without even the implied warranty of " -#~ "MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General " -#~ "Public License for more details." -#~ msgstr "" -#~ "Program File Roller je rozširovaný v nádeji, že bude užitočný, avšak BEZ " -#~ "AKEJKOĽVEK ZÁRUKY. Neposkytujú sa ani odvodené záruky OBCHODOVATEĽNOSTI " -#~ "alebo VHODNOSTI PRE URČITÝ ÚČEL. Ďalšie podrobnosti hľadajte vo " -#~ "Všeobecnej verejnej licencii GNU." - -#~ msgid "" -#~ "You should have received a copy of the GNU General Public License along " -#~ "with File Roller; if not, write to the Free Software Foundation, Inc., 51 " -#~ "Franklin St, Fifth Floor, Boston, MA 02110-1301 USA" -#~ msgstr "" -#~ "Kópiu Všeobecnej verejnej licencie GNU ste mali obdržať spolu s programom " -#~ "File Roller. Ak sa tak nestalo, napíšte na Free Software Foundation, " -#~ "Inc., 51 Franklin St, Fifth Floor, Boston, MA 02111-1301 USA" +#: ../src/ui/new-archive-dialog-options.ui.h:2 +#: ../src/ui/new-archive-dialog.ui.h:5 +msgid "_Encrypt the file list too" +msgstr "_Zašifrovať aj zoznam súborov" + +#. this is part of a sentence, for example "split into volumes of 10.0 MB", where MB stands for megabyte. +#: ../src/ui/new-archive-dialog-options.ui.h:3 +#: ../src/ui/new-archive-dialog.ui.h:7 +msgid "Split into _volumes of" +msgstr "_Rozdeliť na zväzky po" + +#. MB means megabytes +#: ../src/ui/new-archive-dialog-options.ui.h:5 +#: ../src/ui/new-archive-dialog.ui.h:9 +msgid "MB" +msgstr "MB" + +#: ../src/ui/new-archive-dialog-options.ui.h:6 +#: ../src/ui/new-archive-dialog.ui.h:10 +msgid "_Other Options" +msgstr "Ďalšie _voľby" + +#: ../src/ui/new-archive-dialog.ui.h:1 +msgid "_Filename:" +msgstr "Názov _súboru:" + +# * https://bugzilla.gnome.org/show_bug.cgi?id=611359 +#: ../src/ui/new-archive-dialog.ui.h:3 +msgid "Location" +msgstr "Umiestnenie" + +#: ../src/ui/password.ui.h:1 +msgid "Password" +msgstr "Heslo" + +#: ../src/ui/password.ui.h:2 +msgid "_Encrypt the file list" +msgstr "_Zašifrovať zoznam súborov" + +#: ../src/ui/properties.ui.h:1 +msgctxt "File" +msgid "Name:" +msgstr "Názov:" + +#: ../src/ui/properties.ui.h:2 +msgid "Archive size:" +msgstr "Veľkosť archívu:" -#~ msgid "_File" -#~ msgstr "_Súbor" +#. after the colon there is a folder name. +#: ../src/ui/properties.ui.h:4 +msgid "Location:" +msgstr "Umiestnenie:" + +#: ../src/ui/properties.ui.h:5 +msgid "Compression ratio:" +msgstr "Kompresný pomer:" + +#: ../src/ui/properties.ui.h:6 +msgid "Last modified:" +msgstr "Dátum zmeny:" + +#: ../src/ui/properties.ui.h:7 +msgid "Content size:" +msgstr "Veľkosť obsahu:" + +#: ../src/ui/properties.ui.h:8 +msgid "Number of files:" +msgstr "Počet súborov:" + +#. after the colon there is a file type. +#: ../src/ui/properties.ui.h:10 +msgid "Type:" +msgstr "Typ:" + +#: ../src/ui/update.ui.h:1 +msgid "_Update" +msgstr "_Aktualizovať" + +#: ../src/ui/update.ui.h:3 +msgid "S_elect the files you want to update:" +msgstr "Vyb_erte súbory, ktoré chcete aktualizovať:" diff -Nru file-roller-3.6.0/src/Makefile.am file-roller-3.6.3/src/Makefile.am --- file-roller-3.6.0/src/Makefile.am 2012-08-11 10:37:11.000000000 +0000 +++ file-roller-3.6.3/src/Makefile.am 2012-11-15 08:20:27.000000000 +0000 @@ -201,7 +201,7 @@ $^> xgen-$(@F) \ && mv -f xgen-$(@F) fr-enum-types.c ) -RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies file-roller.gresource.xml) +RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/file-roller.gresource.xml) fr-resources.c: file-roller.gresource.xml $(RESOURCES) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(srcdir) --generate --c-name fr $(srcdir)/file-roller.gresource.xml diff -Nru file-roller-3.6.0/src/Makefile.in file-roller-3.6.3/src/Makefile.in --- file-roller-3.6.0/src/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/src/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. @@ -479,7 +479,7 @@ preferences.h rar-utils.c rar-utils.h typedefs.h ui.h \ $(MKDTEMP_FILES) $(BUILT_SOURCES) $(am__append_1) \ $(am__append_2) -RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies file-roller.gresource.xml) +RESOURCES = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sourcedir=$(srcdir) $(srcdir)/file-roller.gresource.xml) file_roller_SOURCES = \ $(COMMON_SOURCES) \ main.c diff -Nru file-roller-3.6.0/src/commands/Makefile.in file-roller-3.6.3/src/commands/Makefile.in --- file-roller-3.6.0/src/commands/Makefile.in 2012-09-24 19:08:15.000000000 +0000 +++ file-roller-3.6.3/src/commands/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/src/dlg-add.c file-roller-3.6.3/src/dlg-add.c --- file-roller-3.6.0/src/dlg-add.c 2012-08-09 19:45:47.000000000 +0000 +++ file-roller-3.6.3/src/dlg-add.c 2012-11-15 20:22:47.000000000 +0000 @@ -276,6 +276,8 @@ { if (directory == NULL) directory = fr_window_get_add_default_dir (data->window); + if (directory == NULL) + directory = _g_file_get_home (); if (files != NULL) fr_file_selector_dialog_set_selected_files (FR_FILE_SELECTOR_DIALOG (data->dialog), files); @@ -412,12 +414,13 @@ char *exclude_folders = NULL; gboolean update; gboolean no_follow_symlinks; - GFile *folder; + GFile *folder = NULL; int i; base_dir = g_settings_get_string (data->settings, PREF_ADD_CURRENT_FOLDER); uris = g_settings_get_strv (data->settings, PREF_ADD_SELECTED_FILES); - folder = g_file_new_for_uri (base_dir); + if (g_strcmp0 (base_dir, "") != 0) + folder = g_file_new_for_uri (base_dir); include_files = g_settings_get_string (data->settings, PREF_ADD_INCLUDE_FILES); exclude_files = g_settings_get_string (data->settings, PREF_ADD_EXCLUDE_FILES); exclude_folders = g_settings_get_string (data->settings, PREF_ADD_EXCLUDE_FOLDERS); diff -Nru file-roller-3.6.0/src/dlg-batch-add.c file-roller-3.6.3/src/dlg-batch-add.c --- file-roller-3.6.0/src/dlg-batch-add.c 2012-08-27 19:01:03.000000000 +0000 +++ file-roller-3.6.3/src/dlg-batch-add.c 2012-11-15 20:21:33.000000000 +0000 @@ -43,7 +43,11 @@ if (file == NULL) return; + fr_window_set_password (window, fr_new_archive_dialog_get_password (FR_NEW_ARCHIVE_DIALOG (dialog))); + fr_window_set_encrypt_header (window, fr_new_archive_dialog_get_encrypt_header (FR_NEW_ARCHIVE_DIALOG (dialog))); + fr_window_set_volume_size (window, fr_new_archive_dialog_get_volume_size (FR_NEW_ARCHIVE_DIALOG (dialog))); fr_window_create_archive_and_continue (window, file, mime_type, NULL); + g_object_unref (file); } else @@ -65,7 +69,9 @@ g_return_if_fail (file_list != NULL); first_file = G_FILE (file_list->data); - parent = g_file_get_parent (first_file); + parent = _g_object_ref (fr_window_get_add_default_dir (window)); + if (parent == NULL) + parent = g_file_get_parent (first_file); filename = NULL; if (file_list->next == NULL) diff -Nru file-roller-3.6.0/src/dlg-delete.c file-roller-3.6.3/src/dlg-delete.c --- file-roller-3.6.0/src/dlg-delete.c 2012-06-28 07:21:00.000000000 +0000 +++ file-roller-3.6.3/src/dlg-delete.c 2012-11-25 10:25:41.000000000 +0000 @@ -69,7 +69,7 @@ if (selected_files) { file_list = data->selected_files; - data->selected_files = NULL; /* do not the list when destroying the dialog. */ + data->selected_files = NULL; /* do not free the list when destroying the dialog. */ } else if (pattern_files) { const char *pattern; diff -Nru file-roller-3.6.0/src/dlg-package-installer.c file-roller-3.6.3/src/dlg-package-installer.c --- file-roller-3.6.0/src/dlg-package-installer.c 2012-08-06 13:23:48.000000000 +0000 +++ file-roller-3.6.3/src/dlg-package-installer.c 2012-09-28 09:29:43.000000000 +0000 @@ -25,23 +25,28 @@ #include #include #include "dlg-package-installer.h" +#include "gio-utils.h" +#include "glib-utils.h" #include "gtk-utils.h" #include "fr-init.h" +#define BUFFER_SIZE_FOR_PRELOAD 32 + + typedef struct { - FrWindow *window; - FrArchive *archive; - FrAction action; - const char *packages; + FrWindow *window; + FrAction action; + GCancellable *cancellable; + const char *packages; } InstallerData; static void installer_data_free (InstallerData *idata) { - g_object_unref (idata->archive); g_object_unref (idata->window); + _g_object_ref (idata->cancellable); g_free (idata); } @@ -159,7 +164,7 @@ GDBusConnection *connection; GError *error = NULL; - connection = g_bus_get_sync (G_BUS_TYPE_SESSION, NULL, &error); + connection = g_bus_get_sync (G_BUS_TYPE_SESSION, idata->cancellable, &error); if (connection != NULL) { GdkWindow *window; GDBusProxy *proxy; @@ -180,7 +185,7 @@ "org.freedesktop.PackageKit", "/org/freedesktop/PackageKit", "org.freedesktop.PackageKit.Modify", - NULL, + idata->cancellable, &error); if (proxy != NULL) { @@ -204,7 +209,7 @@ "hide-confirm-search,hide-finished,hide-warning"), G_DBUS_CALL_FLAGS_NONE, G_MAXINT, - NULL, + idata->cancellable, packagekit_install_package_names_ready_cb, idata); @@ -248,30 +253,50 @@ #endif /* ENABLE_PACKAGEKIT */ -void -dlg_package_installer (FrWindow *window, - FrArchive *archive, - FrAction action) +static void +file_buffer_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { - InstallerData *idata; - GType archive_type; - FrArchive *preferred_archive; + InstallerData *idata = user_data; + GFile *file; + char *buffer; + gsize buffer_size; + GError *error = NULL; + char *uri; + const char *mime_type; + gboolean result_uncertain; + GType archive_type; + FrArchive *preferred_archive; + + file = G_FILE (source_object); + if (! _g_file_load_buffer_finish (file, result, &buffer, &buffer_size, &error)) { + package_installer_terminated (idata, FR_ERROR_GENERIC, error->message); + g_error_free (error); + return; + } - idata = g_new0 (InstallerData, 1); - idata->window = g_object_ref (window); - idata->archive = g_object_ref (archive); - idata->action = action; + uri = g_file_get_uri (file); + mime_type = g_content_type_guess (uri, (guchar *) buffer, buffer_size, &result_uncertain); + if (result_uncertain) { + mime_type = _g_mime_type_get_from_content (buffer, buffer_size); + if (mime_type == NULL) + mime_type = _g_mime_type_get_from_filename (file); + } - archive_type = get_preferred_archive_for_mime_type (idata->archive->mime_type, FR_ARCHIVE_CAN_READ_WRITE); + g_free (uri); + g_free (buffer); + + archive_type = get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ_WRITE); if (archive_type == 0) - archive_type = get_preferred_archive_for_mime_type (idata->archive->mime_type, FR_ARCHIVE_CAN_READ); + archive_type = get_preferred_archive_for_mime_type (mime_type, FR_ARCHIVE_CAN_READ); if (archive_type == 0) { package_installer_terminated (idata, FR_ERROR_GENERIC, _("Archive type not supported.")); return; } preferred_archive = g_object_new (archive_type, 0); - idata->packages = fr_archive_get_packages (preferred_archive, idata->archive->mime_type); + idata->packages = fr_archive_get_packages (preferred_archive, mime_type); g_object_unref (preferred_archive); if (idata->packages == NULL) { @@ -286,7 +311,7 @@ GtkWidget *dialog; secondary_text = g_strdup_printf (_("There is no command installed for %s files.\nDo you want to search for a command to open this file?"), - g_content_type_get_description (idata->archive->mime_type)); + g_content_type_get_description (mime_type)); dialog = _gtk_message_dialog_new (GTK_WINDOW (idata->window), GTK_DIALOG_MODAL, GTK_STOCK_DIALOG_ERROR, @@ -307,3 +332,24 @@ #endif /* ENABLE_PACKAGEKIT */ } + + +void +dlg_package_installer (FrWindow *window, + GFile *file, + FrAction action, + GCancellable *cancellable) +{ + InstallerData *idata; + + idata = g_new0 (InstallerData, 1); + idata->window = g_object_ref (window); + idata->action = action; + idata->cancellable = _g_object_ref (cancellable); + + _g_file_load_buffer_async (file, + BUFFER_SIZE_FOR_PRELOAD, + cancellable, + file_buffer_ready_cb, + idata); +} diff -Nru file-roller-3.6.0/src/dlg-package-installer.h file-roller-3.6.3/src/dlg-package-installer.h --- file-roller-3.6.0/src/dlg-package-installer.h 2011-08-04 07:46:36.000000000 +0000 +++ file-roller-3.6.3/src/dlg-package-installer.h 2012-09-28 09:16:01.000000000 +0000 @@ -24,8 +24,9 @@ #include "fr-window.h" -void dlg_package_installer (FrWindow *window, - FrArchive *archive, - FrAction action); +void dlg_package_installer (FrWindow *window, + GFile *file, + FrAction action, + GCancellable *cancellable); #endif /* DLG_PACKAGE_INSTALLER_H */ diff -Nru file-roller-3.6.0/src/dlg-update.c file-roller-3.6.3/src/dlg-update.c --- file-roller-3.6.0/src/dlg-update.c 2012-08-06 13:23:48.000000000 +0000 +++ file-roller-3.6.3/src/dlg-update.c 2012-11-25 14:17:15.000000000 +0000 @@ -39,7 +39,7 @@ typedef struct { FrWindow *window; - GtkBuilder *builder; + GtkBuilder *builder; GtkWidget *update_file_dialog; GtkWidget *update_file_primary_text_label; @@ -62,7 +62,8 @@ DialogData *data) { fr_window_update_dialog_closed (data->window); - g_object_unref (G_OBJECT (data->builder)); + g_object_unref (data->window); + g_object_unref (data->builder); if (data->file_list != NULL) g_list_free (data->file_list); g_free (data); @@ -286,7 +287,7 @@ } data->file_list = NULL; - data->window = window; + data->window = g_object_ref (window); /* Get the widgets. */ diff -Nru file-roller-3.6.0/src/file-data.c file-roller-3.6.3/src/file-data.c --- file-roller-3.6.0/src/file-data.c 2012-08-06 13:23:48.000000000 +0000 +++ file-roller-3.6.3/src/file-data.c 2012-11-25 15:02:02.000000000 +0000 @@ -137,21 +137,38 @@ find_path_in_file_data_array (GPtrArray *array, const char *path) { - int l, r, p, cmp = -1; + int path_l; + int left, right, p, cmp = -1; FileData *fd; - l = 0; - r = array->len; - while (l < r) { - p = l + ((r - l) / 2); + if (path == NULL) + return -1; + + path_l = strlen (path); + left = 0; + right = array->len; + while (left < right) { + p = left + ((right - left) / 2); fd = (FileData *) g_ptr_array_index (array, p); + cmp = strcmp (path, fd->original_path); + if (cmp != 0) { + /* consider '/path/to/dir' and '/path/to/dir/' the same path */ + + int original_path_l = strlen (fd->original_path); + if ((path_l == original_path_l - 1) && (fd->original_path[original_path_l - 1] == '/')) { + int cmp2 = strncmp (path, fd->original_path, original_path_l - 1); + if (cmp2 == 0) + cmp = cmp2; + } + } + if (cmp == 0) return p; else if (cmp < 0) - r = p; + right = p; else - l = p + 1; + left = p + 1; } return -1; diff -Nru file-roller-3.6.0/src/fr-archive-libarchive.c file-roller-3.6.3/src/fr-archive-libarchive.c --- file-roller-3.6.0/src/fr-archive-libarchive.c 2012-08-23 06:58:50.000000000 +0000 +++ file-roller-3.6.3/src/fr-archive-libarchive.c 2012-10-13 11:25:15.000000000 +0000 @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -510,6 +511,7 @@ size_t buffer_size; int64_t offset; GError *local_error = NULL; + __LA_MODE_T filetype; if (g_cancellable_is_cancelled (cancellable)) break; @@ -598,8 +600,61 @@ /* create the file */ + filetype = archive_entry_filetype (entry); + if (load_data->error == NULL) { - switch (archive_entry_filetype (entry)) { + const char *linkname; + + linkname = archive_entry_hardlink (entry); + if (linkname != NULL) { + char *link_fullpath; + GFile *link_file; + char *oldname; + char *newname; + int r; + + link_fullpath = (*linkname == '/') ? g_strdup (linkname) : g_strconcat ("/", linkname, NULL); + link_file = g_file_get_child (extract_data->destination, _g_path_get_relative_basename (link_fullpath, extract_data->base_dir, extract_data->junk_paths)); + oldname = g_file_get_path (link_file); + newname = g_file_get_path (file); + + if ((oldname != NULL) && (newname != NULL)) + r = link (oldname, newname); + else + r = -1; + + if (r == 0) { + __LA_INT64_T filesize; + + if (archive_entry_size_is_set (entry)) + filesize = archive_entry_size (entry); + else + filesize = -1; + + if (filesize > 0) + filetype = AE_IFREG; /* treat as a regular file to save the data */ + } + else { + char *uri; + char *msg; + + uri = g_file_get_uri (file); + msg = g_strdup_printf ("Could not create the hard link %s", uri); + load_data->error = g_error_new_literal (G_IO_ERROR, G_IO_ERROR_FAILED, msg); + + g_free (msg); + g_free (uri); + } + + g_free (newname); + g_free (oldname); + g_object_unref (link_file); + g_free (link_fullpath); + } + } + + if (load_data->error == NULL) { + switch (filetype) { case AE_IFDIR: if (! g_file_make_directory (file, cancellable, &local_error)) { if (! g_error_matches (local_error, G_IO_ERROR, G_IO_ERROR_EXISTS)) @@ -635,8 +690,10 @@ load_data->error = g_error_copy (local_error); g_error_free (local_error); } - else - _g_file_set_attributes_from_entry (file, entry, extract_data, cancellable); + archive_read_data_skip (a); + break; + + default: archive_read_data_skip (a); break; } diff -Nru file-roller-3.6.0/src/fr-archive.c file-roller-3.6.3/src/fr-archive.c --- file-roller-3.6.0/src/fr-archive.c 2012-08-11 17:32:39.000000000 +0000 +++ file-roller-3.6.3/src/fr-archive.c 2012-11-25 11:53:27.000000000 +0000 @@ -127,7 +127,8 @@ static void _fr_archive_set_file (FrArchive *self, - GFile *file) + GFile *file, + gboolean reset_mime_type) { if (self->priv->file != NULL) { g_object_unref (self->priv->file); @@ -136,7 +137,8 @@ if (file != NULL) self->priv->file = g_object_ref (file); - self->mime_type = NULL; + if (reset_mime_type) + self->mime_type = NULL; g_object_notify (G_OBJECT (self), "file"); } @@ -149,7 +151,7 @@ GFile *file; file = (uri != NULL) ? g_file_new_for_uri (uri) : NULL; - _fr_archive_set_file (self, file); + _fr_archive_set_file (self, file, TRUE); _g_object_unref (file); } @@ -167,7 +169,7 @@ switch (property_id) { case PROP_FILE: - _fr_archive_set_file (self, g_value_get_object (value)); + _fr_archive_set_file (self, g_value_get_object (value), TRUE); break; case PROP_MIME_TYPE: fr_archive_set_mime_type (self, g_value_get_string (value)); @@ -455,6 +457,7 @@ self->propTest = FALSE; self->propCanExtractAll = TRUE; self->propCanDeleteNonEmptyFolders = TRUE; + self->propCanDeleteAllFiles = TRUE; self->propCanExtractNonEmptyFolders = TRUE; self->propListFromFile = FALSE; @@ -547,24 +550,6 @@ /* -- fr_archive_new_for_creating -- */ -static const char * -get_mime_type_from_filename (GFile *file) -{ - const char *mime_type = NULL; - char *uri; - - if (file == NULL) - return NULL; - - uri = g_file_get_uri (file); - mime_type = get_mime_type_from_extension (_g_filename_get_extension (uri)); - - g_free (uri); - - return mime_type; -} - - static FrArchive * create_archive_for_mime_type (GType archive_type, GFile *file, @@ -594,13 +579,27 @@ fr_archive_create (GFile *file, const char *mime_type) { - GType archive_type; - FrArchive *archive; - GFile *parent; + FrArchiveCaps requested_capabilities; + GType archive_type; + FrArchive *archive; + GFile *parent; if (mime_type == NULL) - mime_type = get_mime_type_from_filename (file); - archive_type = get_archive_type_from_mime_type (mime_type, FR_ARCHIVE_CAN_WRITE); + mime_type = _g_mime_type_get_from_filename (file); + + /* try with the CAN_READ capability as well, this way we give + * priority to the commands that can read and write over commands + * that can only create a specific file format. */ + + requested_capabilities = FR_ARCHIVE_CAN_READ_WRITE; + archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities); + + /* if no command was found, remove the read capability and try again */ + + if (archive_type == 0) { + requested_capabilities ^= FR_ARCHIVE_CAN_READ; + archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities); + } archive = create_archive_for_mime_type (archive_type, file, @@ -659,90 +658,21 @@ } -static const char * -get_mime_type_from_magic_numbers (char *buffer, - gsize buffer_size) -{ -#if ENABLE_MAGIC - - static magic_t magic = NULL; - - if (magic == NULL) { - magic = magic_open (MAGIC_MIME_TYPE); - if (magic != NULL) - magic_load (magic, NULL); - else - g_warning ("unable to open magic database"); - } - - if (magic != NULL) { - const char * mime_type; - - mime_type = magic_buffer (magic, buffer, buffer_size); - if (mime_type) - return mime_type; - - g_warning ("unable to detect filetype from magic: %s", magic_error (magic)); - } - -#else - - static const struct magic { - const unsigned int off; - const unsigned int len; - const char * const id; - const char * const mime_type; - } - magic_ids [] = { - /* magic ids taken from magic/Magdir/archive from the file-4.21 tarball */ - { 0, 6, "7z\274\257\047\034", "application/x-7z-compressed" }, - { 7, 7, "**ACE**", "application/x-ace" }, - { 0, 2, "\x60\xea", "application/x-arj" }, - { 0, 3, "BZh", "application/x-bzip2" }, - { 0, 2, "\037\213", "application/x-gzip" }, - { 0, 4, "LZIP", "application/x-lzip" }, - { 0, 9, "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a", "application/x-lzop", }, - { 0, 4, "Rar!", "application/x-rar" }, - { 0, 4, "RZIP", "application/x-rzip" }, - { 0, 6, "\3757zXZ\000", "application/x-xz" }, - { 20, 4, "\xdc\xa7\xc4\xfd", "application/x-zoo", }, - { 0, 4, "PK\003\004", "application/zip" }, - { 0, 8, "PK00PK\003\004", "application/zip" }, - { 0, 4, "LRZI", "application/x-lrzip" }, - }; - - int i; - - for (i = 0; i < G_N_ELEMENTS (magic_ids); i++) { - const struct magic * const magic = &magic_ids[i]; - - if ((magic->off + magic->len) > buffer_size) - g_warning ("buffer underrun for mime-type '%s' magic", magic->mime_type); - else if (! memcmp (buffer + magic->off, magic->id, magic->len)) - return magic->mime_type; - } - -#endif - - return NULL; -} - - static FrArchive * create_archive_to_load_archive (GFile *file, const char *mime_type) { - FrArchiveCaps requested_capabilities = FR_ARCHIVE_CAN_DO_NOTHING; + FrArchiveCaps requested_capabilities; GType archive_type; if (mime_type == NULL) return FALSE; - /* try with the WRITE capability even when loading, this way we give + /* try with the CAN_WRITE capability even when loading, this way we give * priority to the commands that can read and write over commands * that can only read a specific file format. */ - requested_capabilities |= FR_ARCHIVE_CAN_READ_WRITE; + requested_capabilities = FR_ARCHIVE_CAN_READ_WRITE; archive_type = get_archive_type_from_mime_type (mime_type, requested_capabilities); /* if no command was found, remove the write capability and try again */ @@ -777,29 +707,23 @@ static void -open_archive_stream_ready_cb (GObject *source_object, +open_archive_buffer_ready_cb (GObject *source_object, GAsyncResult *result, gpointer user_data) { OpenData *open_data = user_data; - GFileInputStream *istream = G_FILE_INPUT_STREAM (source_object); GError *error = NULL; - gssize bytes_read; const char *mime_type; gboolean result_uncertain; FrArchive *archive; - char *local_mime_type, *uri; + char *uri; + char *local_mime_type; - bytes_read = g_input_stream_read_finish (G_INPUT_STREAM (istream), result, &error); - if (bytes_read == -1) { - g_object_unref (istream); + if (! _g_file_load_buffer_finish (open_data->file, result, &open_data->buffer, &open_data->buffer_size, &error)) { open_data_complete_with_error (open_data, error); return; } - open_data->buffer_size = bytes_read; - g_object_unref (istream); - archive = NULL; uri = g_file_get_uri (open_data->file); local_mime_type = g_content_type_guess (uri, (guchar *) open_data->buffer, open_data->buffer_size, &result_uncertain); @@ -808,10 +732,10 @@ archive = create_archive_to_load_archive (open_data->file, mime_type); } if (archive == NULL) { - mime_type = get_mime_type_from_magic_numbers (open_data->buffer, open_data->buffer_size); + mime_type = _g_mime_type_get_from_content (open_data->buffer, open_data->buffer_size); archive = create_archive_to_load_archive (open_data->file, mime_type); if (archive == NULL) { - mime_type = get_mime_type_from_filename (open_data->file); + mime_type = _g_mime_type_get_from_filename (open_data->file); archive = create_archive_to_load_archive (open_data->file, mime_type); if (archive == NULL) { error = g_error_new_literal (FR_ERROR, @@ -840,31 +764,6 @@ } -static void -open_archive_read_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) -{ - OpenData *open_data = user_data; - GFileInputStream *istream; - GError *error = NULL; - - istream = g_file_read_finish (G_FILE (source_object), result, &error); - if (istream == NULL) { - open_data_complete_with_error (open_data, error); - return; - } - - g_input_stream_read_async (G_INPUT_STREAM (istream), - open_data->buffer, - open_data->buffer_size, - G_PRIORITY_DEFAULT, - open_data->cancellable, - open_archive_stream_ready_cb, - open_data); -} - - void fr_archive_open (GFile *file, GCancellable *cancellable, @@ -882,19 +781,19 @@ callback, user_data, fr_archive_open); - open_data->buffer_size = BUFFER_SIZE_FOR_PRELOAD; - open_data->buffer = g_new (char, open_data->buffer_size); + open_data->buffer_size = 0; + open_data->buffer = NULL; g_simple_async_result_set_op_res_gpointer (open_data->result, open_data, (GDestroyNotify) open_data_free); /* load a few bytes to guess the archive type */ - g_file_read_async (open_data->file, - G_PRIORITY_DEFAULT, - open_data->cancellable, - open_archive_read_ready_cb, - open_data); + _g_file_load_buffer_async (open_data->file, + BUFFER_SIZE_FOR_PRELOAD, + open_data->cancellable, + open_archive_buffer_ready_cb, + open_data); } @@ -950,6 +849,7 @@ g_hash_table_remove_all (archive->files_hash); _g_ptr_array_free_full (archive->files, (GFunc) file_data_free, NULL); archive->files = g_ptr_array_sized_new (FILE_ARRAY_INITIAL_SIZE); + archive->n_regular_files = 0; } FR_ARCHIVE_GET_CLASS (archive)->list (archive, password, cancellable, callback, user_data); @@ -2014,7 +1914,7 @@ GFile *file) { self->multi_volume = TRUE; - _fr_archive_set_file (self, file); + _fr_archive_set_file (self, file, FALSE); } @@ -2030,7 +1930,7 @@ parent = g_file_get_parent (archive->priv->file); file = g_file_get_child (parent, name);; - _fr_archive_set_file (archive, file); + _fr_archive_set_file (archive, file, FALSE); g_object_unref (parent); g_object_unref (file); @@ -2250,9 +2150,9 @@ uri = g_file_get_uri (file); mime_type = g_content_type_guess (uri, (guchar *) buffer, buffer_size, &result_uncertain); if (result_uncertain) { - mime_type = get_mime_type_from_magic_numbers (buffer, buffer_size); + mime_type = _g_mime_type_get_from_content (buffer, buffer_size); if (mime_type == NULL) - mime_type = get_mime_type_from_filename (file); + mime_type = _g_mime_type_get_from_filename (file); } if (mime_type != NULL) { diff -Nru file-roller-3.6.0/src/fr-archive.h file-roller-3.6.3/src/fr-archive.h --- file-roller-3.6.0/src/fr-archive.h 2012-08-11 17:22:36.000000000 +0000 +++ file-roller-3.6.3/src/fr-archive.h 2012-11-25 11:52:45.000000000 +0000 @@ -167,6 +167,14 @@ */ guint propCanDeleteNonEmptyFolders : 1; + /* propCanDeleteAllFiles: + * + * TRUE if the command does not delete the archive itself if all the + * files in the archive are deleted. + */ + + guint propCanDeleteAllFiles : 1; + /* propCanExtractNonEmptyFolders: * * is used to overcome an issue with tar. For example if diff -Nru file-roller-3.6.0/src/fr-command-7z.c file-roller-3.6.3/src/fr-command-7z.c --- file-roller-3.6.0/src/fr-command-7z.c 2012-08-09 05:59:29.000000000 +0000 +++ file-roller-3.6.3/src/fr-command-7z.c 2012-10-28 08:40:44.000000000 +0000 @@ -360,7 +360,11 @@ break; case FR_COMPRESSION_MAXIMUM: fr_process_add_arg (command->process, "-mx=9"); - fr_process_add_arg (command->process, "-m0=lzma2");; + if (! _g_mime_type_matches (archive->mime_type, "application/zip") + && ! _g_mime_type_matches (archive->mime_type, "application/x-cbz")) + { + fr_process_add_arg (command->process, "-m0=lzma2");; + } break; } diff -Nru file-roller-3.6.0/src/fr-command-arj.c file-roller-3.6.3/src/fr-command-arj.c --- file-roller-3.6.0/src/fr-command-arj.c 2012-08-09 05:59:29.000000000 +0000 +++ file-roller-3.6.3/src/fr-command-arj.c 2012-11-25 12:01:45.000000000 +0000 @@ -397,6 +397,7 @@ base->propExtractCanAvoidOverwrite = TRUE; base->propExtractCanSkipOlder = TRUE; base->propExtractCanJunkPaths = TRUE; + base->propCanDeleteAllFiles = FALSE; base->propPassword = TRUE; base->propTest = TRUE; diff -Nru file-roller-3.6.0/src/fr-command-lha.c file-roller-3.6.3/src/fr-command-lha.c --- file-roller-3.6.0/src/fr-command-lha.c 2012-08-09 05:59:29.000000000 +0000 +++ file-roller-3.6.3/src/fr-command-lha.c 2012-11-25 12:00:40.000000000 +0000 @@ -375,6 +375,7 @@ base->propExtractCanAvoidOverwrite = FALSE; base->propExtractCanSkipOlder = FALSE; base->propExtractCanJunkPaths = TRUE; + base->propCanDeleteAllFiles = FALSE; base->propPassword = FALSE; base->propTest = FALSE; } diff -Nru file-roller-3.6.0/src/fr-command-rar.c file-roller-3.6.3/src/fr-command-rar.c --- file-roller-3.6.0/src/fr-command-rar.c 2012-08-09 05:59:29.000000000 +0000 +++ file-roller-3.6.3/src/fr-command-rar.c 2012-11-26 22:34:39.000000000 +0000 @@ -152,8 +152,11 @@ fdata->name = _g_path_get_dir_name (fdata->full_path); fdata->dir = TRUE; } - else + else { fdata->name = g_strdup (_g_path_get_basename (fdata->full_path)); + if (fields[5][0] == 'l') + fdata->link = g_strdup (_g_path_get_basename (fdata->full_path)); + } fr_archive_add_file (FR_ARCHIVE (comm), fdata); rar_comm->fdata = NULL; @@ -422,6 +425,8 @@ fr_process_begin_command (comm->process, "rar"); fr_process_add_arg (comm->process, "d"); + add_password_arg (comm, FR_ARCHIVE (comm)->password, FALSE); + fr_process_add_arg (comm->process, "--"); fr_process_add_arg (comm->process, comm->filename); @@ -678,6 +683,7 @@ base->propExtractCanAvoidOverwrite = TRUE; base->propExtractCanSkipOlder = TRUE; base->propExtractCanJunkPaths = TRUE; + base->propCanDeleteAllFiles = FALSE; base->propPassword = TRUE; base->propTest = TRUE; base->propListFromFile = TRUE; diff -Nru file-roller-3.6.0/src/fr-command-tar.c file-roller-3.6.3/src/fr-command-tar.c --- file-roller-3.6.0/src/fr-command-tar.c 2012-08-09 05:59:29.000000000 +0000 +++ file-roller-3.6.3/src/fr-command-tar.c 2012-11-27 09:09:22.000000000 +0000 @@ -695,6 +695,7 @@ fr_process_begin_command (comm->process, "mv"); fr_process_add_arg (comm->process, "-f"); + fr_process_add_arg (comm->process, "--"); fr_process_add_arg (comm->process, new_name); fr_process_add_arg (comm->process, comm->filename); fr_process_end_command (comm->process); @@ -862,6 +863,7 @@ if (archive_exists) { fr_process_begin_command (comm->process, "mv"); fr_process_add_arg (comm->process, "-f"); + fr_process_add_arg (comm->process, "--"); fr_process_add_arg (comm->process, comm->filename); fr_process_add_arg (comm->process, tmp_name); fr_process_end_command (comm->process); diff -Nru file-roller-3.6.0/src/fr-command.c file-roller-3.6.3/src/fr-command.c --- file-roller-3.6.0/src/fr-command.c 2012-08-13 14:56:02.000000000 +0000 +++ file-roller-3.6.3/src/fr-command.c 2012-11-27 09:07:53.000000000 +0000 @@ -914,6 +914,7 @@ char *tmp_archive_filename = NULL; gboolean error_occurred = FALSE; int new_file_list_length; + gboolean use_tmp_subdirectory; if (file_list == NULL) return FALSE; @@ -977,7 +978,9 @@ * to cancel the operation without losing the original archive and * removing possible temporary files created by the command. */ - { + use_tmp_subdirectory = (volume_size == 0) || ! fr_archive_is_capable_of (FR_ARCHIVE (self), FR_ARCHIVE_CAN_CREATE_VOLUMES); + + if (use_tmp_subdirectory) { GFile *local_copy_parent; char *archive_dir; GFile *tmp_file; @@ -1026,6 +1029,7 @@ for (scan = new_file_list; scan != NULL; scan = scan->next) { char *filename = scan->data; + if (find_file_in_archive (archive, filename)) del_list = g_list_prepend (del_list, filename); } @@ -1102,20 +1106,23 @@ /* move the new archive to the original position */ - fr_process_begin_command (self->process, "mv"); - fr_process_add_arg (self->process, "-f"); - fr_process_add_arg (self->process, tmp_archive_filename); - fr_process_add_arg (self->process, archive_filename); - fr_process_end_command (self->process); + if (use_tmp_subdirectory) { + fr_process_begin_command (self->process, "mv"); + fr_process_add_arg (self->process, "-f"); + fr_process_add_arg (self->process, "--"); + fr_process_add_arg (self->process, tmp_archive_filename); + fr_process_add_arg (self->process, archive_filename); + fr_process_end_command (self->process); - /* remove the temp sub-directory */ + /* remove the temp sub-directory */ - fr_process_begin_command (self->process, "rm"); - fr_process_set_working_dir (self->process, g_get_tmp_dir ()); - fr_process_set_sticky (self->process, TRUE); - fr_process_add_arg (self->process, "-rf"); - fr_process_add_arg (self->process, tmp_archive_dir); - fr_process_end_command (self->process); + fr_process_begin_command (self->process, "rm"); + fr_process_set_working_dir (self->process, g_get_tmp_dir ()); + fr_process_set_sticky (self->process, TRUE); + fr_process_add_arg (self->process, "-rf"); + fr_process_add_arg (self->process, tmp_archive_dir); + fr_process_end_command (self->process); + } /* remove the archive dir */ @@ -1147,10 +1154,14 @@ gpointer user_data) { XferData *xfer_data = user_data; - FrError *error = NULL; + GError *error = NULL; - if (! fr_process_execute_finish (FR_PROCESS (source_object), result, &error)) { - g_simple_async_result_set_from_error (xfer_data->result, error->gerror); + if (! fr_command_handle_process_error (FR_COMMAND (xfer_data->archive), result, &error)) + /* command restarted */ + return; + + if (error != NULL) { + g_simple_async_result_set_from_error (xfer_data->result, error); } else { FrArchive *archive = xfer_data->archive; @@ -1177,7 +1188,7 @@ g_simple_async_result_complete_in_idle (xfer_data->result); - fr_error_free (error); + g_clear_error (&error); xfer_data_free (xfer_data); } @@ -1647,6 +1658,7 @@ fr_process_begin_command (self->process, "mv"); fr_process_add_arg (self->process, "-f"); + fr_process_add_arg (self->process, "--"); fr_process_add_arg (self->process, tmp_archive_filename); fr_process_add_arg (self->process, archive_filename); fr_process_end_command (self->process); @@ -1761,6 +1773,7 @@ fr_process_add_arg (self->process, "-f"); else fr_process_add_arg (self->process, "-n"); + fr_process_add_arg (self->process, "--"); for (scan = list; scan; scan = scan->next) { char *filename = scan->data; @@ -2439,6 +2452,38 @@ static void +fr_command_rename__delete (FrArchive *archive, + GList **file_list, + gboolean is_dir, + gboolean dir_in_archive, + const char *original_path) +{ + FrCommand *self = FR_COMMAND (archive); + gboolean added_dir; + + /* temporarily add the dir to rename to the list if it's stored in the + * archive, this way it will be removed from the archive... */ + added_dir = FALSE; + if (is_dir && dir_in_archive && ! g_list_find_custom (*file_list, original_path, (GCompareFunc) strcmp)) { + *file_list = g_list_prepend (*file_list, g_strdup (original_path)); + added_dir = TRUE; + } + + _fr_command_remove (self, *file_list, archive->compression); + + /* ...and remove it from the list again */ + if (added_dir) { + GList *tmp; + + tmp = *file_list; + *file_list = g_list_remove_link (*file_list, tmp); + + _g_string_list_free (tmp); + } +} + + +static void fr_command_rename (FrArchive *archive, GList *file_list, const char *old_name, @@ -2453,7 +2498,6 @@ { FrCommand *self = FR_COMMAND (archive); GFile *tmp_dir; - gboolean added_dir; char *new_dirname; GList *new_file_list; GList *scan; @@ -2468,6 +2512,9 @@ tmp_dir = _g_file_get_temp_work_dir (NULL); fr_process_clear (self->process); + + /* extract the files to rename */ + _fr_command_extract (self, file_list, tmp_dir, @@ -2477,26 +2524,17 @@ FALSE, archive->password); - /* temporarily add the dir to rename to the list if it's stored in the - * archive, this way it will be removed from the archive... */ - added_dir = FALSE; - if (is_dir && dir_in_archive && ! g_list_find_custom (file_list, original_path, (GCompareFunc) strcmp)) { - file_list = g_list_prepend (file_list, g_strdup (original_path)); - added_dir = TRUE; - } - - _fr_command_remove (self, file_list, archive->compression); - - /* ...and remove it from the list again */ - if (added_dir) { - GList *tmp; - - tmp = file_list; - file_list = g_list_remove_link (file_list, tmp); - - g_free (tmp->data); - g_list_free (tmp); - } + /* if the command can delete all the files in the archive without + * deleting the archive itself ('rar' deletes the archive), delete the + * files here, that is before adding the renamed files to the archive, + * to make the operation faster. */ + + if (archive->propCanDeleteAllFiles) + fr_command_rename__delete (archive, + &file_list, + is_dir, + dir_in_archive, + original_path); /* rename the files. */ @@ -2511,6 +2549,7 @@ fr_process_begin_command (self->process, "mv"); fr_process_add_arg (self->process, "-f"); + fr_process_add_arg (self->process, "--"); fr_process_add_arg_file (self->process, old_file); fr_process_add_arg_file (self->process, new_file); fr_process_end_command (self->process); @@ -2536,6 +2575,7 @@ if (! is_dir) { fr_process_begin_command (self->process, "mv"); fr_process_add_arg (self->process, "-f"); + fr_process_add_arg (self->process, "--"); fr_process_add_arg_file (self->process, old_file); fr_process_add_arg_file (self->process, new_file); fr_process_end_command (self->process); @@ -2589,6 +2629,17 @@ g_free (new_dirname); _g_string_list_free (new_file_list); + /* if the command cannot delete all the files in the archive without + * deleting the archive itself ('rar' deletes the archive), delete + * the old files here to avoid a potential error. */ + + if (! archive->propCanDeleteAllFiles) + fr_command_rename__delete (archive, + &file_list, + is_dir, + dir_in_archive, + original_path); + /* remove the tmp dir */ fr_process_begin_command (self->process, "rm"); @@ -2653,8 +2704,10 @@ && (old_name[strlen (old_name) - 1] != '/')) { fr_process_begin_command (command->process, "mv"); + fr_process_set_ignore_error (command->process, TRUE); fr_process_set_working_dir_file (command->process, tmp_dir); fr_process_add_arg (command->process, "-f"); + fr_process_add_arg (command->process, "--"); if (old_name[0] == '/') old_name = old_name + 1; fr_process_add_arg (command->process, old_name); diff -Nru file-roller-3.6.0/src/fr-init.c file-roller-3.6.3/src/fr-init.c --- file-roller-3.6.0/src/fr-init.c 2012-08-11 10:37:11.000000000 +0000 +++ file-roller-3.6.3/src/fr-init.c 2012-09-28 09:25:29.000000000 +0000 @@ -447,7 +447,7 @@ const char * -get_mime_type_from_extension (const char *ext) +_g_mime_type_get_from_extension (const char *ext) { int i; @@ -466,6 +466,24 @@ const char * +_g_mime_type_get_from_filename (GFile *file) +{ + const char *mime_type = NULL; + char *uri; + + if (file == NULL) + return NULL; + + uri = g_file_get_uri (file); + mime_type = _g_mime_type_get_from_extension (_g_filename_get_extension (uri)); + + g_free (uri); + + return mime_type; +} + + +const char * get_archive_filename_extension (const char *filename) { const char *ext; diff -Nru file-roller-3.6.0/src/fr-init.h file-roller-3.6.3/src/fr-init.h --- file-roller-3.6.0/src/fr-init.h 2012-08-10 11:30:19.000000000 +0000 +++ file-roller-3.6.3/src/fr-init.h 2012-09-28 09:18:50.000000000 +0000 @@ -62,7 +62,8 @@ GType get_preferred_archive_for_mime_type (const char *mime_type, FrArchiveCaps requested_capabilities); void update_registered_archives_capabilities (void); -const char * get_mime_type_from_extension (const char *ext); +const char * _g_mime_type_get_from_extension (const char *ext); +const char * _g_mime_type_get_from_filename (GFile *file); const char * get_archive_filename_extension (const char *uri); int get_mime_type_index (const char *mime_type); void sort_mime_types_by_extension (int *a); diff -Nru file-roller-3.6.0/src/fr-process.c file-roller-3.6.3/src/fr-process.c --- file-roller-3.6.0/src/fr-process.c 2012-08-06 13:23:48.000000000 +0000 +++ file-roller-3.6.3/src/fr-process.c 2012-11-26 22:03:58.000000000 +0000 @@ -812,9 +812,19 @@ } } - if (info->ignore_error) { + if (info->ignore_error && (exec_data->error != NULL)) { +#ifdef DEBUG + { + GList *scan; + + g_print ("** ERROR **\n"); + g_print ("%s\n", exec_data->error->gerror->message); + for (scan = process->err.raw; scan; scan = scan->next) + g_print ("%s\n", (char *)scan->data); + } +#endif fr_clear_error (&exec_data->error); - debug (DEBUG_INFO, "[ignore error]\n"); + debug (DEBUG_INFO, "[error ignored]\n"); } else if (exec_data->error == NULL) { if (WIFEXITED (status)) { @@ -961,6 +971,9 @@ if (info->dir != NULL) g_print ("\tcd %s\n", info->dir); + if (info->ignore_error) + g_print ("\t[ignore error]\n"); + g_print ("\t"); for (j = 0; j < i; j++) g_print ("%s ", argv[j]); diff -Nru file-roller-3.6.0/src/fr-window.c file-roller-3.6.3/src/fr-window.c --- file-roller-3.6.0/src/fr-window.c 2012-08-27 19:01:03.000000000 +0000 +++ file-roller-3.6.3/src/fr-window.c 2012-11-26 22:24:47.000000000 +0000 @@ -314,6 +314,7 @@ gboolean stoppable; gboolean closing; gboolean notify; + gboolean populating_file_list; FrClipboardData *clipboard_data; FrClipboardData *copy_data; @@ -458,6 +459,7 @@ if (window->priv->copy_data->files == NULL) { fr_clipboard_data_unref (window->priv->copy_data); window->priv->copy_data = NULL; + gtk_clipboard_clear (gtk_widget_get_clipboard (GTK_WIDGET (window), FR_CLIPBOARD)); } } @@ -595,6 +597,9 @@ if (window->priv->activity_ref > 0) return; + if (window->priv->closing) + return; + window->priv->closing = TRUE; if (gtk_widget_get_realized (GTK_WIDGET (window))) { @@ -824,6 +829,7 @@ window->priv->cancellable = g_cancellable_new (); window->priv->compression = FR_COMPRESSION_NORMAL; window->priv->window_group = gtk_window_group_new (); + window->priv->populating_file_list = FALSE; gtk_window_group_add_window (window->priv->window_group, GTK_WINDOW (window)); window->archive = NULL; @@ -850,27 +856,103 @@ #endif +static gboolean +fr_window_dir_exists_in_archive (FrWindow *window, + const char *dir_name) +{ + int dir_name_len; + int i; + + if (dir_name == NULL) + return FALSE; + + dir_name_len = strlen (dir_name); + if (dir_name_len == 0) + return TRUE; + + if (strcmp (dir_name, "/") == 0) + return TRUE; + + for (i = 0; i < window->archive->files->len; i++) { + FileData *fdata = g_ptr_array_index (window->archive->files, i); + + if (strncmp (dir_name, fdata->full_path, dir_name_len) == 0) { + return TRUE; + } + else if (fdata->dir + && (fdata->full_path[strlen (fdata->full_path) - 1] != '/') + && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) == 0)) + { + return TRUE; + } + } + + return FALSE; +} + + +static void +fr_window_update_history (FrWindow *window) +{ + GList *scan; + + /* remove the paths not present in the archive */ + + for (scan = window->priv->history; scan; /* void */) { + GList *next = scan->next; + char *path = scan->data; + + if (! fr_window_dir_exists_in_archive (window, path)) { + if (scan == window->priv->history_current) + window->priv->history_current = NULL; + window->priv->history = g_list_remove_link (window->priv->history, scan); + _g_string_list_free (scan); + } + + scan = next; + } + + if (window->priv->history_current == NULL) + window->priv->history_current = window->priv->history; +} + + static void fr_window_history_add (FrWindow *window, const char *path) { - if ((window->priv->history != NULL) && (window->priv->history_current != NULL)) { - if (strcmp (window->priv->history_current->data, path) == 0) - return; + if ((window->priv->history_current == NULL) || (g_strcmp0 (path, window->priv->history_current->data) != 0)) { + GList *scan; + GList *new_current = NULL; - /* Add locations visited using the back button to the history - * list. */ - if (window->priv->history != window->priv->history_current) { - GList *scan = window->priv->history->next; - while (scan != window->priv->history_current->next) { - window->priv->history = g_list_prepend (window->priv->history, g_strdup (scan->data)); - scan = scan->next; + /* search the path in the history */ + for (scan = window->priv->history_current; scan; scan = scan->next) { + char *path_in_history = scan->data; + + if (g_strcmp0 (path, path_in_history) == 0) { + new_current = scan; + break; + } + } + + if (new_current != NULL) { + window->priv->history_current = new_current; + } + else { + /* remove all the paths after the current position */ + for (scan = window->priv->history; scan && (scan != window->priv->history_current); /* void */) { + GList *next = scan->next; + + window->priv->history = g_list_remove_link (window->priv->history, scan); + _g_string_list_free (scan); + + scan = next; } - } - } - window->priv->history = g_list_prepend (window->priv->history, g_strdup (path)); - window->priv->history_current = window->priv->history; + window->priv->history = g_list_prepend (window->priv->history, g_strdup (path)); + window->priv->history_current = window->priv->history; + } + } } @@ -1358,41 +1440,6 @@ } -static gboolean -fr_window_dir_exists_in_archive (FrWindow *window, - const char *dir_name) -{ - int dir_name_len; - int i; - - if (dir_name == NULL) - return FALSE; - - dir_name_len = strlen (dir_name); - if (dir_name_len == 0) - return TRUE; - - if (strcmp (dir_name, "/") == 0) - return TRUE; - - for (i = 0; i < window->archive->files->len; i++) { - FileData *fdata = g_ptr_array_index (window->archive->files, i); - - if (strncmp (dir_name, fdata->full_path, dir_name_len) == 0) { - return TRUE; - } - else if (fdata->dir - && (fdata->full_path[strlen (fdata->full_path) - 1] != '/') - && (strncmp (dir_name, fdata->full_path, dir_name_len - 1) == 0)) - { - return TRUE; - } - } - - return FALSE; -} - - static char * get_parent_dir (const char *current_dir) { @@ -1531,6 +1578,7 @@ return; } + window->priv->populating_file_list = TRUE; gtk_list_store_clear (window->priv->list_store); gtk_tree_sortable_get_sort_column_id (GTK_TREE_SORTABLE (window->priv->list_store), @@ -1626,6 +1674,8 @@ sort_column_id, order); + window->priv->populating_file_list = FALSE; + _fr_window_stop_activity_mode (window); } @@ -2570,7 +2620,7 @@ gtk_widget_hide (window->priv->pd_cancel_button); gtk_widget_hide (window->priv->pd_open_archive_button); gtk_widget_show (window->priv->pd_open_destination_button); - gtk_widget_show (window->priv->pd_quit_button); + gtk_widget_set_visible (window->priv->pd_quit_button, ! window->priv->quit_with_progress_dialog); gtk_widget_show (window->priv->pd_close_button); display_progress_dialog (window); @@ -2600,6 +2650,7 @@ gtk_widget_hide (window->priv->pd_cancel_button); gtk_widget_hide (window->priv->pd_open_destination_button); gtk_widget_show (window->priv->pd_open_archive_button); + gtk_widget_set_visible (window->priv->pd_quit_button, ! window->priv->quit_with_progress_dialog); gtk_widget_show (window->priv->pd_close_button); display_progress_dialog (window); @@ -2776,7 +2827,10 @@ case FR_ERROR_UNSUPPORTED_FORMAT: close_progress_dialog (window, TRUE); - dlg_package_installer (window, archive, action); + dlg_package_installer (window, + window->priv->archive_file, + action, + window->priv->cancellable); if (opens_dialog) *opens_dialog = TRUE; break; @@ -2983,9 +3037,11 @@ if (! is_temp_dir) fr_window_add_to_recent_list (window, window->priv->archive_file); + fr_window_update_history (window); fr_window_update_title (window); fr_window_go_to_location (window, fr_window_get_current_location (window), TRUE); fr_window_update_dir_tree (window); + if (! window->priv->batch_mode) gtk_window_present (GTK_WINDOW (window)); break; @@ -3101,6 +3157,9 @@ /* -- selections -- */ +#undef DEBUG_GET_DIR_LIST_FROM_PATH + + static GList * get_dir_list_from_path (FrWindow *window, char *path) @@ -3117,9 +3176,31 @@ dirname_l = strlen (dirname); for (i = 0; i < window->archive->files->len; i++) { FileData *fd = g_ptr_array_index (window->archive->files, i); + gboolean matches = FALSE; - if (strncmp (dirname, fd->full_path, dirname_l) == 0) +#ifdef DEBUG_GET_DIR_LIST_FROM_PATH + g_print ("%s <=> %s (%d)\n", dirname, fd->full_path, dirname_l); +#endif + + if (fd->dir) { + int full_path_l = strlen (fd->full_path); + if ((full_path_l == dirname_l - 1) && (strncmp (dirname, fd->full_path, full_path_l) == 0)) + /* example: dirname is '/path/to/dir/' and fd->full_path is '/path/to/dir' */ + matches = TRUE; + else if (strcmp (dirname, fd->full_path) == 0) + matches = TRUE; + } + + if (! matches && strncmp (dirname, fd->full_path, dirname_l) == 0) { + matches = TRUE; + } + + if (matches) { +#ifdef DEBUG_GET_DIR_LIST_FROM_PATH + g_print ("`-> OK\n"); +#endif list = g_list_prepend (list, g_strdup (fd->original_path)); + } } g_free (dirname); @@ -3129,7 +3210,7 @@ static GList * get_dir_list_from_file_data (FrWindow *window, - FileData *fdata) + FileData *fdata) { char *dirname; GList *list; @@ -3454,7 +3535,7 @@ void fr_window_current_folder_activated (FrWindow *window, - gboolean from_sidebar) + gboolean from_sidebar) { char *dir_path; @@ -4195,6 +4276,9 @@ char *uri; GList *scan; + if (data == NULL) + return NULL; + list = g_string_new (NULL); uri = g_file_get_uri (fr_archive_get_file (window->archive)); @@ -5045,6 +5129,9 @@ theme_changed_cb (GtkIconTheme *theme, FrWindow *window) { + if (window->priv->populating_file_list) + return; + gth_icon_cache_clear (window->priv->list_icon_cache); gth_icon_cache_clear (window->priv->tree_icon_cache); @@ -5249,6 +5336,7 @@ if (window->priv->contents != NULL) gtk_widget_destroy (window->priv->contents); window->priv->contents = child; + gtk_widget_set_vexpand (child, TRUE); break; case FR_WINDOW_AREA_FILTERBAR: position = 4; @@ -5262,13 +5350,11 @@ break; } - gtk_table_attach (GTK_TABLE (window->priv->layout), - child, - 0, 1, - position, position + 1, - GTK_EXPAND | GTK_FILL, - ((area == FR_WINDOW_AREA_CONTENTS) ? GTK_EXPAND : 0) | GTK_FILL, - 0, 0); + gtk_widget_set_hexpand (child, TRUE); + gtk_grid_attach (GTK_GRID (window->priv->layout), + child, + 0, position, + 1, 1); } @@ -5322,7 +5408,7 @@ /* Create the application. */ - window->priv->layout = gtk_table_new (4, 1, FALSE); + window->priv->layout = gtk_grid_new (); gtk_container_add (GTK_CONTAINER (window), window->priv->layout); gtk_widget_show (window->priv->layout); @@ -5379,7 +5465,7 @@ window->priv->action = FR_ACTION_NONE; window->priv->open_default_dir = g_object_ref (_g_file_get_home ()); - window->priv->add_default_dir = g_object_ref (_g_file_get_home ()); + window->priv->add_default_dir = NULL; window->priv->extract_default_dir = g_object_ref (_g_file_get_home ()); window->priv->give_focus_to_the_list = FALSE; @@ -5938,6 +6024,12 @@ static void fr_window_archive_list (FrWindow *window) { + if (! fr_archive_is_capable_of (window->archive, FR_ARCHIVE_CAN_READ)) { + fr_window_archive_close (window); + fr_window_archive_open (window, window->priv->archive_file, NULL); + return; + } + _archive_operation_started (window, FR_ACTION_LISTING_CONTENT); fr_archive_list (window->archive, window->priv->password, @@ -6412,8 +6504,10 @@ fr_archive_operation_finish (FR_ARCHIVE (source_object), result, &error); _archive_operation_completed (window, FR_ACTION_EXTRACTING_FILES, error); - if ((error == NULL) && ask_to_open_destination) + if ((error == NULL) && ask_to_open_destination) { + window->priv->quit_with_progress_dialog = window->priv->batch_mode; open_progress_dialog_with_open_destination (window); + } else if ((error == NULL) && ! batch_mode && ! gtk_window_has_toplevel_focus (GTK_WINDOW (window->priv->progress_dialog))) gtk_window_present (GTK_WINDOW (window)); @@ -6790,7 +6884,8 @@ fr_window_archive_extract_here (FrWindow *window, gboolean skip_older, gboolean overwrite, - gboolean junk_paths) + gboolean junk_paths, + gboolean ask_to_open_destination) { ExtractData *edata; @@ -6802,7 +6897,7 @@ overwrite, junk_paths, TRUE, - FALSE); + ask_to_open_destination); fr_window_set_current_batch_action (window, FR_BATCH_ACTION_EXTRACT, edata, @@ -8179,12 +8274,14 @@ return; data = get_selection_data_from_clipboard_data (window, window->priv->copy_data); - gtk_selection_data_set (selection_data, - gtk_selection_data_get_target (selection_data), - 8, - (guchar *) data, - strlen (data)); - g_free (data); + if (data != NULL) { + gtk_selection_data_set (selection_data, + gtk_selection_data_get_target (selection_data), + 8, + (guchar *) data, + strlen (data)); + g_free (data); + } } @@ -8314,6 +8411,11 @@ _handle_archive_operation_error (window, archive, action, error, NULL, NULL); if (error != NULL) { + if (window->priv->second_password != NULL) { + g_free (window->priv->second_password); + window->priv->second_password = NULL; + } + fr_clipboard_data_unref (window->priv->clipboard_data); window->priv->clipboard_data = NULL; } @@ -8321,49 +8423,20 @@ static void -paste_from_archive_paste_clipboard_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +paste_from_archive_completed_successfully (FrWindow *window) { - FrWindow *window = user_data; - GError *error = NULL; - - fr_archive_operation_finish (FR_ARCHIVE (source_object), result, &error); - _paste_from_archive_operation_completed (window, FR_ACTION_PASTING_FILES, error); + _paste_from_archive_operation_completed (window, FR_ACTION_PASTING_FILES, NULL); fr_clipboard_data_unref (window->priv->clipboard_data); window->priv->clipboard_data = NULL; - if (error == NULL) - fr_window_archive_reload (window); - - _g_error_free (error); -} - - -static void -add_pasted_files (FrWindow *window, - FrClipboardData *data) -{ if (window->priv->second_password != NULL) { g_free (window->priv->second_password); window->priv->second_password = NULL; } - fr_archive_paste_clipboard (window->archive, - data->file, - data->password, - window->priv->encrypt_header, - window->priv->compression, - window->priv->volume_size, - data->op, - data->base_dir, - data->files, - data->tmp_dir, - data->current_dir, - window->priv->cancellable, - paste_from_archive_paste_clipboard_ready_cb, - window); + window->priv->archive_new = FALSE; + fr_window_archive_reload (window); } @@ -8381,14 +8454,14 @@ return; } - add_pasted_files (window, window->priv->clipboard_data); + paste_from_archive_completed_successfully (window); } static void -paste_from_archive_extract_ready_cb (GObject *source_object, - GAsyncResult *result, - gpointer user_data) +paste_from_archive_paste_clipboard_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) { FrWindow *window = user_data; GError *error = NULL; @@ -8409,7 +8482,38 @@ window); } else - add_pasted_files (window, window->priv->clipboard_data); + paste_from_archive_completed_successfully (window); +} + + +static void +paste_from_archive_extract_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + FrWindow *window = user_data; + GError *error = NULL; + + if (! fr_archive_operation_finish (FR_ARCHIVE (source_object), result, &error)) { + _paste_from_archive_operation_completed (window, FR_ACTION_PASTING_FILES, error); + g_error_free (error); + return; + } + + fr_archive_paste_clipboard (window->archive, + window->priv->clipboard_data->file, + window->priv->password, + window->priv->encrypt_header, + window->priv->compression, + window->priv->volume_size, + window->priv->clipboard_data->op, + window->priv->clipboard_data->base_dir, + window->priv->clipboard_data->files, + window->priv->clipboard_data->tmp_dir, + window->priv->clipboard_data->current_dir, + window->priv->cancellable, + paste_from_archive_paste_clipboard_ready_cb, + window); } @@ -9079,10 +9183,7 @@ GFile * fr_window_get_add_default_dir (FrWindow *window) { - if (window->priv->add_default_dir == NULL) - return _g_file_get_home (); - else - return window->priv->add_default_dir; + return window->priv->add_default_dir; } @@ -9240,7 +9341,7 @@ edata->skip_older, edata->overwrite, edata->junk_paths, - TRUE); + ! window->priv->batch_mode || window->priv->notify); break; case FR_BATCH_ACTION_EXTRACT_HERE: @@ -9250,7 +9351,8 @@ fr_window_archive_extract_here (window, FALSE, TRUE, - FALSE); + FALSE, + ! window->priv->batch_mode || window->priv->notify); break; case FR_BATCH_ACTION_EXTRACT_INTERACT: diff -Nru file-roller-3.6.0/src/fr-window.h file-roller-3.6.3/src/fr-window.h --- file-roller-3.6.0/src/fr-window.h 2012-08-11 20:03:25.000000000 +0000 +++ file-roller-3.6.3/src/fr-window.h 2012-11-15 08:03:32.000000000 +0000 @@ -148,7 +148,8 @@ void fr_window_archive_extract_here (FrWindow *window, gboolean skip_older, gboolean overwrite, - gboolean junk_paths); + gboolean junk_paths, + gboolean ask_to_open_destination); void fr_window_archive_test (FrWindow *window); void fr_window_archive_encrypt (FrWindow *window, const char *password, diff -Nru file-roller-3.6.0/src/gio-utils.c file-roller-3.6.3/src/gio-utils.c --- file-roller-3.6.0/src/gio-utils.c 2012-08-09 19:45:47.000000000 +0000 +++ file-roller-3.6.3/src/gio-utils.c 2012-09-28 09:27:49.000000000 +0000 @@ -1306,3 +1306,179 @@ return (n >= 0); } + +/* -- _g_file_load_buffer_async -- */ + + +#define MAX_BUFFER_SIZE_FOR_TMP_BUFFER 4096 + + +typedef struct { + GFile *file; + GCancellable *cancellable; + GSimpleAsyncResult *result; + gsize requested_buffer_size; + char *buffer; + gchar *tmp_buffer; + gsize tmp_buffer_size; + GInputStream *stream; + gsize buffer_size; +} LoadBufferData; + + +static void +load_buffer_data_free (LoadBufferData *load_data) +{ + _g_object_unref (load_data->file); + _g_object_unref (load_data->cancellable); + _g_object_unref (load_data->result); + g_free (load_data->buffer); + g_free (load_data->tmp_buffer); + _g_object_unref (load_data->stream); + g_free (load_data); +} + + +static void +load_buffer_data_complete_with_error (LoadBufferData *load_data, + GError *error) +{ + GSimpleAsyncResult *result; + + result = g_object_ref (load_data->result); + g_simple_async_result_set_from_error (result, error); + g_simple_async_result_complete_in_idle (result); + + g_object_unref (result); +} + + +static void +load_buffer_stream_read_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + LoadBufferData *load_data = user_data; + GError *error = NULL; + gssize count; + + count = g_input_stream_read_finish (load_data->stream, result, &error); + if (count < 0) { + load_buffer_data_complete_with_error (load_data, error); + return; + } + + if (count > 0) { + load_data->buffer = g_realloc (load_data->buffer, load_data->buffer_size + count + 1); + memcpy (load_data->buffer + load_data->buffer_size, load_data->tmp_buffer, count); + load_data->buffer_size += count; + } + + if ((count == 0) || ((load_data->requested_buffer_size > 0) && (load_data->buffer_size >= load_data->requested_buffer_size))) { + if (load_data->buffer != NULL) + ((char *)load_data->buffer)[load_data->buffer_size] = 0; + g_simple_async_result_complete_in_idle (load_data->result); + return; + } + + g_input_stream_read_async (load_data->stream, + load_data->tmp_buffer, + load_data->tmp_buffer_size, + G_PRIORITY_DEFAULT, + load_data->cancellable, + load_buffer_stream_read_ready_cb, + load_data); +} + + +static void +load_buffer_read_ready_cb (GObject *source_object, + GAsyncResult *result, + gpointer user_data) +{ + LoadBufferData *load_data = user_data; + GError *error = NULL; + + load_data->stream = (GInputStream *) g_file_read_finish (G_FILE (source_object), result, &error); + if (load_data->stream == NULL) { + load_buffer_data_complete_with_error (load_data, error); + return; + } + + g_input_stream_read_async (load_data->stream, + load_data->tmp_buffer, + load_data->tmp_buffer_size, + G_PRIORITY_DEFAULT, + load_data->cancellable, + load_buffer_stream_read_ready_cb, + load_data); +} + + +void +_g_file_load_buffer_async (GFile *file, + gsize requested_size, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data) +{ + LoadBufferData *load_data; + + g_return_if_fail (file != NULL); + + load_data = g_new0 (LoadBufferData, 1); + load_data->file = g_object_ref (file); + load_data->cancellable = _g_object_ref (cancellable); + load_data->result = g_simple_async_result_new (G_OBJECT (file), + callback, + user_data, + _g_file_load_buffer_async); + load_data->requested_buffer_size = requested_size; + load_data->buffer = NULL; + load_data->buffer_size = 0; + if ((requested_size > 0) && (requested_size < MAX_BUFFER_SIZE_FOR_TMP_BUFFER)) + load_data->tmp_buffer_size = requested_size; + else + load_data->tmp_buffer_size = MAX_BUFFER_SIZE_FOR_TMP_BUFFER; + load_data->tmp_buffer = g_new (char, load_data->tmp_buffer_size); + g_simple_async_result_set_op_res_gpointer (load_data->result, + load_data, + (GDestroyNotify) load_buffer_data_free); + + /* load a few bytes to guess the archive type */ + + g_file_read_async (load_data->file, + G_PRIORITY_DEFAULT, + load_data->cancellable, + load_buffer_read_ready_cb, + load_data); +} + + +gboolean +_g_file_load_buffer_finish (GFile *file, + GAsyncResult *result, + char **buffer, + gsize *buffer_size, + GError **error) +{ + GSimpleAsyncResult *simple; + LoadBufferData *load_data; + + g_return_val_if_fail (g_simple_async_result_is_valid (result, G_OBJECT (file), _g_file_load_buffer_async), FALSE); + + simple = G_SIMPLE_ASYNC_RESULT (result); + + if (g_simple_async_result_propagate_error (simple, error)) + return FALSE; + + load_data = g_simple_async_result_get_op_res_gpointer (simple); + if (buffer != NULL) { + *buffer = load_data->buffer; + load_data->buffer = NULL; + } + if (buffer_size != NULL) + *buffer_size = load_data->buffer_size; + + return TRUE; +} diff -Nru file-roller-3.6.0/src/gio-utils.h file-roller-3.6.3/src/gio-utils.h --- file-roller-3.6.0/src/gio-utils.h 2012-08-09 19:45:47.000000000 +0000 +++ file-roller-3.6.3/src/gio-utils.h 2012-09-28 09:01:02.000000000 +0000 @@ -167,5 +167,15 @@ void *buffer, gsize size, GError **error); +void _g_file_load_buffer_async (GFile *file, + gsize requested_size, + GCancellable *cancellable, + GAsyncReadyCallback callback, + gpointer user_data); +gboolean _g_file_load_buffer_finish (GFile *file, + GAsyncResult *result, + char **buffer, + gsize *buffer_size, + GError **error); #endif /* _GIO_UTILS_H */ diff -Nru file-roller-3.6.0/src/glib-utils.c file-roller-3.6.3/src/glib-utils.c --- file-roller-3.6.0/src/glib-utils.c 2012-08-10 10:19:40.000000000 +0000 +++ file-roller-3.6.3/src/glib-utils.c 2012-09-28 09:19:18.000000000 +0000 @@ -1078,6 +1078,75 @@ } +const char * +_g_mime_type_get_from_content (char *buffer, + gsize buffer_size) +{ +#if ENABLE_MAGIC + + static magic_t magic = NULL; + + if (magic == NULL) { + magic = magic_open (MAGIC_MIME_TYPE); + if (magic != NULL) + magic_load (magic, NULL); + else + g_warning ("unable to open magic database"); + } + + if (magic != NULL) { + const char * mime_type; + + mime_type = magic_buffer (magic, buffer, buffer_size); + if (mime_type) + return mime_type; + + g_warning ("unable to detect filetype from magic: %s", magic_error (magic)); + } + +#else + + static const struct magic { + const unsigned int off; + const unsigned int len; + const char * const id; + const char * const mime_type; + } + magic_ids [] = { + /* magic ids taken from magic/Magdir/archive from the file-4.21 tarball */ + { 0, 6, "7z\274\257\047\034", "application/x-7z-compressed" }, + { 7, 7, "**ACE**", "application/x-ace" }, + { 0, 2, "\x60\xea", "application/x-arj" }, + { 0, 3, "BZh", "application/x-bzip2" }, + { 0, 2, "\037\213", "application/x-gzip" }, + { 0, 4, "LZIP", "application/x-lzip" }, + { 0, 9, "\x89\x4c\x5a\x4f\x00\x0d\x0a\x1a\x0a", "application/x-lzop", }, + { 0, 4, "Rar!", "application/x-rar" }, + { 0, 4, "RZIP", "application/x-rzip" }, + { 0, 6, "\3757zXZ\000", "application/x-xz" }, + { 20, 4, "\xdc\xa7\xc4\xfd", "application/x-zoo", }, + { 0, 4, "PK\003\004", "application/zip" }, + { 0, 8, "PK00PK\003\004", "application/zip" }, + { 0, 4, "LRZI", "application/x-lrzip" }, + }; + + int i; + + for (i = 0; i < G_N_ELEMENTS (magic_ids); i++) { + const struct magic * const magic = &magic_ids[i]; + + if ((magic->off + magic->len) > buffer_size) + g_warning ("buffer underrun for mime-type '%s' magic", magic->mime_type); + else if (! memcmp (buffer + magic->off, magic->id, magic->len)) + return magic->mime_type; + } + +#endif + + return NULL; +} + + /* GFile */ diff -Nru file-roller-3.6.0/src/glib-utils.h file-roller-3.6.3/src/glib-utils.h --- file-roller-3.6.0/src/glib-utils.h 2012-08-09 19:45:47.000000000 +0000 +++ file-roller-3.6.3/src/glib-utils.h 2012-09-28 09:19:18.000000000 +0000 @@ -146,6 +146,8 @@ const char *suffix); gboolean _g_mime_type_matches (const char *type, const char *pattern); +const char * _g_mime_type_get_from_content (char *buffer, + gsize buffer_size); /* GFile */ diff -Nru file-roller-3.6.0/src/main.c file-roller-3.6.3/src/main.c --- file-roller-3.6.0/src/main.c 2012-09-11 15:46:41.000000000 +0000 +++ file-roller-3.6.3/src/main.c 2012-11-14 08:16:11.000000000 +0000 @@ -600,23 +600,33 @@ gsize size; guchar *buffer; GInputStream *stream; + gsize bytes_read; + GError *error = NULL; g_application_hold (G_APPLICATION (self)); g_resources_get_info (ORG_GNOME_ARCHIVEMANAGER_XML, 0, &size, NULL, NULL); - buffer = g_new (guchar, size); + buffer = g_new (guchar, size + 1); stream = g_resources_open_stream (ORG_GNOME_ARCHIVEMANAGER_XML, 0, NULL); - g_input_stream_read_all (stream, buffer, size, NULL, NULL, NULL); + if (g_input_stream_read_all (stream, buffer, size, &bytes_read, NULL, NULL)) { + buffer[bytes_read] = '\0'; - self->introspection_data = g_dbus_node_info_new_for_xml ((gchar *) buffer, NULL); - self->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, - "org.gnome.ArchiveManager1", - G_BUS_NAME_OWNER_FLAGS_NONE, - on_bus_acquired_for_archive_manager, - NULL /*on_name_acquired*/, - NULL /*on_name_lost*/, - self, - NULL); + self->introspection_data = g_dbus_node_info_new_for_xml ((gchar *) buffer, &error); + if (self->introspection_data != NULL) { + self->owner_id = g_bus_own_name (G_BUS_TYPE_SESSION, + "org.gnome.ArchiveManager1", + G_BUS_NAME_OWNER_FLAGS_NONE, + on_bus_acquired_for_archive_manager, + NULL /*on_name_acquired*/, + NULL /*on_name_lost*/, + self, + NULL); + } + else { + g_warning ("%s", error->message); + g_clear_error (&error); + } + } g_timeout_add_seconds (SERVICE_TIMEOUT, service_timeout_cb, self); @@ -816,7 +826,10 @@ g_object_unref (file); } - fr_window_append_batch_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL); + if (! arg_notify) + fr_window_append_batch_action (FR_WINDOW (window), FR_BATCH_ACTION_QUIT, NULL, NULL); + else + fr_window_set_notify (FR_WINDOW (window), TRUE); fr_window_start_batch (FR_WINDOW (window)); } @@ -840,7 +853,7 @@ _g_object_unref (default_directory); _g_object_unref (add_to_archive); - g_free (extraction_destination); + _g_object_unref (extraction_destination); return fr_application_command_line_finished (application, EXIT_SUCCESS); } diff -Nru file-roller-3.6.0/src/sh/Makefile.in file-roller-3.6.3/src/sh/Makefile.in --- file-roller-3.6.0/src/sh/Makefile.in 2012-09-24 19:08:16.000000000 +0000 +++ file-roller-3.6.3/src/sh/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/src/ui/Makefile.in file-roller-3.6.3/src/ui/Makefile.in --- file-roller-3.6.0/src/ui/Makefile.in 2012-09-24 19:08:16.000000000 +0000 +++ file-roller-3.6.3/src/ui/Makefile.in 2012-11-27 20:58:36.000000000 +0000 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.12.4 from Makefile.am. +# Makefile.in generated by automake 1.12.5 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2012 Free Software Foundation, Inc. diff -Nru file-roller-3.6.0/src/ui/file-selector.ui file-roller-3.6.3/src/ui/file-selector.ui --- file-roller-3.6.0/src/ui/file-selector.ui 2012-08-09 19:45:47.000000000 +0000 +++ file-roller-3.6.3/src/ui/file-selector.ui 2012-09-29 07:21:14.000000000 +0000 @@ -293,7 +293,7 @@ - +