[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r24994 - in gnunet-gtk: po src/lib
|
From: |
gnunet |
|
Subject: |
[GNUnet-SVN] r24994 - in gnunet-gtk: po src/lib |
|
Date: |
Fri, 16 Nov 2012 12:44:01 +0100 |
Author: grothoff
Date: 2012-11-16 12:44:01 +0100 (Fri, 16 Nov 2012)
New Revision: 24994
Modified:
gnunet-gtk/po/da.po
gnunet-gtk/po/de.po
gnunet-gtk/po/fr.po
gnunet-gtk/po/gnunet-gtk.pot
gnunet-gtk/po/sv.po
gnunet-gtk/po/tr.po
gnunet-gtk/po/vi.po
gnunet-gtk/src/lib/os_installation.c
Log:
-more libexec fixes for OpenSUSE
Modified: gnunet-gtk/po/da.po
===================================================================
--- gnunet-gtk/po/da.po 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/da.po 2012-11-16 11:44:01 UTC (rev 24994)
@@ -15,7 +15,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk-0.8.1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: 2010-02-28 12:25+0100\n"
"Last-Translator: Joe Hansen <address@hidden>\n"
"Language-Team: Danish <address@hidden>\n"
@@ -46,42 +46,42 @@
msgid "no description supplied"
msgstr "Samling stoppede.\n"
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
#, fuzzy
msgid "_Download"
msgstr "H_ent"
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
#, fuzzy
msgid "Download _recursively"
msgstr "r_ekursivt"
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
#, fuzzy
msgid "Download _as..."
msgstr "H_ent"
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
#, fuzzy
msgid "_Abort download"
msgstr "H_ent"
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr "_Kopier URI til udklipsholderen"
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
msgid "Error!"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
#, fuzzy
msgid "no URI"
msgstr "URI"
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
#, fuzzy
msgid "_Abort publishing"
msgstr "Udgi_v"
Modified: gnunet-gtk/po/de.po
===================================================================
--- gnunet-gtk/po/de.po 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/de.po 2012-11-16 11:44:01 UTC (rev 24994)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: GNUnet 0.7.0pre0\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: 2006-03-17 21:18+0100\n"
"Last-Translator: Nils Durner <address@hidden>\n"
"Language-Team: German <address@hidden>\n"
@@ -41,43 +41,43 @@
msgid "no description supplied"
msgstr "Keine Kommandos angegeben.\n"
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
#, fuzzy
msgid "_Download"
msgstr "Downl_oad"
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
#, fuzzy
msgid "Download _recursively"
msgstr "Das GNUnet Verzeichnis rekursiv herunterladen"
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
#, fuzzy
msgid "Download _as..."
msgstr "Downl_oad"
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
#, fuzzy
msgid "_Abort download"
msgstr "Downl_oad"
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
#, fuzzy
msgid "Error!"
msgstr "Fehler"
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
#, fuzzy
msgid "no URI"
msgstr "URI"
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
#, fuzzy
msgid "_Abort publishing"
msgstr "Anwendung"
Modified: gnunet-gtk/po/fr.po
===================================================================
--- gnunet-gtk/po/fr.po 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/fr.po 2012-11-16 11:44:01 UTC (rev 24994)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk-0.8.1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: 2009-12-29 22:49+0100\n"
"Last-Translator: Milan Bouchet-Valat <address@hidden>\n"
"Language-Team: French <address@hidden>\n"
@@ -40,42 +40,42 @@
msgid "no description supplied"
msgstr "Collection arrêtée.\n"
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
#, fuzzy
msgid "_Download"
msgstr "Téléchar_ger"
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
#, fuzzy
msgid "Download _recursively"
msgstr "récursiv_ement"
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
#, fuzzy
msgid "Download _as..."
msgstr "Téléchar_ger"
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
#, fuzzy
msgid "_Abort download"
msgstr "Téléchar_ger"
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr "_Copier l'URI dans le presse-papiers"
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
msgid "Error!"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
#, fuzzy
msgid "no URI"
msgstr "URI"
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
#, fuzzy
msgid "_Abort publishing"
msgstr "Pub_lier"
Modified: gnunet-gtk/po/gnunet-gtk.pot
===================================================================
--- gnunet-gtk/po/gnunet-gtk.pot 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/gnunet-gtk.pot 2012-11-16 11:44:01 UTC (rev 24994)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk 0.9.4\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <address@hidden>\n"
"Language-Team: LANGUAGE <address@hidden>\n"
@@ -39,37 +39,37 @@
msgid "no description supplied"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
msgid "_Download"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
msgid "Download _recursively"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
msgid "Download _as..."
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
msgid "_Abort download"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
msgid "Error!"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
msgid "no URI"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
msgid "_Abort publishing"
msgstr ""
Modified: gnunet-gtk/po/sv.po
===================================================================
--- gnunet-gtk/po/sv.po 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/sv.po 2012-11-16 11:44:01 UTC (rev 24994)
@@ -8,7 +8,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk 0.7.2\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: 2007-06-24 21:24+0200\n"
"Last-Translator: Daniel Nylander <address@hidden>\n"
"Language-Team: Swedish <address@hidden>\n"
@@ -39,42 +39,42 @@
msgid "no description supplied"
msgstr "Samling stoppad.\n"
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
#, fuzzy
msgid "_Download"
msgstr "Hämta _ner"
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
#, fuzzy
msgid "Download _recursively"
msgstr "r_ekursivt"
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
#, fuzzy
msgid "Download _as..."
msgstr "Hämta _ner"
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
#, fuzzy
msgid "_Abort download"
msgstr "Hämta _ner"
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr "_Kopiera URI till urklipp"
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
msgid "Error!"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
#, fuzzy
msgid "no URI"
msgstr "URI"
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
#, fuzzy
msgid "_Abort publishing"
msgstr "Pub_licera"
Modified: gnunet-gtk/po/tr.po
===================================================================
--- gnunet-gtk/po/tr.po 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/tr.po 2012-11-16 11:44:01 UTC (rev 24994)
@@ -9,7 +9,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk 0.7.0d.tr\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: 2006-11-02 21:03+0200\n"
"Last-Translator: Nilgün Belma Bugüner <address@hidden>\n"
"Language-Team: Turkish <address@hidden>\n"
@@ -41,41 +41,41 @@
msgid "no description supplied"
msgstr "Albüm durdu.\n"
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
#, fuzzy
msgid "_Download"
msgstr "İ_ndir"
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
msgid "Download _recursively"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
#, fuzzy
msgid "Download _as..."
msgstr "İ_ndir"
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
#, fuzzy
msgid "_Abort download"
msgstr "İ_ndir"
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
msgid "Error!"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
#, fuzzy
msgid "no URI"
msgstr "Evrensel Özkaynak Betimleyici (URI)"
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
#, fuzzy
msgid "_Abort publishing"
msgstr "Yayanlanmamış dosya ismi"
Modified: gnunet-gtk/po/vi.po
===================================================================
--- gnunet-gtk/po/vi.po 2012-11-16 11:20:38 UTC (rev 24993)
+++ gnunet-gtk/po/vi.po 2012-11-16 11:44:01 UTC (rev 24994)
@@ -10,7 +10,7 @@
msgstr ""
"Project-Id-Version: gnunet-gtk 0.8.1\n"
"Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2012-11-05 13:58+0100\n"
+"POT-Creation-Date: 2012-11-05 21:41+0100\n"
"PO-Revision-Date: 2010-02-11 21:43+0930\n"
"Last-Translator: Clytie Siddall <address@hidden>\n"
"Language-Team: Vietnamese <address@hidden>\n"
@@ -43,42 +43,42 @@
msgid "no description supplied"
msgstr "Thu thập bị dừng.\n"
-#: src/fs/gnunet-fs-gtk_event-handler.c:868
+#: src/fs/gnunet-fs-gtk_event-handler.c:894
#: contrib/gnunet_fs_gtk_main_window.glade:271
#, fuzzy
msgid "_Download"
msgstr "Tải _xuống"
-#: src/fs/gnunet-fs-gtk_event-handler.c:877
+#: src/fs/gnunet-fs-gtk_event-handler.c:903
#, fuzzy
msgid "Download _recursively"
msgstr "đệ _quy"
-#: src/fs/gnunet-fs-gtk_event-handler.c:886
+#: src/fs/gnunet-fs-gtk_event-handler.c:912
#, fuzzy
msgid "Download _as..."
msgstr "Tải _xuống"
-#: src/fs/gnunet-fs-gtk_event-handler.c:898
+#: src/fs/gnunet-fs-gtk_event-handler.c:924
#, fuzzy
msgid "_Abort download"
msgstr "Tải _xuống"
-#: src/fs/gnunet-fs-gtk_event-handler.c:909
-#: src/fs/gnunet-fs-gtk_event-handler.c:3112
+#: src/fs/gnunet-fs-gtk_event-handler.c:935
+#: src/fs/gnunet-fs-gtk_event-handler.c:3138
msgid "_Copy URI to Clipboard"
msgstr "_Chép URI vào bảng nháp"
-#: src/fs/gnunet-fs-gtk_event-handler.c:1680
+#: src/fs/gnunet-fs-gtk_event-handler.c:1706
msgid "Error!"
msgstr ""
-#: src/fs/gnunet-fs-gtk_event-handler.c:1838
+#: src/fs/gnunet-fs-gtk_event-handler.c:1864
#, fuzzy
msgid "no URI"
msgstr "URI"
-#: src/fs/gnunet-fs-gtk_event-handler.c:3122
+#: src/fs/gnunet-fs-gtk_event-handler.c:3148
#, fuzzy
msgid "_Abort publishing"
msgstr "_Xuất bản"
Modified: gnunet-gtk/src/lib/os_installation.c
===================================================================
--- gnunet-gtk/src/lib/os_installation.c 2012-11-16 11:20:38 UTC (rev
24993)
+++ gnunet-gtk/src/lib/os_installation.c 2012-11-16 11:44:01 UTC (rev
24994)
@@ -522,9 +522,30 @@
break;
case GNUNET_OS_IPK_LIBDIR:
if (isbasedir)
+ {
dirname =
- DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
- DIR_SEPARATOR_STR;
+ DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
+ tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
+ sprintf (tmp, "%s%s", execpath, dirname);
+ if ( (GNUNET_YES !=
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
+ (4 == sizeof (void *)) )
+ {
+ GNUNET_free (tmp);
+ dirname =
+ DIR_SEPARATOR_STR "lib32" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
+ tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
+ sprintf (tmp, "%s%s", execpath, dirname);
+ }
+ if ( (GNUNET_YES !=
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
+ (8 == sizeof (void *)) )
+ {
+ dirname =
+ DIR_SEPARATOR_STR "lib64" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR;
+ }
+ GNUNET_free (tmp);
+ }
else
dirname = DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR;
break;
@@ -543,12 +564,36 @@
break;
case GNUNET_OS_IPK_LIBEXECDIR:
if (isbasedir)
+ {
dirname =
- DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
+ DIR_SEPARATOR_STR "lib" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
+ tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
+ sprintf (tmp, "%s%s", execpath, dirname);
+ if ( (GNUNET_YES !=
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
+ (4 == sizeof (void *)) )
+ {
+ GNUNET_free (tmp);
+ dirname =
+ DIR_SEPARATOR_STR "lib32" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR \
+ "libexec" DIR_SEPARATOR_STR;
+ tmp = GNUNET_malloc (strlen (execpath) + strlen (dirname) + 1);
+ sprintf (tmp, "%s%s", execpath, dirname);
+ }
+ if ( (GNUNET_YES !=
+ GNUNET_DISK_directory_test (tmp, GNUNET_YES)) &&
+ (8 == sizeof (void *)) )
+ {
+ dirname =
+ DIR_SEPARATOR_STR "lib64" DIR_SEPARATOR_STR "gnunet-gtk"
DIR_SEPARATOR_STR \
+ "libexec" DIR_SEPARATOR_STR;
+ }
+ GNUNET_free (tmp);
+ }
else
dirname =
- DIR_SEPARATOR_STR "gnunet" DIR_SEPARATOR_STR \
+ DIR_SEPARATOR_STR "gnunet-gtk" DIR_SEPARATOR_STR \
"libexec" DIR_SEPARATOR_STR;
break;
default:
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r24994 - in gnunet-gtk: po src/lib,
gnunet <=