[Xfce4-commits] r24133 - in squeeze/trunk: . po src
Stephan Arts
stephan at xfce.org
Mon Dec 18 22:08:07 CET 2006
Author: stephan
Date: 2006-12-18 21:08:07 +0000 (Mon, 18 Dec 2006)
New Revision: 24133
Modified:
squeeze/trunk/configure.in.in
squeeze/trunk/po/fi.po
squeeze/trunk/po/nl.po
squeeze/trunk/src/main.c
squeeze/trunk/src/main_window.c
squeeze/trunk/src/main_window.h
Log:
- Fixed About dialog
- Updated dutch translation
- Made libxfce4util a fixed dependency (instead of optional)
Modified: squeeze/trunk/configure.in.in
===================================================================
--- squeeze/trunk/configure.in.in 2006-12-18 19:21:39 UTC (rev 24132)
+++ squeeze/trunk/configure.in.in 2006-12-18 21:08:07 UTC (rev 24133)
@@ -29,7 +29,7 @@
Written for Xfce by Stephan Arts <stephan at xfce.org>.])
-AC_INIT([Squeeze], [squeeze_version], [])
+AC_INIT([Squeeze], [squeeze_version], [http://bugzilla.xfce.org/])
AC_PREREQ([2.50])
SQUEEZE_VERSION=squeeze_version
@@ -121,16 +121,18 @@
XDT_CHECK_PACKAGE([GOBJECT], [gobject-2.0], [2.4.0])
XDT_CHECK_PACKAGE([GTHREAD], [gthread-2.0], [2.4.0])
XDT_CHECK_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0])
+XDT_CHECK_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99])
AC_DEFINE([HAVE_THUNAR_VFS], [1], [Define if we have thunar-vfs])
+AC_DEFINE([HAVE_LIBXFCE4UTIL], [1], [Define if we have thunar-vfs])
dnl XDT_CHECK_OPTIONAL_PACKAGE([THUNAR_VFS], [thunar-vfs-1], [0.4.0], [thunar-vfs],
dnl AC_HELP_STRING([--disable-thunar-vfs],
dnl [Disable the use of Thunar's VFS layer)]))
-XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99], [libxfce4util],
- AC_HELP_STRING([--disable-libxfce4util],
- [Disable the use of libxfce4util)]))
+dnl XDT_CHECK_OPTIONAL_PACKAGE([LIBXFCE4UTIL], [libxfce4util-1.0], [4.3.99], [libxfce4util],
+dnl AC_HELP_STRING([--disable-libxfce4util],
+dnl [Disable the use of libxfce4util)]))
AC_ARG_ENABLE([pathbar],
[AC_HELP_STRING([--disable-pathbar],
Modified: squeeze/trunk/po/fi.po
===================================================================
--- squeeze/trunk/po/fi.po 2006-12-18 19:21:39 UTC (rev 24132)
+++ squeeze/trunk/po/fi.po 2006-12-18 21:08:07 UTC (rev 24133)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.4.2rc2\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2006-12-13 12:05+0200\n"
+"POT-Creation-Date: 2006-12-18 22:06+0100\n"
"PO-Revision-Date: 2006-12-13 12:43+0200\n"
"Last-Translator: Jari Rahkonen <jari.rahkonen at pp1.inet.fi>\n"
"Language-Team: Finnish <translation-team-fi at lists.sourceforge.net>\n"
@@ -15,11 +15,11 @@
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../libsqueeze/archive.c:421
+#: ../libsqueeze/archive.c:422
msgid "Filename"
msgstr "Tiedostonimi"
-#: ../libsqueeze/archive.c:424
+#: ../libsqueeze/archive.c:425
msgid "Mime type"
msgstr "MIME-tyyppi"
@@ -193,23 +193,23 @@
"%s: %s\n"
"Kirjoittamalla %s --help saat täyden listan komentorivivalitsimista.\n"
-#: ../src/main_window.c:110
+#: ../src/main_window.c:117
msgid "Internal Style"
msgstr "Sisäinen tyyli"
-#: ../src/main_window.c:112
+#: ../src/main_window.c:119
msgid "Tool Bar Style"
msgstr "Työkalupalkkityyli"
-#: ../src/main_window.c:115
+#: ../src/main_window.c:122
msgid "Path Bar Style"
msgstr "Polkupalkkityyli"
-#: ../src/main_window.c:163
+#: ../src/main_window.c:170
msgid "Navigation Style"
msgstr "Navigointitapa"
-#: ../src/main_window.c:164
+#: ../src/main_window.c:171
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -218,54 +218,69 @@
"Tapa, jolla navigoit arkistossa"
#. File menu
-#: ../src/main_window.c:249
+#: ../src/main_window.c:256
msgid "_File"
msgstr "_Tiedosto"
#. Action menu: ref all the childs
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
msgid "_Action"
msgstr "Toi_minto"
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
msgid "_Add"
msgstr "_Lisää"
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
msgid "_Extract"
msgstr "P_ura"
#. View menu
-#: ../src/main_window.c:305
+#: ../src/main_window.c:312
msgid "_View"
msgstr "_Näytä"
-#: ../src/main_window.c:347
+#. Help menu
+#: ../src/main_window.c:334
+msgid "_Help"
+msgstr ""
+
+#: ../src/main_window.c:365
msgid "Add"
msgstr "Lisää"
-#: ../src/main_window.c:351 ../src/main_window.c:799
+#: ../src/main_window.c:369 ../src/main_window.c:844
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Pura"
-#: ../src/main_window.c:594
+#: ../src/main_window.c:612
msgid "Open archive"
msgstr "Avaa arkisto"
-#: ../src/main_window.c:798
+#: ../src/main_window.c:763
+msgid ""
+"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
+"Environment"
+msgstr ""
+
+#: ../src/main_window.c:769
+msgid "translator-credits"
+msgstr "Jari Rahkonen <jari.rahkonen at pp1.inet.fi>"
+
+#: ../src/main_window.c:843
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Mitä haluat tehdä valitu(i)lle tiedosto(i)lle?"
-#: ../src/main_window.c:799
+#: ../src/main_window.c:844
msgid "View"
msgstr "Näytä"
-#: ../src/main_window.c:862
+#: ../src/main_window.c:907
msgid "Failed to open file"
msgstr "Linkin avaaminen epäonnistui"
-#: ../src/main_window.c:863
+#: ../src/main_window.c:908
#, c-format
msgid ""
"'%s'\n"
@@ -287,7 +302,8 @@
#.
#: ../src/application.c:240
msgid "Could not open archive, MIME-type unsupported or file did not exist"
-msgstr "Arkistoa ei voi avata, MIME-tyyppiä ei tueta tai tiedostoa ei ole olemassa"
+msgstr ""
+"Arkistoa ei voi avata, MIME-tyyppiä ei tueta tai tiedostoa ei ole olemassa"
#: ../src/new_dialog.c:87
msgid "Create new archive"
@@ -301,25 +317,25 @@
msgid "Options:"
msgstr "Valinnat:"
-#: ../src/add_dialog.c:107
+#: ../src/add_dialog.c:109
msgid "Files"
msgstr "Tiedostoja"
-#: ../src/add_dialog.c:111
+#: ../src/add_dialog.c:113
msgid "Directories"
msgstr "Hakemistoja"
-#: ../src/add_dialog.c:147
+#: ../src/add_dialog.c:149
msgid "Add file(s) to archive"
msgstr "Lisää tiedosto(ja) arkistoon"
#. Select Files Dialog
-#: ../src/add_dialog.c:180
+#: ../src/add_dialog.c:185
msgid "Select files"
msgstr "Valitse tiedostot"
#. Select Folder Dialog
-#: ../src/add_dialog.c:186
+#: ../src/add_dialog.c:191
msgid "Select folders"
msgstr "Valitse hakemistot"
@@ -355,11 +371,16 @@
msgid "The amount of space between the path buttons"
msgstr "Polkupainikkeiden välinen tyhjä tila"
-#: ../src/notebook.c:314
+#: ../src/notebook.c:319
#, c-format
msgid "Failed to open archive '%s'."
msgstr "Arkiston \"%s\" avaaminen epäonnistui."
+#: ../src/notebook.c:322
+#, fuzzy, c-format
+msgid "Failed to extract contents of archive '%s'."
+msgstr "Arkiston \"%s\" avaaminen epäonnistui."
+
#: ../src/archive_store.c:242
msgid "Show mime icons"
msgstr "Näytä MIME-kuvakkeet"
Modified: squeeze/trunk/po/nl.po
===================================================================
--- squeeze/trunk/po/nl.po 2006-12-18 19:21:39 UTC (rev 24132)
+++ squeeze/trunk/po/nl.po 2006-12-18 21:08:07 UTC (rev 24133)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: Squeeze 0.0.1-svn-r24005\n"
"Report-Msgid-Bugs-To: stephan at xfce.org\n"
-"POT-Creation-Date: 2006-12-18 17:32+0100\n"
+"POT-Creation-Date: 2006-12-18 22:06+0100\n"
"PO-Revision-Date: 2006-11-28 22:52+0100\n"
"Last-Translator: Stephan Arts <stephan at xfce.org>\n"
"Language-Team: Dutch <vertaling at vrijschrift.org>\n"
@@ -194,23 +194,23 @@
"%s: %s\n"
"Probeer %s --help voor een volledige lijst van mogelijke opties.\n"
-#: ../src/main_window.c:110
+#: ../src/main_window.c:117
msgid "Internal Style"
msgstr "Interne Stijl"
-#: ../src/main_window.c:112
+#: ../src/main_window.c:119
msgid "Tool Bar Style"
msgstr "Werkbalk Stijl"
-#: ../src/main_window.c:115
+#: ../src/main_window.c:122
msgid "Path Bar Style"
msgstr "Padbalk Stijl"
-#: ../src/main_window.c:163
+#: ../src/main_window.c:170
msgid "Navigation Style"
msgstr "Navigatie Stijl"
-#: ../src/main_window.c:164
+#: ../src/main_window.c:171
msgid ""
"Style of navigation\n"
"The style to navigate trough the archive"
@@ -219,54 +219,71 @@
"De stijl om te navigeren door het archief"
#. File menu
-#: ../src/main_window.c:249
+#: ../src/main_window.c:256
msgid "_File"
msgstr "_Bestand"
#. Action menu: ref all the childs
-#: ../src/main_window.c:280
+#: ../src/main_window.c:287
msgid "_Action"
msgstr "_Actie"
-#: ../src/main_window.c:285
+#: ../src/main_window.c:292
msgid "_Add"
msgstr "_Toevoegen"
-#: ../src/main_window.c:291
+#: ../src/main_window.c:298
msgid "_Extract"
msgstr "_Uitpakken"
#. View menu
-#: ../src/main_window.c:305
+#: ../src/main_window.c:312
msgid "_View"
msgstr "B_eeld"
-#: ../src/main_window.c:347
+#. Help menu
+#: ../src/main_window.c:334
+msgid "_Help"
+msgstr "_Help"
+
+#: ../src/main_window.c:365
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window.c:351 ../src/main_window.c:802
+#: ../src/main_window.c:369 ../src/main_window.c:844
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Uitpakken"
-#: ../src/main_window.c:594
+#: ../src/main_window.c:612
msgid "Open archive"
msgstr "Archief openen"
-#: ../src/main_window.c:801
+#: ../src/main_window.c:763
+msgid ""
+"Squeeze is a lightweight and flexible archive manager for the Xfce Desktop "
+"Environment"
+msgstr ""
+"Squeeze is een lightgewicht en flexibele archief beheerder voor de Xfce "
+"Bureaublad omgeving"
+
+#: ../src/main_window.c:769
+msgid "translator-credits"
+msgstr "Stephan Arts <stephan at xfce.org>"
+
+#: ../src/main_window.c:843
msgid "Which action do you want to perform on the selected file(s)?"
msgstr "Welke actie wil je uitvoeren op de geselecteerde bestand(en)?"
-#: ../src/main_window.c:802
+#: ../src/main_window.c:844
msgid "View"
msgstr "Weergeven"
-#: ../src/main_window.c:865
+#: ../src/main_window.c:907
msgid "Failed to open file"
msgstr "Kan bestand niet openen"
-#: ../src/main_window.c:866
+#: ../src/main_window.c:908
#, c-format
msgid ""
"'%s'\n"
@@ -303,25 +320,25 @@
msgid "Options:"
msgstr "Opties:"
-#: ../src/add_dialog.c:107
+#: ../src/add_dialog.c:109
msgid "Files"
msgstr "Bestanden"
-#: ../src/add_dialog.c:111
+#: ../src/add_dialog.c:113
msgid "Directories"
msgstr "Mappen"
-#: ../src/add_dialog.c:147
+#: ../src/add_dialog.c:149
msgid "Add file(s) to archive"
msgstr "Bestand(en) toevoegen aan archief"
#. Select Files Dialog
-#: ../src/add_dialog.c:183
+#: ../src/add_dialog.c:185
msgid "Select files"
msgstr "Selecteer bestanden"
#. Select Folder Dialog
-#: ../src/add_dialog.c:189
+#: ../src/add_dialog.c:191
msgid "Select folders"
msgstr "Selecteer mappen"
Modified: squeeze/trunk/src/main.c
===================================================================
--- squeeze/trunk/src/main.c 2006-12-18 19:21:39 UTC (rev 24132)
+++ squeeze/trunk/src/main.c 2006-12-18 21:08:07 UTC (rev 24133)
@@ -112,8 +112,8 @@
textdomain (GETTEXT_PACKAGE);
#endif
- //g_thread_init(NULL);
- //gdk_threads_init();
+ g_thread_init(NULL);
+ gdk_threads_init();
gdk_threads_enter();
if(!gtk_init_with_args(&argc, &argv, _("[archive name]"), entries, PACKAGE, &cli_error))
Modified: squeeze/trunk/src/main_window.c
===================================================================
--- squeeze/trunk/src/main_window.c 2006-12-18 19:21:39 UTC (rev 24132)
+++ squeeze/trunk/src/main_window.c 2006-12-18 21:08:07 UTC (rev 24133)
@@ -33,7 +33,12 @@
#include <gtk/gtk.h>
#include <libsqueeze/libsqueeze.h>
#include <libsqueeze/mime.h>
+
+#ifdef HAVE_LIBXFCE4UTIL
+#include <libxfce4util/libxfce4util.h>
+#else
#include <gettext.h>
+#endif
#include "settings.h"
#include "archive_store.h"
@@ -89,6 +94,8 @@
static void cb_sq_main_preferences(GtkWidget *widget, gpointer userdata);
+static void cb_sq_main_about(GtkWidget *widget, gpointer userdata);
+
static void
cb_sq_main_window_notebook_page_switched(SQNotebook *, GtkNotebookPage *, guint, gpointer);
static void
@@ -323,9 +330,20 @@
gtk_widget_show_all(window->menubar.menu_view);
+ /* Help menu */
+ window->menubar.menu_item_help = gtk_menu_item_new_with_mnemonic(_("_Help"));
+ window->menubar.menu_help = gtk_menu_new();
+ gtk_menu_item_set_submenu(GTK_MENU_ITEM(window->menubar.menu_item_help), window->menubar.menu_help);
+
+ window->menubar.menu_item_about = g_object_ref(gtk_image_menu_item_new_from_stock(GTK_STOCK_ABOUT, window->accel_group));
+ gtk_container_add(GTK_CONTAINER(window->menubar.menu_help), window->menubar.menu_item_about);
+
+ g_signal_connect(G_OBJECT(window->menubar.menu_item_about), "activate", G_CALLBACK(cb_sq_main_about), window);
+
gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_file);
gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_action);
gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_view);
+ gtk_menu_bar_append(GTK_MENU_BAR(window->menu_bar), window->menubar.menu_item_help);
}
toolbar = gtk_toolbar_new();
@@ -735,6 +753,30 @@
}
static void
+cb_sq_main_about(GtkWidget *widget, gpointer userdata)
+{
+ const gchar *authors[] = {"Stephan Arts <stephan at xfce.org>","Peter de Ridder <peter at xfce.org>", NULL};
+ GtkWidget *about_dialog = gtk_about_dialog_new();
+
+ gtk_about_dialog_set_name((GtkAboutDialog *)about_dialog, PACKAGE_NAME);
+ gtk_about_dialog_set_version((GtkAboutDialog *)about_dialog, PACKAGE_VERSION);
+ gtk_about_dialog_set_comments((GtkAboutDialog *)about_dialog, _("Squeeze is a lightweight and flexible archive manager for the Xfce Desktop Environment"));
+
+ gtk_about_dialog_set_logo_icon_name((GtkAboutDialog *)about_dialog, "squeeze");
+
+ gtk_about_dialog_set_authors((GtkAboutDialog *)about_dialog, authors);
+
+ gtk_about_dialog_set_translator_credits((GtkAboutDialog *)about_dialog, _("translator-credits"));
+
+ gtk_about_dialog_set_license((GtkAboutDialog *)about_dialog, xfce_get_license_text(XFCE_LICENSE_TEXT_GPL));
+
+ gtk_dialog_run(GTK_DIALOG(about_dialog));
+
+ gtk_widget_destroy(about_dialog);
+
+}
+
+static void
cb_sq_main_window_notebook_page_switched(SQNotebook *notebook, GtkNotebookPage *page, guint page_nr, gpointer data)
{
LSQArchive *lp_archive;
Modified: squeeze/trunk/src/main_window.h
===================================================================
--- squeeze/trunk/src/main_window.h 2006-12-18 19:21:39 UTC (rev 24132)
+++ squeeze/trunk/src/main_window.h 2006-12-18 21:08:07 UTC (rev 24133)
@@ -104,7 +104,7 @@
GtkWidget *menu_item_help;
GtkWidget *menu_help;
/* contents of 'help' menu */
- GtkWidget *menu_item_about;
+ GtkWidget *menu_item_about;
} menubar;
struct {
More information about the Xfce4-commits
mailing list