Author: stephan
Date: 2006-08-25 05:23:35 +0000 (Fri, 25 Aug 2006)
New Revision: 22876
Added:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.h
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.h
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.c
xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.h
xarchiver/branches/xarchiver-psybsd/po/nl.po
xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot
Log:
Added 'rar' support.
Added template for 'unrar' support.
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
2006-08-24 18:36:28 UTC (rev 22875)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/Makefile.am
2006-08-25 05:23:35 UTC (rev 22876)
@@ -6,6 +6,8 @@
archive.c archive.h \
archive-support.c archive-support.h \
archive-support-zip.c archive-support-zip.h \
+ archive-support-rar.c archive-support-rar.h \
+ archive-support-unrar.c archive-support-unrar.h \
archive-support-gnu-tar.c archive-support-gnu-tar.h
libxarchiver_a_CFLAGS = \
Added: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.c
(rev 0)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.c
2006-08-25 05:23:35 UTC (rev 22876)
@@ -0,0 +1,187 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#define EXO_API_SUBJECT_TO_CHANGE
+
+#include <glib.h>
+#include <glib-object.h>
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "archive.h"
+#include "archive-support.h"
+#include "archive-support-rar.h"
+
+#include "internals.h"
+
+void
+lxa_archive_support_rar_init(LXAArchiveSupportRar *support);
+void
+lxa_archive_support_rar_class_init(LXAArchiveSupportRarClass *supportclass);
+
+gint
+lxa_archive_support_rar_add(LXAArchive *archive, GSList *filenames);
+gint
+lxa_archive_support_rar_extract(LXAArchive *archive, gchar *dest_path, GSList
*filenames);
+gint
+lxa_archive_support_rar_remove(LXAArchive *archive, GSList *filenames);
+
+GType
+lxa_archive_support_rar_get_type ()
+{
+ static GType lxa_archive_support_rar_type = 0;
+
+ if (!lxa_archive_support_rar_type)
+ {
+ static const GTypeInfo lxa_archive_support_rar_info =
+ {
+ sizeof (LXAArchiveSupportRarClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) lxa_archive_support_rar_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (LXAArchiveSupportRar),
+ 0,
+ (GInstanceInitFunc) lxa_archive_support_rar_init,
+ };
+
+ lxa_archive_support_rar_type = g_type_register_static
(LXA_TYPE_ARCHIVE_SUPPORT, "LXAArchiveSupportRar",
&lxa_archive_support_rar_info, 0);
+ }
+ return lxa_archive_support_rar_type;
+}
+
+void
+lxa_archive_support_rar_init(LXAArchiveSupportRar *support)
+{
+ LXAArchiveSupport *archive_support = LXA_ARCHIVE_SUPPORT(support);
+
+ archive_support->id = "Rar";
+
+ lxa_archive_support_add_mime(archive_support, "application/x-rar");
+
+ archive_support->add = lxa_archive_support_rar_add;
+ archive_support->extract = lxa_archive_support_rar_extract;
+ archive_support->remove = lxa_archive_support_rar_remove;
+}
+
+void
+lxa_archive_support_rar_class_init(LXAArchiveSupportRarClass *supportclass)
+{
+ /*
+ GObjectClass *gobject_class = G_OBJECT_CLASS (supportclass);
+ LXAArchiveSupportRarClass *klass = LXA_ARCHIVE_SUPPORT_RAR_CLASS
(supportclass);
+ */
+}
+
+LXAArchiveSupport*
+lxa_archive_support_rar_new()
+{
+ LXAArchiveSupportRar *support = NULL;
+
+ gchar *abs_path = g_find_program_in_path("rar");
+ if(abs_path)
+ {
+ support = g_object_new(LXA_TYPE_ARCHIVE_SUPPORT_RAR, NULL);
+ g_free(abs_path);
+ }
+
+ return LXA_ARCHIVE_SUPPORT(support);
+}
+
+gint
+lxa_archive_support_rar_add(LXAArchive *archive, GSList *filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_RAR(archive->support))
+ {
+ g_critical("Support is not rar");
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(archive->support, archive->mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(!g_strcasecmp((gchar *)archive->mime, "application/x-rar"))
+ {
+ command = g_strconcat("rar a -o+ -ep1 -idp",
archive->path, " ", files, NULL);
+ lxa_execute(command, archive, NULL, NULL, NULL, NULL);
+ }
+ }
+ return 0;
+}
+
+gint
+lxa_archive_support_rar_extract(LXAArchive *archive, gchar *dest_path, GSList
*filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_RAR(archive->support))
+ {
+ g_critical("Support is not Rar");
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(archive->support, archive->mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(g_file_test(archive->path, G_FILE_TEST_EXISTS))
+ {
+ if(!g_strcasecmp((gchar *)archive->mime,
"application/x-rar"))
+ {
+ command = g_strconcat("rar x -o+ -idp ",
archive->path, " ", files, " ", dest_path, " ", NULL);
+ g_debug("Extracting archive '%s' to '%s'",
archive->path, dest_path);
+ lxa_execute(command, archive, NULL, NULL, NULL,
NULL);
+ }
+ } else
+ return 1;
+ }
+ return 0;
+}
+
+gint
+lxa_archive_support_rar_remove(LXAArchive *archive, GSList *filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_RAR(archive->support))
+ {
+ g_critical("Support is not rar");
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(archive->support, archive->mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(!g_strcasecmp((gchar *)archive->mime, "application/x-rar"))
+ {
+ command = g_strconcat("rar -d ", archive->path, " ",
files, NULL);
+ lxa_execute(command, archive, NULL, NULL, NULL, NULL);
+ }
+ }
+ return 0;
+}
Added: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.h
(rev 0)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-rar.h
2006-08-25 05:23:35 UTC (rev 22876)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_RAR_H__
+#define __LIBXARCHIVER_ARCHIVE_SUPPORT_RAR_H__
+
+G_BEGIN_DECLS
+
+
+#define LXA_TYPE_ARCHIVE_SUPPORT_RAR lxa_archive_support_rar_get_type()
+
+#define LXA_ARCHIVE_SUPPORT_RAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LXA_TYPE_ARCHIVE_SUPPORT_RAR, \
+ LXAArchiveSupportRar))
+
+#define LXA_IS_ARCHIVE_SUPPORT_RAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ LXA_TYPE_ARCHIVE_SUPPORT_RAR))
+
+#define LXA_ARCHIVE_SUPPORT_RAR_CLASS(klass) ( \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ LXA_TYPE_ARCHIVE_SUPPORT_RAR, \
+ LXAArchiveSupportRarClass))
+
+#define LXA_IS_ARCHIVE_SUPPORT_RAR_CLASS(klass) ( \
+ G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ LXA_TYPE_ARCHIVE_SUPPORT_RAR))
+
+typedef struct _LXAArchiveSupportRar LXAArchiveSupportRar;
+
+struct _LXAArchiveSupportRar
+{
+ LXAArchiveSupport parent;
+};
+
+typedef struct _LXAArchiveSupportRarClass LXAArchiveSupportRarClass;
+
+struct _LXAArchiveSupportRarClass
+{
+ LXAArchiveSupportClass parent;
+};
+
+GType lxa_archive_support_rar_get_type(void);
+LXAArchiveSupport * lxa_archive_support_rar_new();
+
+gint lxa_archive_support_rar_add(LXAArchive *, GSList *);
+gint lxa_archive_support_rar_extract(LXAArchive *, gchar *,
GSList *);
+gint lxa_archive_support_rar_remove(LXAArchive *, GSList *);
+
+G_END_DECLS
+
+#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_RAR_H__ */
Added: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c
(rev 0)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.c
2006-08-25 05:23:35 UTC (rev 22876)
@@ -0,0 +1,193 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Libunrary General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+
+#define EXO_API_SUBJECT_TO_CHANGE
+
+#include <glib.h>
+#include <glib-object.h>
+#include <thunar-vfs/thunar-vfs.h>
+
+#include "archive.h"
+#include "archive-support.h"
+#include "archive-support-unrar.h"
+
+#include "internals.h"
+
+void
+lxa_archive_support_unrar_init(LXAArchiveSupportUnrar *support);
+void
+lxa_archive_support_unrar_class_init(LXAArchiveSupportUnrarClass
*supportclass);
+
+gint
+lxa_archive_support_unrar_add(LXAArchive *archive, GSList *filenames);
+gint
+lxa_archive_support_unrar_extract(LXAArchive *archive, gchar *dest_path,
GSList *filenames);
+gint
+lxa_archive_support_unrar_remove(LXAArchive *archive, GSList *filenames);
+
+GType
+lxa_archive_support_unrar_get_type ()
+{
+ static GType lxa_archive_support_unrar_type = 0;
+
+ if (!lxa_archive_support_unrar_type)
+ {
+ static const GTypeInfo lxa_archive_support_unrar_info =
+ {
+ sizeof (LXAArchiveSupportUnrarClass),
+ (GBaseInitFunc) NULL,
+ (GBaseFinalizeFunc) NULL,
+ (GClassInitFunc) lxa_archive_support_unrar_class_init,
+ (GClassFinalizeFunc) NULL,
+ NULL,
+ sizeof (LXAArchiveSupportUnrar),
+ 0,
+ (GInstanceInitFunc) lxa_archive_support_unrar_init,
+ };
+
+ lxa_archive_support_unrar_type = g_type_register_static
(LXA_TYPE_ARCHIVE_SUPPORT, "LXAArchiveSupportUnrar",
&lxa_archive_support_unrar_info, 0);
+ }
+ return lxa_archive_support_unrar_type;
+}
+
+void
+lxa_archive_support_unrar_init(LXAArchiveSupportUnrar *support)
+{
+ LXAArchiveSupport *archive_support = LXA_ARCHIVE_SUPPORT(support);
+
+ archive_support->id = "Unrar";
+
+ lxa_archive_support_add_mime(archive_support, "application/x-rar");
+
+ archive_support->add = lxa_archive_support_unrar_add;
+ archive_support->extract = lxa_archive_support_unrar_extract;
+ archive_support->remove = lxa_archive_support_unrar_remove;
+}
+
+void
+lxa_archive_support_unrar_class_init(LXAArchiveSupportUnrarClass *supportclass)
+{
+ /*
+ GObjectClass *gobject_class = G_OBJECT_CLASS (supportclass);
+ LXAArchiveSupportUnrarClass *klass = LXA_ARCHIVE_SUPPORT_UNRAR_CLASS
(supportclass);
+ */
+}
+
+LXAArchiveSupport*
+lxa_archive_support_unrar_new()
+{
+ LXAArchiveSupportUnrar *support = NULL;
+
+ gchar *abs_path = g_find_program_in_path("unrar");
+ if(abs_path)
+ {
+ support = g_object_new(LXA_TYPE_ARCHIVE_SUPPORT_UNRAR, NULL);
+ g_free(abs_path);
+ }
+
+ return LXA_ARCHIVE_SUPPORT(support);
+}
+
+gint
+lxa_archive_support_unrar_add(LXAArchive *archive, GSList *filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_UNRAR(archive->support))
+ {
+ g_critical("Support is not unrar");
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(archive->support, archive->mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(!g_strcasecmp((gchar *)archive->mime, "application/x-rar"))
+ {
+ /* TODO: Fix commandline issues
+ command = g_strconcat("unrar ", archive->path, " ",
files, NULL);
+ */
+ lxa_execute(command, archive, NULL, NULL, NULL, NULL);
+ }
+ }
+ return 0;
+}
+
+gint
+lxa_archive_support_unrar_extract(LXAArchive *archive, gchar *dest_path,
GSList *filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_UNRAR(archive->support))
+ {
+ g_critical("Support is not Unrar");
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(archive->support, archive->mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(g_file_test(archive->path, G_FILE_TEST_EXISTS))
+ {
+ if(!g_strcasecmp((gchar *)archive->mime,
"application/x-rar"))
+ {
+ /* TODO: Fix commandline issues
+ command = g_strconcat("unrar x -o+ -idp ",
archive->path, " ", files, " ", dest_path, " ", NULL);
+ */
+ g_debug("Extracting archive '%s' to '%s'",
archive->path, dest_path);
+ lxa_execute(command, archive, NULL, NULL, NULL,
NULL);
+ }
+ } else
+ return 1;
+ }
+ return 0;
+}
+
+gint
+lxa_archive_support_unrar_remove(LXAArchive *archive, GSList *filenames)
+{
+ if(!LXA_IS_ARCHIVE_SUPPORT_UNRAR(archive->support))
+ {
+ g_critical("Support is not unrar");
+ return -1;
+ }
+
+ if(!lxa_archive_support_mime_supported(archive->support, archive->mime))
+ {
+ return 1;
+ }
+ else
+ {
+ gchar *command = NULL;
+ gchar *files = lxa_concat_filenames(filenames);
+ if(!g_strcasecmp((gchar *)archive->mime, "application/x-rar"))
+ {
+ /* TODO: Fix commandline issues
+ command = g_strconcat("unrar -d ", archive->path, " ",
files, NULL);
+ */
+ lxa_execute(command, archive, NULL, NULL, NULL, NULL);
+ }
+ }
+ return 0;
+}
Added: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.h
(rev 0)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-unrar.h
2006-08-25 05:23:35 UTC (rev 22876)
@@ -0,0 +1,67 @@
+/*
+ * Copyright (c) 2006 Stephan Arts <[EMAIL PROTECTED]>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Libunrary General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ */
+#ifndef __LIBXARCHIVER_ARCHIVE_SUPPORT_UNRAR_H__
+#define __LIBXARCHIVER_ARCHIVE_SUPPORT_UNRAR_H__
+
+G_BEGIN_DECLS
+
+
+#define LXA_TYPE_ARCHIVE_SUPPORT_UNRAR lxa_archive_support_unrar_get_type()
+
+#define LXA_ARCHIVE_SUPPORT_UNRAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LXA_TYPE_ARCHIVE_SUPPORT_UNRAR, \
+ LXAArchiveSupportUnrar))
+
+#define LXA_IS_ARCHIVE_SUPPORT_UNRAR(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+ LXA_TYPE_ARCHIVE_SUPPORT_UNRAR))
+
+#define LXA_ARCHIVE_SUPPORT_UNRAR_CLASS(klass) ( \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ LXA_TYPE_ARCHIVE_SUPPORT_UNRAR, \
+ LXAArchiveSupportUnrarClass))
+
+#define LXA_IS_ARCHIVE_SUPPORT_UNRAR_CLASS(klass) ( \
+ G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ LXA_TYPE_ARCHIVE_SUPPORT_UNRAR))
+
+typedef struct _LXAArchiveSupportUnrar LXAArchiveSupportUnrar;
+
+struct _LXAArchiveSupportUnrar
+{
+ LXAArchiveSupport parent;
+};
+
+typedef struct _LXAArchiveSupportUnrarClass LXAArchiveSupportUnrarClass;
+
+struct _LXAArchiveSupportUnrarClass
+{
+ LXAArchiveSupportClass parent;
+};
+
+GType lxa_archive_support_unrar_get_type(void);
+LXAArchiveSupport * lxa_archive_support_unrar_new();
+
+gint lxa_archive_support_unrar_add(LXAArchive *, GSList *);
+gint lxa_archive_support_unrar_extract(LXAArchive *, gchar *,
GSList *);
+gint lxa_archive_support_unrar_remove(LXAArchive *, GSList *);
+
+G_END_DECLS
+
+#endif /* __LIBXARCHIVER_ARCHIVE_SUPPORT_UNRAR_H__ */
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.c
2006-08-24 18:36:28 UTC (rev 22875)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.c
2006-08-25 05:23:35 UTC (rev 22876)
@@ -22,6 +22,10 @@
#include <glib-object.h>
#include "libxarchiver.h"
+#include "libxarchiver/archive-support-zip.h"
+#include "libxarchiver/archive-support-rar.h"
+#include "libxarchiver/archive-support-unrar.h"
+#include "libxarchiver/archive-support-gnu-tar.h"
#include "internals.h"
@@ -33,6 +37,10 @@
lxa_mime_database = thunar_vfs_mime_database_get_default();
lxa_register_support(lxa_archive_support_zip_new());
+ lxa_register_support(lxa_archive_support_rar_new());
+ /* TODO: Implement right commands in unrar
+ lxa_register_support(lxa_archive_support_unrar_new());
+ */
lxa_register_support(lxa_archive_support_gnu_tar_new());
}
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.h
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.h
2006-08-24 18:36:28 UTC (rev 22875)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/libxarchiver.h
2006-08-25 05:23:35 UTC (rev 22876)
@@ -23,8 +23,6 @@
#include <thunar-vfs/thunar-vfs.h>
#include <libxarchiver/archive.h>
#include <libxarchiver/archive-support.h>
-#include <libxarchiver/archive-support-zip.h>
-#include <libxarchiver/archive-support-gnu-tar.h>
G_BEGIN_DECLS
Modified: xarchiver/branches/xarchiver-psybsd/po/nl.po
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-08-24 18:36:28 UTC
(rev 22875)
+++ xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-08-25 05:23:35 UTC
(rev 22876)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.3.9psybsd\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-20 23:45+0200\n"
+"POT-Creation-Date: 2006-08-25 07:21+0200\n"
"PO-Revision-Date: 2006-07-20 16:36+0200\n"
"Last-Translator: Stephan Arts <[EMAIL PROTECTED]>\n"
"Language-Team: Dutch <[EMAIL PROTECTED]>\n"
@@ -17,12 +17,12 @@
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../libxarchiver/archive-support-gnu-tar.c:123
-#: ../libxarchiver/archive-support-zip.c:100
+#: ../libxarchiver/archive-support-zip.c:99
msgid "Overwrite existing files"
msgstr "Bestaande bestanden overschrijven"
#: ../libxarchiver/archive-support-gnu-tar.c:124
-#: ../libxarchiver/archive-support-zip.c:101
+#: ../libxarchiver/archive-support-zip.c:100
msgid "Overwrite existing files on extraction"
msgstr "Bestaande bestanden overschrijven tijdens uitpakken"
@@ -62,7 +62,6 @@
#. Could not open archive (mime type not supported or file did not exsit)
#: ../src/main.c:190
-#, fuzzy
msgid "Could not open archive, MIME-type unsupported or file did not exist"
msgstr ""
"Kan archief niet openen, MIME-type wordt niet ondersteund of bestand bestaat "
@@ -97,6 +96,5 @@
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window_tool_bar.c:90
-msgid "Delete"
-msgstr "Verwijderen"
+#~ msgid "Delete"
+#~ msgstr "Verwijderen"
Modified: xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot 2006-08-24
18:36:28 UTC (rev 22875)
+++ xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot 2006-08-25
05:23:35 UTC (rev 22876)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-19 01:15+0200\n"
+"POT-Creation-Date: 2006-08-25 07:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -16,34 +16,77 @@
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/main.c:49
+#: ../libxarchiver/archive-support-gnu-tar.c:123
+#: ../libxarchiver/archive-support-zip.c:99
+msgid "Overwrite existing files"
+msgstr ""
+
+#: ../libxarchiver/archive-support-gnu-tar.c:124
+#: ../libxarchiver/archive-support-zip.c:100
+msgid "Overwrite existing files on extraction"
+msgstr ""
+
+#: ../src/main.c:47
msgid "[destination path]"
msgstr ""
-#: ../src/main.c:57
+#: ../src/main.c:55
msgid "[archive path] [file1] [file2] ... [fileN]"
msgstr ""
-#: ../src/main.c:61
+#: ../src/main.c:59
msgid "[file1] [file2] ... [fileN]"
msgstr ""
-#: ../src/main.c:106
+#: ../src/main.c:62
+msgid "Version information"
+msgstr ""
+
+#: ../src/main.c:108
msgid "[archive name]"
msgstr ""
-#: ../src/main.c:159
+#: ../src/main.c:112
+#, c-format
+msgid ""
+"%s: %s\n"
+"Try xarchiver --help to see a full list of available command line options.\n"
+msgstr ""
+
+#: ../src/main.c:175
msgid "Could not create archive, MIME-type unsupported"
msgstr ""
+#. Could not open archive (mime type not supported or file did not exsit)
+#: ../src/main.c:190
+msgid "Could not open archive, MIME-type unsupported or file did not exist"
+msgstr ""
+
#: ../src/new_dialog.c:85
msgid "Create new archive"
msgstr ""
-#: ../src/extract_dialog.c:78
+#: ../src/extract_dialog.c:78 ../src/main_window_menu_bar.c:117
+#: ../src/main_window_tool_bar.c:87
msgid "Extract"
msgstr ""
#: ../src/extract_dialog.c:87
msgid "Extract archive"
msgstr ""
+
+#: ../src/main_window_menu_bar.c:75
+msgid "_Archive"
+msgstr ""
+
+#: ../src/main_window_menu_bar.c:76
+msgid "A_ction"
+msgstr ""
+
+#: ../src/main_window_menu_bar.c:77
+msgid "_Help"
+msgstr ""
+
+#: ../src/main_window_menu_bar.c:112 ../src/main_window_tool_bar.c:84
+msgid "Add"
+msgstr ""
_______________________________________________
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
