16 files changed, 80 insertions, 45 deletions
diff --git a/NEWS b/NEWS
index c134a14..f9317e7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+1.10.1
+------
+
+ * Help fixes
+ * UI fixes
+
 1.10.0
 ------
 
diff --git a/configure.ac b/configure.ac
index 87e4ff7..f6b9bd4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.61)
 
-AC_INIT([engrampa], [1.10.0], [http://www.mate-desktop.org/])
+AC_INIT([engrampa], [1.10.1], [http://www.mate-desktop.org/])
 AM_INIT_AUTOMAKE([1.9 foreign dist-xz no-dist-gzip check-news])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
@@ -175,7 +175,7 @@ AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package])
 
 AM_GLIB_GNU_GETTEXT
-IT_PROG_INTLTOOL([0.35.0])
+IT_PROG_INTLTOOL([0.50.1])
 
 if test "x${prefix}" = "xNONE"; then
 AC_DEFINE_UNQUOTED(LOCALEDIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Locale dir])
@@ -232,6 +232,7 @@ dnl ******************************
 AC_CONFIG_FILES([Makefile
 data/Makefile
 data/engrampa.desktop.in
+ data/org.mate.engrampa.gschema.xml
 data/ui/Makefile
 data/icons/Makefile
 data/icons/16x16/Makefile
diff --git a/data/org.mate.engrampa.gschema.xml.in b/data/org.mate.engrampa.gschema.xml.in
index 45a7aab..8b416e9 100644
--- a/data/org.mate.engrampa.gschema.xml.in
+++ b/data/org.mate.engrampa.gschema.xml.in
@@ -76,7 +76,7 @@
 <key name="name-column-width" type="i">
 <default>250</default>
 <summary>Name column width</summary>
- <description>The default width ofthe name column in the file list.</description>
+ <description>The default width of the name column in the file list.</description>
 </key>
 </schema>
 <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.mate.engrampa.ui" path="/org/mate/engrampa/ui/">
diff --git a/help/C/figures/engrampa_main_window.png b/help/C/figures/engrampa_main_window.png
index 1b52e64..db8dafd 100644
--- a/help/C/figures/engrampa_main_window.png
+++ b/help/C/figures/engrampa_main_window.png
diff --git a/help/C/index.docbook b/help/C/index.docbook
index d4a624e..24bf5e1 100644
--- a/help/C/index.docbook
+++ b/help/C/index.docbook
@@ -2,9 +2,9 @@
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
 "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
 <!ENTITY legal SYSTEM "legal.xml">
- <!ENTITY appversion "2.26.0">
- <!ENTITY manrevision "2.26.0">
- <!ENTITY date "April 2006">
+ <!ENTITY appversion "1.10">
+ <!ENTITY manrevision "1.10.0">
+ <!ENTITY date "July 2015">
 <!ENTITY appname "Archive Manager">
 <!ENTITY app "<application>Archive Manager</application>">
 <!-- Information about the entities
@@ -17,7 +17,7 @@
 <!-- 
 (Do not remove this comment block.)
 Maintained by the MATE Documentation Project
- http://developer.MATE.org/projects/gdp
+ http://wiki.mate-desktop.org/dev-doc:doc-team-guide
 Template version: 2.0 beta
 Template last modified Jan 30, 2002
 -->
@@ -30,6 +30,10 @@
 <abstract role="description">
 <para>Archive Manager, also known as Engrampa, allows you to create, view, modify, or unpack an archive.</para>
 </abstract>
+ <copyright lang="en">
+ <year>2015</year>
+ <holder>MATE-Dokumentationsprojekt</holder>
+ </copyright>
 <copyright>
 <year>2009</year>
 <holder>Paul Cutler</holder>
@@ -65,18 +69,27 @@
 <!-- An address can be added to the publisher information. If a role is 
 not specified, the publisher/author is the same for all versions of the 
 document. -->
- <publisher role="maintainer"> 
- <publishername> MATE Documentation Project </publishername> 
+ <publisher>
+ <publishername>MATE-Dokumentationsprojekt</publishername>
 </publisher> 
+ <publisher>
+ <publishername>GNOME-Dokumentationsprojekt</publishername>
+ </publisher>
 
 &legal; <!-- This file contains link to license for the
 documentation (GNU FDL), and other legal stuff such as "NO
 WARRANTY" statement. Please do not change any of this. -->
 
- <authorgroup> 
- <author> 
+ <authorgroup>
+ <author role="maintainer" lang="en">
+ <surname>MATE-Dokumentationteam</surname>
+ <affiliation>
+ <orgname>Mate desktop</orgname>
+ </affiliation>
+ </author>
+ <author>
 <firstname>Sun </firstname>
- <surname>MATE Documentation Team</surname>
+ <surname>GNOME Documentation Team</surname>
 <affiliation> 
 <orgname>Sun Microsystems</orgname>
 </affiliation>
@@ -85,14 +98,14 @@
 <firstname>Paolo</firstname> 
 <surname>Bacchilega</surname> 
 <affiliation> 
- <orgname>MATE Documentation Project</orgname> 
+ <orgname>GNOME Documentation Project</orgname>
 </affiliation> 
 </author> 
 <author> 
 <firstname>Alexander</firstname> 
 <surname>Kirillov</surname> 
 <affiliation> 
- <orgname>MATE Documentation Project</orgname> 
+ <orgname>GNOME Documentation Project</orgname>
 <address> <email>[email protected]</email> </address> 
 </affiliation> 
 </author> 
@@ -100,23 +113,30 @@
 <firstname>Paul</firstname>
 <surname>Cutler</surname>
 <affiliation>
- <orgname>MATE Documentation Project</orgname>
+ <orgname>GNOME Documentation Project</orgname>
 <address><email>[email protected]</email></address>
 </affiliation>
 </author> 
 </authorgroup>
 
- <releaseinfo revision="2.26" role="review">
- <ulink type="techreview" url="http://bugzilla.mate.org/show_bug.cgi?id=575419"/>
+ <releaseinfo revision="1.10" role="review">
 </releaseinfo>
 
 <revhistory>
+ <revision lang="en">
+ <revnumber>Archive Manager Manual V1.10.0</revnumber>
+ <date>July 2015</date>
+ <revdescription>
+ <para role="author" lang="en">Wolfgang Ulbrich</para>
+ <para role="publisher" lang="en">MATE Documentation Project</para>
+ </revdescription>
+ </revision>
 <revision>
 <revnumber>Archive Manager Manual V2.26.0</revnumber>
 <date>March 2009</date>
 <revdescription>
 <para role="author">Paul Cutler</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 
@@ -125,7 +145,7 @@
 <date>July 2008</date>
 <revdescription>
 <para role="author">Paolo Bacchilega</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 
@@ -134,7 +154,7 @@
 <date>April 2006</date>
 <revdescription>
 <para role="author">Paolo Bacchilega</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 
@@ -143,7 +163,7 @@
 <date>March 2004</date>
 <revdescription>
 <para role="author">Sun GNOME Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 <revision>
@@ -151,7 +171,7 @@
 <date>February 2004</date>
 <revdescription>
 <para role="author">Sun GNOME Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 <revision>
@@ -159,7 +179,7 @@
 <date>August 2003</date>
 <revdescription>
 <para role="author">Sun GNOME Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 <revision>
@@ -167,7 +187,7 @@
 <date>June 2003</date>
 <revdescription>
 <para role="author">Sun GNOME Documentation Team</para>
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 <revision>
@@ -175,7 +195,7 @@
 <date>January 2003</date>
 <revdescription>
 <para role="author">Paolo Bacchilega</para> 
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 <revision>
@@ -183,17 +203,17 @@
 <date>June 2002</date>
 <revdescription>
 <para role="author">Alexander Kirillov</para> 
- <para role="publisher">MATE Documentation Project</para>
+ <para role="publisher">GNOME Documentation Project</para>
 </revdescription>
 </revision>
 </revhistory>
 
 <releaseinfo> This manual describes version &appversion; of &appname;.
 </releaseinfo> 
- <legalnotice> 
+ <legalnotice>
 <title>Feedback</title>
 <para>To report a bug or make a suggestion regarding the &app; application or this manual, follow the directions in the
- <ulink url="help:mate-feedback" type="help">MATE Feedback Page</ulink>.
+ <ulink url="help:mate-user-guide/feedback" type="help">MATE Feedback Page</ulink>.
 </para>
 <!-- Translators may also add here feedback address for translations -->
 </legalnotice>
diff --git a/help/fi/fi.po b/help/fi/fi.po
index e0cbe59..0ec35d7 100644
--- a/help/fi/fi.po
+++ b/help/fi/fi.po
@@ -533,7 +533,7 @@ msgstr "Yleisin arkistomuoto UNIX- ja Linux-järjestelmissä on <command>gzip</c
 
 #: C/engrampa.xml:346(para)
 msgid "The most common archive format on Microsoft Windows systems is the archive created with <application>PKZIP</application> or <application>WinZip</application>."
-msgstr "Yleisin arkistomuoto Microsoft Windows -järjestelmissä on ZIP-arkisto, joka on tehty <application>PKZIP</application>:llä tai <application>WinZip<application>:llä."
+msgstr "Yleisin arkistomuoto Microsoft Windows -järjestelmissä on ZIP-arkisto, joka on tehty <application>PKZIP</application>:llä tai <application>WinZip</application>:llä."
 
 #: C/engrampa.xml:348(title)
 msgid "Compressed Non-Archive Files"
@@ -731,7 +731,7 @@ msgstr "Tiedostonimilausekkeet"
 
 #: C/engrampa.xml:499(para)
 msgid "<application>Archive Manager</application> enables you to add, extract, or delete several files at once. To apply an action to all files that match a certain pattern, enter the pattern in the text box. The pattern can include standard wildcard symbols such as <keycap>*</keycap> to match any string, and <keycap>?</keycap> to match any single symbol. You can enter several patterns separated by semicolons. <application>Archive Manager</application> applies the action to all files that match at least one of the patterns. The examples in the following table show how to use filename patterns to select files."
-msgstr "<application>Pakettienkäsittelyohjelma> mahdollistaa useiden tiedostojen lisäämisen, poistamisen tai purkamisen samalla kertaa. Antaaksesi toiminnon kaikille tiedostoille, jotka täsmäävät lausekkeen kanssa, syötä lauseke tekstikenttään. Lauseke voi sisältää standardeja korvausmerkkejä kuten <keycap>*</keycap> täsmäyttääksesi mihin tahansa merkkijonoon ja <keycap>?</keycap> täsmäyttääksesi mihin tahansa yksittäiseen merkkiin. Voit syöttää useita lausekkeita puolipistein eroteltuina. <application>Pakettienkäsittelyohjelma</application> suorittaa toiminnot kaikille tiedostoille, jotka täsmäävät ainakin yhteen lausekkeeseen. Esimerkit ovat seuraavassa taulukossa näyttämässä, kuinka käytetään tiedostonimilausekkeita tiedostojen valintaan."
+msgstr "<application>Pakettienkäsittelyohjelma</application> mahdollistaa useiden tiedostojen lisäämisen, poistamisen tai purkamisen samalla kertaa. Antaaksesi toiminnon kaikille tiedostoille, jotka täsmäävät lausekkeen kanssa, syötä lauseke tekstikenttään. Lauseke voi sisältää standardeja korvausmerkkejä kuten <keycap>*</keycap> täsmäyttääksesi mihin tahansa merkkijonoon ja <keycap>?</keycap> täsmäyttääksesi mihin tahansa yksittäiseen merkkiin. Voit syöttää useita lausekkeita puolipistein eroteltuina. <application>Pakettienkäsittelyohjelma</application> suorittaa toiminnot kaikille tiedostoille, jotka täsmäävät ainakin yhteen lausekkeeseen. Esimerkit ovat seuraavassa taulukossa näyttämässä, kuinka käytetään tiedostonimilausekkeita tiedostojen valintaan."
 
 #: C/engrampa.xml:508(para)
 msgid "Pattern"
@@ -925,7 +925,7 @@ msgstr "Syötä uuden arkiston nimi tiedostopäätteineen <guilabel>Nimi</guilab
 #: C/engrampa.xml:756(para)
 #: C/engrampa.xml:1292(para)
 msgid "Select the required create options clicking on <guilabel>Other Options</guilabel>. For more information about the create options, see <xref linkend=\"engrampa-create-options\"/>."
-msgstr "Valitse tarvittavat luontiasetukset napsauttamalla <guilabel>Muut valinnat</guilabrl>. Lisätietoa luontiasetuksista: <xref linkend=\"engrampa-create-options\"/>."
+msgstr "Valitse tarvittavat luontiasetukset napsauttamalla <guilabel>Muut valinnat</guilabel>. Lisätietoa luontiasetuksista: <xref linkend=\"engrampa-create-options\"/>."
 
 #: C/engrampa.xml:666(para)
 msgid "Click <guibutton>New</guibutton>. <application>Archive Manager</application> creates an empty archive, but does not yet write the archive to disk."
@@ -1107,7 +1107,7 @@ msgstr "Valitse tiedosto, jonka haluat nimetä uudelleen."
 
 #: C/engrampa.xml:818(para)
 msgid "Choose <menuchoice><guimenu>Edit</guimenu><guimenuitem>Rename</guimenuitem></menuchoice>, or press <keycombo><keycap>F2</keycap></keycombo>, to display the <guilabel>Rename</guilabel> dialog."
-msgstr "Valitse <menuchoice><guimenu>Muokkaa</guimenu>Nimeä uudelleen<guimenuitem> tai paina <keycombo><keycap>F2</keycap></keycombo> avataksesi <guilabel>Nimeä uudelleen</guilabel>-valintaikkunan."
+msgstr "Valitse <menuchoice><guimenu>Muokkaa</guimenu><guimenuitem>Nimeä uudelleen</guimenuitem></menuchoice> tai paina <keycombo><keycap>F2</keycap></keycombo> avataksesi <guilabel>Nimeä uudelleen</guilabel>-valintaikkunan."
 
 #: C/engrampa.xml:821(para)
 msgid "Enter the new filename in the <guilabel>New file name</guilabel> text box."
@@ -1830,7 +1830,7 @@ msgstr "Napsauta tätä painiketta ladataksesi tai poistaaksesi aikaisemmin tall
 
 #: C/engrampa.xml:1478(para)
 msgid "To load a set of options, select the options file in the list box, then click <guibutton>Apply</guibutton>."
-msgstr "Ladataksesi asetuskokoelman, valitse asetustiedosto luettelokentästä ja napsauta <guilabel>Toteuta</guibutton>."
+msgstr "Ladataksesi asetuskokoelman, valitse asetustiedosto luettelokentästä ja napsauta <guibutton>Toteuta</guibutton>."
 
 #: C/engrampa.xml:1483(para)
 msgid "To delete a set of options, select the options file in the list box, then click <guibutton>Remove</guibutton>. Click <guibutton>Close</guibutton> to close the <guilabel>Load Options</guilabel> dialog."
diff --git a/help/fr/fr.po b/help/fr/fr.po
index 7ca4df1..e382c48 100644
--- a/help/fr/fr.po
+++ b/help/fr/fr.po
@@ -922,7 +922,7 @@ msgid ""
 msgstr ""
 "Vous pouvez aussi consulter la section sur les <ulink type=\"help\" url="
 "\"help:user-guide?caja-bookmarks\">signets</ulink> du guide "
-"d'utilisation du bureau</ulink> pour apprendre comment utiliser le panneau "
+"d'utilisation du bureau pour apprendre comment utiliser le panneau "
 "latéral <guilabel>Raccourcis</guilabel> pour accéder à vos emplacements "
 "préférés."
 
diff --git a/help/nl/nl.po b/help/nl/nl.po
index 0c034cb..0f91bce 100644
--- a/help/nl/nl.po
+++ b/help/nl/nl.po
@@ -278,7 +278,7 @@ msgstr "U kunt het <application>archiefbeheer</application> gebruiken om archiev
 
 #: /tmp/doc-l10n/cvs/engrampa.HEAD/C/engrampa.xml:207(para)
 msgid "<application>Archive Manager</application> provides only a graphical interface, and relies on command-line utilities such as <command>tar</command>, <command>gzip</command>, and <command>bzip2</command> for archive operations."
-msgstr "<application>Archiefbeheer</application> zorgt slechts voor de grafische toegang. De eigenlijke acties voor aanmaken, bewerken en uitpakken van archieven worden uitgevoerd door hulpprogramma's als <command>tar</command, <command>gzip</command> en <command>bzip2</command>."
+msgstr "<application>Archiefbeheer</application> zorgt slechts voor de grafische toegang. De eigenlijke acties voor aanmaken, bewerken en uitpakken van archieven worden uitgevoerd door hulpprogramma's als <command>tar</command>, <command>gzip</command> en <command>bzip2</command>."
 
 #: /tmp/doc-l10n/cvs/engrampa.HEAD/C/engrampa.xml:210(para)
 msgid "If you have the appropriate command-line tools installed on your system, <application>Archive Manager</application> supports RPM and Stuff files, as well as the archive formats listed in the following table."
diff --git a/help/ru/ru.po b/help/ru/ru.po
index 567187a..05d4454 100644
--- a/help/ru/ru.po
+++ b/help/ru/ru.po
@@ -307,12 +307,12 @@ msgstr "Обратная связь"
 msgid ""
 "To report a bug or make a suggestion regarding the <application>Archive "
 "Manager</application> application or this manual, follow the directions in "
-"the <ulink url=\"help:mate-feedback\" type=\"help\">MATE Feedback Page</"
+"the <ulink url=\"help:mate-user-guide/feedback\" type=\"help\">MATE Feedback Page</"
 "ulink>."
 msgstr ""
 "Чтобы сообщить об ошибке или внести пожелания относительно приложения "
 "<application>Менеджер архивов</application> или этого руководства, следуйте "
-"указаниям на <ulink url=\"help:mate-feedback\" type=\"help\">Странице "
+"указаниям на <ulink url=\"help:mate-user-guide/feedback\" type=\"help\">Странице "
 "обратной связи MATE</ulink>."
 
 #: C/engrampa.xml:166(primary)
diff --git a/help/vi/vi.po b/help/vi/vi.po
index 1a5862b..c86539e 100644
--- a/help/vi/vi.po
+++ b/help/vi/vi.po
@@ -1451,7 +1451,7 @@ msgstr "Để đặt chế độ hiển thị"
 
 #: C/engrampa.xml:1104(para)
 msgid "If the archive contains folders, you can show the archive contents in either <link linkend=\"engrampa-view-type-folder\">folder view</link> or <link linkend=\"engrampa-view-type-file\">file view</link>."
-msgstr "Nếu kho lưu có chứa thư mục, bạn có thể xem nội dung kho lưu dưới chế độ <link linkend=\"engrampa-view-type-foler\">thư mục</link> hay Hay < tập tin linkend=\" mối liên kết- sự xem rulô- đánh máy- thư mục\"> thư mục xem mối liên kết</> Hay < tập tin linkend=\" mối liên kết- sự xem rulô- đánh m<link linkend=\"engrampa-view-type-file\">tập tin</link>."
+msgstr "Nếu kho lưu có chứa thư mục, bạn có thể xem nội dung kho lưu dưới chế độ <link linkend=\"engrampa-view-type-foler\">thư mục</link> hay <link linkend=\"engrampa-view-type-file\">tập tin</link>."
 
 #: C/engrampa.xml:1108(title)
 msgid "Folder View"
@@ -1759,7 +1759,7 @@ msgstr "Gồm tập tin"
 
 #: C/engrampa.xml:1418(para)
 msgid "Type a filename pattern in this text box to include files with names that match the specified pattern. See <xref linkend=\"engrampa-pattern\"/> for more information about filename patterns."
-msgstr "Đánh máy một mẫu tên file trong cái hộp văn bản này để bao gồm những tập tin với những tên mà phù hợp với mẫu xác định. xem mục< tập tin xref linkend=\"- rulô- lấy làm mẫu\"/> để có thêm thông tin về những mẫu tên file"
+msgstr "Đánh máy một mẫu tên file trong cái hộp văn bản này để bao gồm những tập tin với những tên mà phù hợp với mẫu xác định. Xin xem phần <xref linkend=\"engrampa-pattern\"/> để biết cách sử dụng mẫu so khớp."
 
 #: C/engrampa.xml:1424(guilabel)
 msgid "Exclude files"
diff --git a/po/POTFILES.in b/po/POTFILES.in
index ea0d811..f52307e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -18,7 +18,7 @@ data/engrampa.desktop.in.in
 [type: gettext/glade]data/ui/password.ui
 [type: gettext/glade]data/ui/properties.ui
 [type: gettext/glade]data/ui/update.ui
-data/org.mate.engrampa.gschema.xml.in
+[type: gettext/gsettings]data/org.mate.engrampa.gschema.xml.in
 caja/engrampa-module.c
 caja/caja-engrampa.c
 caja/caja-engrampa.h
diff --git a/src/Makefile.am b/src/Makefile.am
index c1f1a01..494b527 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -171,7 +171,7 @@ fr-marshal.c: fr-marshal.list $(GLIB_GENMARSHAL)
 
 fr-enum-types.h: typedefs.h $(GLIB_MKENUMS)
 $(AM_V_GEN)( $(GLIB_MKENUMS) \
- --fhead "#ifndef FR_ENUM__TYPES_H\n#define FR_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
+ --fhead "#ifndef FR_ENUM_TYPES_H\n#define FR_ENUM_TYPES_H\n\n#include <glib-object.h>\n\nG_BEGIN_DECLS\n" \
 --fprod "/* enumerations from \"@filename@\" */\n" \
 --vhead "GType @enum_name@_get_type (void);\n#define FR_TYPE_@ENUMSHORT@ (@enum_name@_get_type())\n" \
 --ftail "G_END_DECLS\n\n#endif /* FR_ENUM_TYPES_H */" \
diff --git a/src/actions.c b/src/actions.c
index 5754aea..9e85e48 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -435,7 +435,7 @@ save_file_response_cb (GtkWidget *w,
 }
 
 if (response == GTK_RESPONSE_HELP) {
- show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-convert-archive");
+ show_help_dialog (GTK_WINDOW (data->dialog), "engrampa-create#engrampa-convert-archive");
 return;
 }
 
diff --git a/src/fr-command-rar.c b/src/fr-command-rar.c
index 2aa0eee..31c95c1 100644
--- a/src/fr-command-rar.c
+++ b/src/fr-command-rar.c
@@ -152,6 +152,9 @@ parse_name_field (char *line,
 else
 name_field = g_strdup (line + 1);
 
+ if (name_field == NULL)
+ return;
+
 if (*name_field == '/') {
 fdata->full_path = g_strdup (name_field);
 fdata->original_path = fdata->full_path;
diff --git a/src/fr-command-unarchiver.c b/src/fr-command-unarchiver.c
index d13f468..cfeb8c2 100644
--- a/src/fr-command-unarchiver.c
+++ b/src/fr-command-unarchiver.c
@@ -209,8 +209,13 @@ fr_command_unarchiver_extract (FrCommand *comm,
 
 fr_process_add_arg (comm->process, comm->filename);
 
- for (scan = file_list; scan; scan = scan->next)
- fr_process_add_arg (comm->process, scan->data);
+ for (scan = file_list; scan; scan = scan->next) {
+ char *escaped;
+
+ escaped = escape_str (scan->data, "[");
+ fr_process_add_arg (comm->process, escaped);
+ g_free (escaped);
+ }
 
 fr_process_end_command (comm->process);
 }
diff --git a/src/gtk-utils.c b/src/gtk-utils.c
index 24a686a..8d29c07 100644
--- a/src/gtk-utils.c
+++ b/src/gtk-utils.c
@@ -772,7 +772,7 @@ show_help_dialog (GtkWindow *parent,
 char *uri;
 GError *error = NULL;
 
- uri = g_strconcat ("help:engrampa", section ? "?" : NULL, section, NULL);
+ uri = g_strconcat ("help:engrampa", section ? "/" : NULL, section, NULL);
 if (! show_uri (gtk_window_get_screen (parent), uri, GDK_CURRENT_TIME, &error)) {
 GtkWidget *dialog;