[Xfce4-commits] r24088 - in squeeze/trunk: po src

Stephan Arts stephan at xfce.org
Wed Dec 13 09:01:25 CET 2006


Author: stephan
Date: 2006-12-13 08:01:24 +0000 (Wed, 13 Dec 2006)
New Revision: 24088

Modified:
   squeeze/trunk/po/nl.po
   squeeze/trunk/src/add_dialog.c
   squeeze/trunk/src/extract_dialog.c
Log:
Updated Dutch translation
fixed add-dialog
changed extract-dialog (hardly fixed... have to remove extension from filename)


Modified: squeeze/trunk/po/nl.po
===================================================================
--- squeeze/trunk/po/nl.po	2006-12-12 20:07:29 UTC (rev 24087)
+++ squeeze/trunk/po/nl.po	2006-12-13 08:01:24 UTC (rev 24088)
@@ -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-11-30 16:35+0100\n"
+"POT-Creation-Date: 2006-12-12 14:01+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"
@@ -16,11 +16,11 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../libsqueeze/archive.c:423
+#: ../libsqueeze/archive.c:421
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: ../libsqueeze/archive.c:426
+#: ../libsqueeze/archive.c:424
 msgid "Mime type"
 msgstr "Mime type"
 
@@ -32,7 +32,7 @@
 #: ../libsqueeze/archive-support-gnu-tar.c:156
 #: ../libsqueeze/archive-support-zip.c:139
 msgid "Overwrite existing files on extraction"
-msgstr ""
+msgstr "Bestaande bestanden overschrijven tijdens uitpakken"
 
 #: ../libsqueeze/archive-support-gnu-tar.c:162
 #: ../libsqueeze/archive-support-gnu-tar.c:163
@@ -42,7 +42,7 @@
 #: ../libsqueeze/archive-support-gnu-tar.c:169
 #: ../libsqueeze/archive-support-gnu-tar.c:170
 msgid "Strip directories"
-msgstr ""
+msgstr "Mappen strippen"
 
 #: ../libsqueeze/archive-support-gnu-tar.c:178
 msgid "Keep newer files"
@@ -50,7 +50,7 @@
 
 #: ../libsqueeze/archive-support-gnu-tar.c:179
 msgid "Do not overwrite files newer then those in the archive"
-msgstr ""
+msgstr "Bestanden die nieuwer zijn dan die in het archief niet overschrijven"
 
 #: ../libsqueeze/archive-support-gnu-tar.c:185
 #: ../libsqueeze/archive-support-gnu-tar.c:186
@@ -121,6 +121,8 @@
 "Test archive integrity\n"
 "Test the integrity of the archive"
 msgstr ""
+"Test archief integriteir\n"
+"Test de integriteit van het archief"
 
 #: ../libsqueeze/archive-support-zip.c:131
 #: ../libsqueeze/archive-support-zip.c:132
@@ -165,30 +167,32 @@
 
 #: ../src/main.c:53
 msgid "[destination path]"
-msgstr ""
+msgstr "[bestemmings map]"
 
 #: ../src/main.c:61
 msgid "[archive path] [file1] [file2] ... [fileN]"
-msgstr ""
+msgstr "[archief pad] [bestand1] ... [bestandN]"
 
 #: ../src/main.c:65
 msgid "[file1] [file2] ... [fileN]"
-msgstr ""
+msgstr "[bestand1] [bestand2] ... [bestandN]"
 
 #: ../src/main.c:68
 msgid "Version information"
 msgstr "Versie informatie"
 
-#: ../src/main.c:120
+#: ../src/main.c:119
 msgid "[archive name]"
-msgstr ""
+msgstr "[archief naam]"
 
-#: ../src/main.c:124
+#: ../src/main.c:123
 #, c-format
 msgid ""
 "%s: %s\n"
 "Try %s --help to see a full list of available command line options.\n"
 msgstr ""
+"%s: %s\n"
+"Probeer %s --help voor een volledige lijst van mogelijke opties.\n"
 
 #: ../src/main_window.c:110
 msgid "Internal Style"
@@ -211,6 +215,8 @@
 "Style of navigation\n"
 "The style to navigate trough the archive"
 msgstr ""
+"Navigatie stijl\n"
+"De stijl om te navigeren door het archief"
 
 #. File menu
 #: ../src/main_window.c:249
@@ -282,7 +288,8 @@
 #.
 #: ../src/application.c:240
 msgid "Could not open archive, MIME-type unsupported or file did not exist"
-msgstr "Kan archief niet openen, MIME-type niet ondersteund of bestand bestaat niet"
+msgstr ""
+"Kan archief niet openen, MIME-type niet ondersteund of bestand bestaat niet"
 
 #: ../src/new_dialog.c:87
 msgid "Create new archive"
@@ -290,7 +297,7 @@
 
 #: ../src/add_dialog.c:69
 msgid "Files and directories to add"
-msgstr ""
+msgstr "Bestanden en mappen om toe te voegen"
 
 #: ../src/add_dialog.c:70
 msgid "Options:"
@@ -328,7 +335,7 @@
 msgid "Extract archive"
 msgstr "Archief uitpakken"
 
-#: ../src/tool_bar.c:174
+#: ../src/tool_bar.c:159
 msgid "Location:"
 msgstr "Locatie:"
 
@@ -340,6 +347,11 @@
 msgid "The amount of space between the path buttons"
 msgstr "De ruimte tussen de pad knoppen"
 
+#: ../src/notebook.c:314
+#, c-format
+msgid "Failed to open archive '%s'."
+msgstr "Kan archief '%s' niet openen."
+
 #: ../src/archive_store.c:242
 msgid "Show mime icons"
 msgstr "Mime iconen weergeven"

Modified: squeeze/trunk/src/add_dialog.c
===================================================================
--- squeeze/trunk/src/add_dialog.c	2006-12-12 20:07:29 UTC (rev 24087)
+++ squeeze/trunk/src/add_dialog.c	2006-12-13 08:01:24 UTC (rev 24088)
@@ -2,7 +2,8 @@
  *  Copyright (c) 2006 Stephan Arts <stephan at xfce.org>
  *
  *  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
+ *  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,
@@ -30,6 +31,11 @@
 static void
 sq_add_dialog_init(SQAddDialog *archive);
 
+static void
+cb_add_dialog_add_button_clicked(GtkButton *, gpointer );
+static void
+cb_add_dialog_remove_button_clicked(GtkButton *, gpointer );
+
 GType
 sq_add_dialog_get_type ()
 {
@@ -110,6 +116,9 @@
 	dialog->remove = gtk_button_new_from_stock(GTK_STOCK_REMOVE);
 	dialog->add    = gtk_button_new_from_stock(GTK_STOCK_ADD);
 
+	g_signal_connect(dialog->add, "clicked", (GCallback)cb_add_dialog_add_button_clicked, dialog);
+	g_signal_connect(dialog->remove, "clicked", (GCallback)cb_add_dialog_remove_button_clicked, dialog);
+
 	gtk_box_pack_end(GTK_BOX(hbox), dialog->add, FALSE, FALSE, 0);
 	gtk_box_pack_end(GTK_BOX(hbox), dialog->remove, FALSE, FALSE, 0);
 
@@ -158,3 +167,44 @@
 	gtk_widget_show_all(optionbox);
 	return (GtkWidget*)dialog;
 }
+
+static void
+cb_add_dialog_add_button_clicked(GtkButton *button, gpointer user_data)
+{
+	SQAddDialog *dialog = SQ_ADD_DIALOG(user_data);
+	GtkWidget *add_dialog = NULL;
+	gint result = 0;
+
+	if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(dialog->files_radio)))
+	{ /* Select Files Dialog */
+		add_dialog = gtk_file_chooser_dialog_new(_("Select files"), (GtkWindow *)dialog, GTK_FILE_CHOOSER_ACTION_OPEN, 
+		                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
+																						 GTK_STOCK_OPEN, GTK_RESPONSE_OK, NULL);
+	}
+	else
+	{ /* Select Folder Dialog */
+		add_dialog = gtk_file_chooser_dialog_new(_("Select folders"), (GtkWindow *)dialog, GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER,
+		                                         GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,GTK_STOCK_OPEN,GTK_RESPONSE_OK, NULL);
+	}
+
+	gtk_file_chooser_set_select_multiple((GtkFileChooser *)add_dialog, TRUE);
+	result = gtk_dialog_run((GtkDialog *)add_dialog);
+	gtk_widget_hide(add_dialog);
+
+	switch(result)
+	{
+		case GTK_RESPONSE_OK:
+			/* TODO: add filenames to list in sq_add_dialog */
+			break;
+		case GTK_RESPONSE_CANCEL:
+			/* Probably do nothing */
+			break;
+	}
+	gtk_widget_destroy(add_dialog);
+}
+
+static void
+cb_add_dialog_remove_button_clicked(GtkButton *button, gpointer user_data)
+{
+
+}

Modified: squeeze/trunk/src/extract_dialog.c
===================================================================
--- squeeze/trunk/src/extract_dialog.c	2006-12-12 20:07:29 UTC (rev 24087)
+++ squeeze/trunk/src/extract_dialog.c	2006-12-13 08:01:24 UTC (rev 24088)
@@ -112,7 +112,7 @@
 	SQExtractArchiveDialog *dialog;
 	SQWidgetFactory *factory = sq_widget_factory_new();
 
-	dialog = g_object_new(sq_extract_archive_dialog_get_type(), "title", _("Extract archive"), "action", GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, "do-overwrite-confirmation", TRUE, NULL);
+	dialog = g_object_new(sq_extract_archive_dialog_get_type(), "title", _("Extract archive"), "action", GTK_FILE_CHOOSER_ACTION_CREATE_FOLDER, "do-overwrite-confirmation", TRUE, NULL);
 /* Handle 'extract selected files' option */
 	gtk_widget_set_sensitive(dialog->sel_files_radio, sel_option);
 	gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(dialog->sel_files_radio), sel_option);
@@ -131,6 +131,8 @@
 			extract_options = extract_options->next;
 		}
 	}
+	/* TODO: drop file extention */
+	// gtk_file_chooser_set_current_name(GTK_FILE_CHOOSER(dialog), lsq_archive_get_filename(archive));
 	gtk_widget_show_all(r_vbox);
 	return GTK_WIDGET(dialog);
 }



More information about the Xfce4-commits mailing list