[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r756 - Extractor-docs/WWW GNUnet/src/applications/fs/module
|
From: |
grothoff |
|
Subject: |
[GNUnet-SVN] r756 - Extractor-docs/WWW GNUnet/src/applications/fs/module GNUnet/src/conf GNUnet/src/util doodle-docs/WWW i18nHTML/src i18nHTML-docs/WWW |
|
Date: |
Sat, 7 May 2005 03:24:08 -0700 (PDT) |
Author: grothoff
Date: 2005-05-07 03:23:51 -0700 (Sat, 07 May 2005)
New Revision: 756
Modified:
Extractor-docs/WWW/commitTranslation.php
Extractor-docs/WWW/index.php
GNUnet/src/applications/fs/module/fs.c
GNUnet/src/conf/Makefile.am
GNUnet/src/conf/gconf.c
GNUnet/src/conf/gnunet-setup.c
GNUnet/src/util/initialize.c
doodle-docs/WWW/commitTranslation.php
i18nHTML-docs/WWW/commitTranslation.php
i18nHTML/src/commitTranslation.php
Log:
fix
Modified: Extractor-docs/WWW/commitTranslation.php
===================================================================
--- Extractor-docs/WWW/commitTranslation.php 2005-05-07 10:21:37 UTC (rev
755)
+++ Extractor-docs/WWW/commitTranslation.php 2005-05-07 10:23:51 UTC (rev
756)
@@ -44,7 +44,7 @@
TITLE("Translation exists.");
echo "</head><body>";
W("Translation '%s' of sentence '%s' exists.",
- fix($translation), $text);
+ ARRAY(fix($translation), $text));
extlink($back, "Back...");
generateFooter();
echo "</body></html>";
@@ -78,4 +78,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: Extractor-docs/WWW/index.php
===================================================================
--- Extractor-docs/WWW/index.php 2005-05-07 10:21:37 UTC (rev 755)
+++ Extractor-docs/WWW/index.php 2005-05-07 10:23:51 UTC (rev 756)
@@ -16,8 +16,8 @@
W("It is designed to use helper-libraries to perform the actual extraction,
and to be trivially extendable by linking against external extractors for
additional file types.");
W("libextractor is part of the %s.",
extlink_("http://www.gnu.org/";, "GNU project"));
-//W("Our official GNU website can be found at %s.",
-//
extlink_("http://www.gnu.org/software/libextractor/","http://www.gnu.org/software/libextractor/";));
+W("Our official GNU website can be found at %s.",
+
extlink_("http://www.gnu.org/software/libextractor/","http://www.gnu.org/software/libextractor/";));
W("libextractor can be downloaded from this site or the %s.",
extlink_("http://www.gnu.org/prep/ftp.html","GNU mirrors"));
@@ -37,6 +37,8 @@
H2("Recent News");
P();
echo "<dl>";
+DTDD("Fri May 6 13:58:52 CET 2005 | libextractor v0.5.0 released.",
+ "This release adds support for Python.");
DTDD("Thu Feb 24 01:23:31 EST 2005 | libextractor v0.4.2 released.",
"This release fixes some bugs in the ID3, PDF, PNG and REAL extractors.
The REAL extractor now also handles the new Helix formats. libextractor can
now also be used to extract thumbnails from images (using ImageMagick).");
DTDD("Wed Jan 26 19:51:44 EST 2005 | libextractor v0.4.1 released.",
Modified: GNUnet/src/applications/fs/module/fs.c
===================================================================
--- GNUnet/src/applications/fs/module/fs.c 2005-05-07 10:21:37 UTC (rev
755)
+++ GNUnet/src/applications/fs/module/fs.c 2005-05-07 10:23:51 UTC (rev
756)
@@ -1,4 +1,4 @@
-/*
+1/*
This file is part of GNUnet.
(C) 2001, 2002, 2003, 2004, 2005 Christian Grothoff (and other
contributing authors)
Modified: GNUnet/src/conf/Makefile.am
===================================================================
--- GNUnet/src/conf/Makefile.am 2005-05-07 10:21:37 UTC (rev 755)
+++ GNUnet/src/conf/Makefile.am 2005-05-07 10:23:51 UTC (rev 756)
@@ -5,6 +5,8 @@
# GNU Gettext support
LIBS = @LIBINTL@ @LIBS@
+DEFS = -DDATADIR=\"$(pkgdatadir)\" @DEFS@
+
if MINGW
WINTOOL = gnunet-win-tool
endif
Modified: GNUnet/src/conf/gconf.c
===================================================================
--- GNUnet/src/conf/gconf.c 2005-05-07 10:21:37 UTC (rev 755)
+++ GNUnet/src/conf/gconf.c 2005-05-07 10:23:51 UTC (rev 756)
@@ -1692,7 +1692,8 @@
int gconf_main(int ac, char *av[])
{
- const char *name;
+ const char * LANG;
+ char * configFile;
#ifndef LKC_DIRECT_LINK
kconfig_load();
@@ -1712,6 +1713,7 @@
init_right_tree();
/* Conf stuffs */
+
if (ac > 1 && av[1][0] == '-') {
switch (av[1][1]) {
case 'a':
@@ -1722,11 +1724,24 @@
printf("%s <config>\n", av[0]);
exit(0);
}
- name = av[2];
- } else
- name = av[1];
+ }
- conf_parse(name);
+ LANG = getenv("LANG");
+ if (LANG == NULL)
+ LANG = "en";
+ if (strncmp(LANG, "en") == 2)
+ LANG = NULL;
+ configFile = MALLOC(strlen(DATADIR"/config.in") + 4);
+ strcpy(configFile,
+
DATADIR"/config.in");
+ if (LANG != NULL) {
+ strcat(configFile, ".");
+ strncat(configFile,
+
LANG,
+
2);
+ }
+ conf_parse(configFile);
+ FREE(configFile);
fixup_rootmenu(&rootmenu);
conf_read(NULL);
Modified: GNUnet/src/conf/gnunet-setup.c
===================================================================
--- GNUnet/src/conf/gnunet-setup.c 2005-05-07 10:21:37 UTC (rev 755)
+++ GNUnet/src/conf/gnunet-setup.c 2005-05-07 10:23:51 UTC (rev 756)
@@ -29,34 +29,32 @@
#include "platform.h"
static void help() {
- puts("USAGE: gnunet-setup MODULE DEFFILE\n\n"
+ puts(_("USAGE: gnunet-setup MODULE\n\n"
"MODULE\n"
" config\t\ttext-based configuration\n"
" menuconfig\ttext-based menu\n"
" xconfig\tX configuration\n"
" gconfig\tGTK configuration\n\n"
- " wizard-gtk\tBasic GTK configuration\n\n"
- "DEFFILE\n"
- " File which contains the configuration items\n");
+ "
wizard-gtk\tBasic GTK configuration\n\n"));
}
#if HAVE_CURSES
-extern int mconf_main(int ac, char **av);
+int mconf_main(int ac, char **av);
#endif
#if HAVE_GTK
int gconf_main(int ac, char *av[]);
#endif
-extern int conf_main(int ac, char **av);
+int conf_main(int ac, char **av);
#ifdef MINGW
-extern void InitWinEnv();
-extern void ShutdownWinEnv();
+void InitWinEnv();
+void ShutdownWinEnv();
#endif
int main(int argc,
char *argv[]) {
- if (argc < 3) {
+ if (argc < 2) {
help();
return 0;
}
Modified: GNUnet/src/util/initialize.c
===================================================================
--- GNUnet/src/util/initialize.c 2005-05-07 10:21:37 UTC (rev 755)
+++ GNUnet/src/util/initialize.c 2005-05-07 10:23:51 UTC (rev 756)
@@ -107,12 +107,11 @@
/**
* Get location of gettext catalogs
*/
-void getLocaleDir(char *dir)
-{
+void getLocaleDir(char *dir) {
#ifdef WINDOWS
- plibc_conv_to_win_path("/share/locale/", dir);
+ plibc_conv_to_win_path("/share/locale/", dir);
#else
- strcpy(dir, LOCALEDIR);
+ strcpy(dir, LOCALEDIR);
#endif
}
Modified: doodle-docs/WWW/commitTranslation.php
===================================================================
--- doodle-docs/WWW/commitTranslation.php 2005-05-07 10:21:37 UTC (rev
755)
+++ doodle-docs/WWW/commitTranslation.php 2005-05-07 10:23:51 UTC (rev
756)
@@ -44,7 +44,7 @@
TITLE("Translation exists.");
echo "</head><body>";
W("Translation '%s' of sentence '%s' exists.",
- fix($translation), $text);
+ ARRAY(fix($translation), $text));
extlink($back, "Back...");
generateFooter();
echo "</body></html>";
@@ -78,4 +78,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: i18nHTML/src/commitTranslation.php
===================================================================
--- i18nHTML/src/commitTranslation.php 2005-05-07 10:21:37 UTC (rev 755)
+++ i18nHTML/src/commitTranslation.php 2005-05-07 10:23:51 UTC (rev 756)
@@ -44,7 +44,7 @@
TITLE("Translation exists.");
echo "</head><body>";
W("Translation '%s' of sentence '%s' exists.",
- fix($translation), $text);
+ ARRAY(fix($translation), $text));
extlink($back, "Back...");
generateFooter();
echo "</body></html>";
@@ -78,4 +78,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
Modified: i18nHTML-docs/WWW/commitTranslation.php
===================================================================
--- i18nHTML-docs/WWW/commitTranslation.php 2005-05-07 10:21:37 UTC (rev
755)
+++ i18nHTML-docs/WWW/commitTranslation.php 2005-05-07 10:23:51 UTC (rev
756)
@@ -44,7 +44,7 @@
TITLE("Translation exists.");
echo "</head><body>";
W("Translation '%s' of sentence '%s' exists.",
- fix($translation), $text);
+ ARRAY(fix($translation), $text));
extlink($back, "Back...");
generateFooter();
echo "</body></html>";
@@ -78,4 +78,4 @@
}
}
}
-?>
\ No newline at end of file
+?>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r756 - Extractor-docs/WWW GNUnet/src/applications/fs/module GNUnet/src/conf GNUnet/src/util doodle-docs/WWW i18nHTML/src i18nHTML-docs/WWW,
grothoff <=