Author: stephan
Date: 2006-11-23 08:14:13 +0000 (Thu, 23 Nov 2006)
New Revision: 23936
Modified:
xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
xarchiver/branches/xarchiver-psybsd/po/nl.po
xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot
xarchiver/branches/xarchiver-psybsd/src/Makefile.am
xarchiver/branches/xarchiver-psybsd/src/notebook.c
Log:
Fixed strings once more (they were too long)
Fixed segfaults
Made libxarchiver libtool-library.
Modified: xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
2006-11-23 06:27:24 UTC (rev 23935)
+++ xarchiver/branches/xarchiver-psybsd/libxarchiver/archive-support-zip.c
2006-11-23 08:14:13 UTC (rev 23936)
@@ -142,7 +142,7 @@
g_object_class_install_property(object_class,
LXA_ARCHIVE_SUPPORT_ZIP_EXTRACT_OVERWRITE, pspec);
pspec = g_param_spec_boolean("view-compressed-size",
- _("Compressed Filesize"),
+ _("Compressed Size"),
_("View compressed filesize"),
FALSE,
G_PARAM_READWRITE);
@@ -169,8 +169,8 @@
G_PARAM_READWRITE);
g_object_class_install_property(object_class,
LXA_ARCHIVE_SUPPORT_ZIP_VIEW_RATIO, pspec);
- pspec = g_param_spec_boolean("view-compressed-size",
- _("Filesize"),
+ pspec = g_param_spec_boolean("view-uncompressed-size",
+ _("Size"),
_("View filesize"),
FALSE,
G_PARAM_READWRITE);
@@ -315,7 +315,7 @@
{
i = LXA_ARCHIVE_PROP_USER;
if(LXA_ARCHIVE_SUPPORT_ZIP(archive->support)->_view_length) {
- lxa_archive_set_property_type(archive, i,
G_TYPE_UINT64, _("Filesize"));
+ lxa_archive_set_property_type(archive, i,
G_TYPE_UINT64, _("Size"));
i++;
}
if(LXA_ARCHIVE_SUPPORT_ZIP(archive->support)->_view_method) {
@@ -323,7 +323,7 @@
i++;
}
if(LXA_ARCHIVE_SUPPORT_ZIP(archive->support)->_view_size) {
- lxa_archive_set_property_type(archive, i,
G_TYPE_UINT64, _("Compressed Filesize"));
+ lxa_archive_set_property_type(archive, i,
G_TYPE_UINT64, _("Compressed Size"));
i++;
}
if(LXA_ARCHIVE_SUPPORT_ZIP(archive->support)->_view_ratio) {
Modified: xarchiver/branches/xarchiver-psybsd/po/nl.po
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-11-23 06:27:24 UTC
(rev 23935)
+++ xarchiver/branches/xarchiver-psybsd/po/nl.po 2006-11-23 08:14:13 UTC
(rev 23936)
@@ -7,7 +7,7 @@
msgstr ""
"Project-Id-Version: xarchiver 0.3.9psybsd\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-22 08:52+0100\n"
+"POT-Creation-Date: 2006-11-23 08:47+0100\n"
"PO-Revision-Date: 2006-07-20 16:36+0200\n"
"Last-Translator: Stephan Arts <[EMAIL PROTECTED]>\n"
"Language-Team: Dutch <[EMAIL PROTECTED]>\n"
@@ -25,12 +25,12 @@
msgstr "Mime type"
#: ../libxarchiver/archive-support-gnu-tar.c:155
-#: ../libxarchiver/archive-support-zip.c:137
+#: ../libxarchiver/archive-support-zip.c:138
msgid "Overwrite existing files"
msgstr "Bestaande bestanden overschrijven"
#: ../libxarchiver/archive-support-gnu-tar.c:156
-#: ../libxarchiver/archive-support-zip.c:138
+#: ../libxarchiver/archive-support-zip.c:139
msgid "Overwrite existing files on extraction"
msgstr "Bestaande bestanden overschrijven tijdens uitpakken"
@@ -60,13 +60,11 @@
#: ../libxarchiver/archive-support-gnu-tar.c:192
#: ../libxarchiver/archive-support-gnu-tar.c:478
-#: ../libxarchiver/archive-support-zip.c:172
-#: ../libxarchiver/archive-support-zip.c:317
msgid "Filesize"
msgstr "Bestandsgrootte"
#: ../libxarchiver/archive-support-gnu-tar.c:193
-#: ../libxarchiver/archive-support-zip.c:173
+#: ../libxarchiver/archive-support-zip.c:174
msgid "View filesize"
msgstr "Bestandsgrootte weergeven"
@@ -90,25 +88,25 @@
#: ../libxarchiver/archive-support-gnu-tar.c:213
#: ../libxarchiver/archive-support-gnu-tar.c:482
-#: ../libxarchiver/archive-support-zip.c:158
-#: ../libxarchiver/archive-support-zip.c:333
+#: ../libxarchiver/archive-support-zip.c:159
+#: ../libxarchiver/archive-support-zip.c:334
msgid "Date"
msgstr "Datum"
#: ../libxarchiver/archive-support-gnu-tar.c:214
-#: ../libxarchiver/archive-support-zip.c:159
+#: ../libxarchiver/archive-support-zip.c:160
msgid "View date"
msgstr "Datum tonen"
#: ../libxarchiver/archive-support-gnu-tar.c:220
#: ../libxarchiver/archive-support-gnu-tar.c:486
-#: ../libxarchiver/archive-support-zip.c:151
-#: ../libxarchiver/archive-support-zip.c:337
+#: ../libxarchiver/archive-support-zip.c:152
+#: ../libxarchiver/archive-support-zip.c:338
msgid "Time"
msgstr "Tijd"
#: ../libxarchiver/archive-support-gnu-tar.c:221
-#: ../libxarchiver/archive-support-zip.c:152
+#: ../libxarchiver/archive-support-zip.c:153
msgid "View time"
msgstr "Tijd tonen"
@@ -125,44 +123,49 @@
"Test de archief-integriteit\n"
"Test de integriteit van het archief"
-#: ../libxarchiver/archive-support-zip.c:130
#: ../libxarchiver/archive-support-zip.c:131
+#: ../libxarchiver/archive-support-zip.c:132
msgid "Password"
msgstr "Wachtwoord"
-#: ../libxarchiver/archive-support-zip.c:144
-#: ../libxarchiver/archive-support-zip.c:325
-msgid "Compressed Filesize"
-msgstr "Gecomprimeerde Bestandsgrootte"
-
#: ../libxarchiver/archive-support-zip.c:145
+#: ../libxarchiver/archive-support-zip.c:326
+msgid "Compressed Size"
+msgstr "Gecomprimeerde Grootte"
+
+#: ../libxarchiver/archive-support-zip.c:146
msgid "View compressed filesize"
msgstr "Toon gecomprimeerde bestandsgrootte"
-#: ../libxarchiver/archive-support-zip.c:165
-#: ../libxarchiver/archive-support-zip.c:329
+#: ../libxarchiver/archive-support-zip.c:166
+#: ../libxarchiver/archive-support-zip.c:330
msgid "Ratio"
msgstr "Verhouding"
-#: ../libxarchiver/archive-support-zip.c:166
+#: ../libxarchiver/archive-support-zip.c:167
msgid "View ratio"
msgstr "Verhouding tonen"
-#: ../libxarchiver/archive-support-zip.c:179
-#: ../libxarchiver/archive-support-zip.c:321
+#: ../libxarchiver/archive-support-zip.c:173
+#: ../libxarchiver/archive-support-zip.c:318
+msgid "Size"
+msgstr "Grootte"
+
+#: ../libxarchiver/archive-support-zip.c:180
+#: ../libxarchiver/archive-support-zip.c:322
msgid "Method"
msgstr "Methode"
-#: ../libxarchiver/archive-support-zip.c:180
+#: ../libxarchiver/archive-support-zip.c:181
msgid "View method"
msgstr "Methode tonen"
-#: ../libxarchiver/archive-support-zip.c:186
-#: ../libxarchiver/archive-support-zip.c:341
+#: ../libxarchiver/archive-support-zip.c:187
+#: ../libxarchiver/archive-support-zip.c:342
msgid "Checksum"
msgstr "Checksom"
-#: ../libxarchiver/archive-support-zip.c:187
+#: ../libxarchiver/archive-support-zip.c:188
msgid "View Checksum"
msgstr "Toon Checksom"
@@ -197,70 +200,54 @@
"opties.\n"
#. File menu
-#: ../src/main_window.c:242
+#: ../src/main_window.c:247
msgid "_File"
msgstr "_Bestand"
#. Action menu: ref all the childs
-#: ../src/main_window.c:273
+#: ../src/main_window.c:278
msgid "_Action"
msgstr "_Actie"
-#: ../src/main_window.c:278
+#: ../src/main_window.c:283
msgid "_Add"
msgstr "_Toevoegen"
-#: ../src/main_window.c:284
+#: ../src/main_window.c:289
msgid "_Extract"
msgstr "_Uitpakken"
#. View menu
-#: ../src/main_window.c:298
+#: ../src/main_window.c:303
msgid "_View"
msgstr "B_eeld"
-#: ../src/main_window.c:302
-msgid "_Location Selector"
-msgstr "_Locatie Selecteerder"
-
-#: ../src/main_window.c:307
-msgid "Internal style"
-msgstr "Interne stijl"
-
-#: ../src/main_window.c:311
-msgid "Toolbar style"
-msgstr "Toolbar stijl"
-
-#: ../src/main_window.c:316
-msgid "Pathbar style"
-msgstr "Padbar stijl"
-
-#: ../src/main_window.c:343
+#: ../src/main_window.c:338
msgid "Add"
msgstr "Toevoegen"
-#: ../src/main_window.c:347 ../src/main_window.c:780
+#: ../src/main_window.c:342 ../src/main_window.c:779
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr "Uitpakken"
-#: ../src/main_window.c:586
+#: ../src/main_window.c:585
msgid "Open archive"
msgstr "Archief openen"
-#: ../src/main_window.c:779
+#: ../src/main_window.c:778
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:780
+#: ../src/main_window.c:779
msgid "View"
msgstr "Weergeven"
-#: ../src/main_window.c:843
+#: ../src/main_window.c:842
msgid "Failed to open file"
msgstr "Het openen van een bestand is mislukt"
-#: ../src/main_window.c:844
+#: ../src/main_window.c:843
#, c-format
msgid ""
"'%s'\n"
Modified: xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot
===================================================================
--- xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot 2006-11-23
06:27:24 UTC (rev 23935)
+++ xarchiver/branches/xarchiver-psybsd/po/xarchiver.pot 2006-11-23
08:14:13 UTC (rev 23936)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: [EMAIL PROTECTED]"
-"POT-Creation-Date: 2006-11-17 20:52+0100\n"
+"POT-Creation-Date: 2006-11-23 08:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
@@ -25,20 +25,22 @@
msgstr ""
#: ../libxarchiver/archive-support-gnu-tar.c:155
-#: ../libxarchiver/archive-support-zip.c:118
+#: ../libxarchiver/archive-support-zip.c:138
msgid "Overwrite existing files"
msgstr ""
#: ../libxarchiver/archive-support-gnu-tar.c:156
-#: ../libxarchiver/archive-support-zip.c:119
+#: ../libxarchiver/archive-support-zip.c:139
msgid "Overwrite existing files on extraction"
msgstr ""
#: ../libxarchiver/archive-support-gnu-tar.c:162
+#: ../libxarchiver/archive-support-gnu-tar.c:163
msgid "Touch files"
msgstr ""
#: ../libxarchiver/archive-support-gnu-tar.c:169
+#: ../libxarchiver/archive-support-gnu-tar.c:170
msgid "Strip directories"
msgstr ""
@@ -51,6 +53,7 @@
msgstr ""
#: ../libxarchiver/archive-support-gnu-tar.c:185
+#: ../libxarchiver/archive-support-gnu-tar.c:186
msgid "Override permissions"
msgstr ""
@@ -60,6 +63,7 @@
msgstr ""
#: ../libxarchiver/archive-support-gnu-tar.c:193
+#: ../libxarchiver/archive-support-zip.c:174
msgid "View filesize"
msgstr ""
@@ -68,69 +72,121 @@
msgid "Permissions"
msgstr ""
+#: ../libxarchiver/archive-support-gnu-tar.c:200
+msgid "View permissions"
+msgstr ""
+
#: ../libxarchiver/archive-support-gnu-tar.c:206
#: ../libxarchiver/archive-support-gnu-tar.c:474
msgid "Owner/Group"
msgstr ""
+#: ../libxarchiver/archive-support-gnu-tar.c:207
+msgid "View owner/group"
+msgstr ""
+
#: ../libxarchiver/archive-support-gnu-tar.c:213
#: ../libxarchiver/archive-support-gnu-tar.c:482
-#: ../libxarchiver/archive-support-zip.c:313
+#: ../libxarchiver/archive-support-zip.c:159
+#: ../libxarchiver/archive-support-zip.c:334
msgid "Date"
msgstr ""
+#: ../libxarchiver/archive-support-gnu-tar.c:214
+#: ../libxarchiver/archive-support-zip.c:160
+msgid "View date"
+msgstr ""
+
#: ../libxarchiver/archive-support-gnu-tar.c:220
#: ../libxarchiver/archive-support-gnu-tar.c:486
-#: ../libxarchiver/archive-support-zip.c:317
+#: ../libxarchiver/archive-support-zip.c:152
+#: ../libxarchiver/archive-support-zip.c:338
msgid "Time"
msgstr ""
+#: ../libxarchiver/archive-support-gnu-tar.c:221
+#: ../libxarchiver/archive-support-zip.c:153
+msgid "View time"
+msgstr ""
+
#: ../libxarchiver/archive-support-zip.c:111
-#: ../libxarchiver/archive-support-zip.c:112
+msgid "Test"
+msgstr ""
+
+#. TRANSATORS: first line is short comment, after newline is long comment
+#: ../libxarchiver/archive-support-zip.c:113
+msgid ""
+"Test archive integrity\n"
+"Test the integrity of the archive"
+msgstr ""
+
+#: ../libxarchiver/archive-support-zip.c:131
+#: ../libxarchiver/archive-support-zip.c:132
msgid "Password"
msgstr ""
-#: ../libxarchiver/archive-support-zip.c:297
-msgid "Length"
+#: ../libxarchiver/archive-support-zip.c:145
+#: ../libxarchiver/archive-support-zip.c:326
+msgid "Compressed Size"
msgstr ""
-#: ../libxarchiver/archive-support-zip.c:301
-msgid "Method"
+#: ../libxarchiver/archive-support-zip.c:146
+msgid "View compressed filesize"
msgstr ""
-#: ../libxarchiver/archive-support-zip.c:305
+#: ../libxarchiver/archive-support-zip.c:166
+#: ../libxarchiver/archive-support-zip.c:330
+msgid "Ratio"
+msgstr ""
+
+#: ../libxarchiver/archive-support-zip.c:167
+msgid "View ratio"
+msgstr ""
+
+#: ../libxarchiver/archive-support-zip.c:173
+#: ../libxarchiver/archive-support-zip.c:318
msgid "Size"
msgstr ""
-#: ../libxarchiver/archive-support-zip.c:309
-msgid "Ratio"
+#: ../libxarchiver/archive-support-zip.c:180
+#: ../libxarchiver/archive-support-zip.c:322
+msgid "Method"
msgstr ""
-#: ../libxarchiver/archive-support-zip.c:321
-msgid "CRC-32"
+#: ../libxarchiver/archive-support-zip.c:181
+msgid "View method"
msgstr ""
-#: ../src/main.c:51
+#: ../libxarchiver/archive-support-zip.c:187
+#: ../libxarchiver/archive-support-zip.c:342
+msgid "Checksum"
+msgstr ""
+
+#: ../libxarchiver/archive-support-zip.c:188
+msgid "View Checksum"
+msgstr ""
+
+#: ../src/main.c:53
msgid "[destination path]"
msgstr ""
-#: ../src/main.c:59
+#: ../src/main.c:61
msgid "[archive path] [file1] [file2] ... [fileN]"
msgstr ""
-#: ../src/main.c:63
+#: ../src/main.c:65
msgid "[file1] [file2] ... [fileN]"
msgstr ""
-#: ../src/main.c:66
+#: ../src/main.c:68
msgid "Version information"
msgstr ""
-#: ../src/main.c:117
+#: ../src/main.c:120
msgid "[archive name]"
msgstr ""
-#: ../src/main.c:121
+#: ../src/main.c:124
#, c-format
msgid ""
"%s: %s\n"
@@ -138,70 +194,54 @@
msgstr ""
#. File menu
-#: ../src/main_window.c:188
+#: ../src/main_window.c:247
msgid "_File"
msgstr ""
-#. Action menu
-#: ../src/main_window.c:219
+#. Action menu: ref all the childs
+#: ../src/main_window.c:278
msgid "_Action"
msgstr ""
-#: ../src/main_window.c:224
+#: ../src/main_window.c:283
msgid "_Add"
msgstr ""
-#: ../src/main_window.c:230
+#: ../src/main_window.c:289
msgid "_Extract"
msgstr ""
#. View menu
-#: ../src/main_window.c:244
+#: ../src/main_window.c:303
msgid "_View"
msgstr ""
-#: ../src/main_window.c:248
-msgid "_Location Selector"
-msgstr ""
-
-#: ../src/main_window.c:253
-msgid "Internal style"
-msgstr ""
-
-#: ../src/main_window.c:257
-msgid "Toolbar style"
-msgstr ""
-
-#: ../src/main_window.c:261
-msgid "Pathbar style"
-msgstr ""
-
-#: ../src/main_window.c:287
+#: ../src/main_window.c:338
msgid "Add"
msgstr ""
-#: ../src/main_window.c:291 ../src/main_window.c:672
+#: ../src/main_window.c:342 ../src/main_window.c:779
#: ../src/extract_dialog.c:102
msgid "Extract"
msgstr ""
-#: ../src/main_window.c:489
+#: ../src/main_window.c:585
msgid "Open archive"
msgstr ""
-#: ../src/main_window.c:671
+#: ../src/main_window.c:778
msgid "Which action do you want to perform on the selected file(s)?"
msgstr ""
-#: ../src/main_window.c:672
+#: ../src/main_window.c:779
msgid "View"
msgstr ""
-#: ../src/main_window.c:735
+#: ../src/main_window.c:842
msgid "Failed to open file"
msgstr ""
-#: ../src/main_window.c:736
+#: ../src/main_window.c:843
#, c-format
msgid ""
"'%s'\n"
@@ -212,15 +252,23 @@
msgid "Create new archive"
msgstr ""
-#: ../src/add_dialog.c:67
+#: ../src/add_dialog.c:69
msgid "Files and directories to add"
msgstr ""
-#: ../src/add_dialog.c:68
+#: ../src/add_dialog.c:70
msgid "Options:"
msgstr ""
-#: ../src/add_dialog.c:97
+#: ../src/add_dialog.c:101
+msgid "Files"
+msgstr ""
+
+#: ../src/add_dialog.c:105
+msgid "Directories"
+msgstr ""
+
+#: ../src/add_dialog.c:138
msgid "Add file(s) to archive"
msgstr ""
@@ -243,3 +291,11 @@
#: ../src/extract_dialog.c:115
msgid "Extract archive"
msgstr ""
+
+#: ../xarchiver.desktop.in.h:1
+msgid "A GTK+2 archive manager"
+msgstr ""
+
+#: ../xarchiver.desktop.in.h:2
+msgid "Archive manager"
+msgstr ""
Modified: xarchiver/branches/xarchiver-psybsd/src/Makefile.am
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/Makefile.am 2006-11-23 06:27:24 UTC
(rev 23935)
+++ xarchiver/branches/xarchiver-psybsd/src/Makefile.am 2006-11-23 08:14:13 UTC
(rev 23936)
@@ -39,7 +39,7 @@
-DLOCALEDIR=\"$(localedir)\"
xarchiver_LDADD = \
- $(top_srcdir)/libxarchiver/libxarchiver.a \
+ $(top_srcdir)/libxarchiver/libxarchiver-1.la \
@GTK_LIBS@ \
@GLIB_LIBS@ \
@THUNAR_VFS_LIBS@
Modified: xarchiver/branches/xarchiver-psybsd/src/notebook.c
===================================================================
--- xarchiver/branches/xarchiver-psybsd/src/notebook.c 2006-11-23 06:27:24 UTC
(rev 23935)
+++ xarchiver/branches/xarchiver-psybsd/src/notebook.c 2006-11-23 08:14:13 UTC
(rev 23936)
@@ -423,7 +423,10 @@
GtkWidget *scrolledwindow =
gtk_notebook_get_nth_page(GTK_NOTEBOOK(notebook), page_nr);
GtkWidget *treeview = gtk_bin_get_child(GTK_BIN(scrolledwindow));
GtkTreeModel *archive_store =
gtk_tree_view_get_model(GTK_TREE_VIEW(treeview));
- xa_navigation_bar_set_store(notebook->navigation_bar,
XA_ARCHIVE_STORE(archive_store));
+ if(notebook->navigation_bar)
+ xa_navigation_bar_set_store(notebook->navigation_bar,
XA_ARCHIVE_STORE(archive_store));
+ if(archive_store)
+ g_object_set(G_OBJECT(archive_store), "show_up_dir",
notebook->props._up_dir, NULL);
}
static void
_______________________________________________
Xfce4-commits mailing list
[email protected]
http://foo-projects.org/mailman/listinfo/xfce4-commits
