kai/assaultcube-
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove gettext

Browse Source 
DOCREF gettext
This commit is contained in:
ac-stef
2015-06-10 14:28:50 +02:00
parent 0b940be8a0
commit f3e72b8fb7
47 changed files with 179 additions and 2321 deletions
Download Patch File Download Diff File Expand all files Collapse all files
packages/locale/de/LC_MESSAGES/AC.mo
BIN
View File
Binary file not shown.
packages/locale/it/LC_MESSAGES/AC.mo
BIN
View File
Binary file not shown.
source/codeblocks/AssaultCube.cbp
-12
View File
@@ -288,14 +288,6 @@
<Option target="default" />
<Option target="debug" />
</Unit>
<Unit filename="../src/i18n.cpp">
<Option target="default" />
<Option target="debug" />
</Unit>
<Unit filename="../src/i18n.h">
<Option target="default" />
<Option target="debug" />
</Unit>
<Unit filename="../src/jpegenc.h">
<Option target="default" />
<Option target="debug" />
@@ -463,10 +455,6 @@
<Option target="default" />
<Option target="debug" />
</Unit>
<Unit filename="../src/sound.cpp">
<Option target="default" />
<Option target="debug" />
</Unit>
<Unit filename="../src/sound.h">
<Option target="default" />
<Option target="debug" />
source/codeblocks/AssaultCube_Linux.cbp
-9
View File
@@ -194,12 +194,6 @@
<Unit filename="../src/hudgun.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../src/i18n.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../src/i18n.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../src/jpegenc.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
@@ -308,9 +302,6 @@
<Unit filename="../src/shadow.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../src/sound.cpp">
<Option target="&lt;{~None~}&gt;" />
</Unit>
<Unit filename="../src/sound.h">
<Option target="&lt;{~None~}&gt;" />
</Unit>
source/include/libintl.h
-393
View File
@@ -1,393 +0,0 @@
/* Message catalogs for internationalization.
Copyright (C) 1995-1997, 2000-2004 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
USA. */
#ifndef _LIBINTL_H
#define _LIBINTL_H 1
#ifdef LIBINTL_STATIC
#define LIBINTL_DLL_EXPORTED
#else /* LIBINTL_STATIC */
#ifdef BUILDING_LIBINTL
#define LIBINTL_DLL_EXPORTED __declspec(dllexport)
#else
#define LIBINTL_DLL_EXPORTED __declspec(dllimport)
#endif
#endif /* LIBINTL_STATIC */
#include <locale.h>
/* The LC_MESSAGES locale category is the category used by the functions
gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
On systems that don't define it, use an arbitrary value instead.
On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
then includes <libintl.h> (i.e. this file!) and then only defines
LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
in this case. */
#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
# define LC_MESSAGES 1729
#endif
/* We define an additional symbol to signal that we use the GNU
implementation of gettext. */
#define __USE_GNU_GETTEXT 1
/* Provide information about the supported file formats. Returns the
maximum minor revision number supported for a given major revision. */
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
((major) == 0 || (major) == 1 ? 1 : -1)
/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
precedence over _conio_gettext. */
#ifdef __DJGPP__
# undef gettext
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* We redirect the functions to those prefixed with "libintl_". This is
necessary, because some systems define gettext/textdomain/... in the C
library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
If we used the unprefixed names, there would be cases where the
definition in the C library would override the one in the libintl.so
shared library. Recall that on ELF systems, the symbols are looked
up in the following order:
1. in the executable,
2. in the shared libraries specified on the link command line, in order,
3. in the dependencies of the shared libraries specified on the link
command line,
4. in the dlopen()ed shared libraries, in the order in which they were
dlopen()ed.
The definition in the C library would override the one in libintl.so if
either
* -lc is given on the link command line and -lintl isn't, or
* -lc is given on the link command line before -lintl, or
* libintl.so is a dependency of a dlopen()ed shared library but not
linked to the executable at link time.
Since Solaris gettext() behaves differently than GNU gettext(), this
would be unacceptable.
The redirection happens by default through macros in C, so that &gettext
is independent of the compilation unit, but through inline functions in
C++, in order not to interfere with the name mangling of class fields or
class methods called 'gettext'. */
/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
If he doesn't, we choose the method. A third possible method is
_INTL_REDIRECT_ASM, supported only by GCC. */
#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
# if __GNUC__ >= 2 && !defined __APPLE_CC__ && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
# define _INTL_REDIRECT_ASM
# else
# ifdef __cplusplus
# define _INTL_REDIRECT_INLINE
# else
# define _INTL_REDIRECT_MACROS
# endif
# endif
#endif
/* Auxiliary macros. */
#ifdef _INTL_REDIRECT_ASM
# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
# define _INTL_STRINGIFY(prefix) #prefix
#else
# define _INTL_ASM(cname)
#endif
/* Look up MSGID in the current default message catalog for the current
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_gettext (const char *__msgid);
static inline char *gettext (const char *__msgid)
{
return libintl_gettext (__msgid);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define gettext libintl_gettext
#endif
extern LIBINTL_DLL_EXPORTED char *gettext (const char *__msgid)
_INTL_ASM (libintl_gettext);
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current
LC_MESSAGES locale. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_dgettext (const char *__domainname, const char *__msgid);
static inline char *dgettext (const char *__domainname, const char *__msgid)
{
return libintl_dgettext (__domainname, __msgid);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dgettext libintl_dgettext
#endif
extern LIBINTL_DLL_EXPORTED char *dgettext (const char *__domainname, const char *__msgid)
_INTL_ASM (libintl_dgettext);
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_dcgettext (const char *__domainname, const char *__msgid,
int __category);
static inline char *dcgettext (const char *__domainname, const char *__msgid,
int __category)
{
return libintl_dcgettext (__domainname, __msgid, __category);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dcgettext libintl_dcgettext
#endif
extern LIBINTL_DLL_EXPORTED char *dcgettext (const char *__domainname, const char *__msgid,
int __category)
_INTL_ASM (libintl_dcgettext);
#endif
/* Similar to `gettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n);
static inline char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
{
return libintl_ngettext (__msgid1, __msgid2, __n);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define ngettext libintl_ngettext
#endif
extern LIBINTL_DLL_EXPORTED char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_ASM (libintl_ngettext);
#endif
/* Similar to `dgettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n);
static inline char *dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
{
return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dngettext libintl_dngettext
#endif
extern LIBINTL_DLL_EXPORTED char *dngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_ASM (libintl_dngettext);
#endif
/* Similar to `dcgettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category);
static inline char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
{
return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dcngettext libintl_dcngettext
#endif
extern LIBINTL_DLL_EXPORTED char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
_INTL_ASM (libintl_dcngettext);
#endif
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_textdomain (const char *__domainname);
static inline char *textdomain (const char *__domainname)
{
return libintl_textdomain (__domainname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define textdomain libintl_textdomain
#endif
extern LIBINTL_DLL_EXPORTED char *textdomain (const char *__domainname)
_INTL_ASM (libintl_textdomain);
#endif
/* Specify that the DOMAINNAME message catalog will be found
in DIRNAME rather than in the system locale data base. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_bindtextdomain (const char *__domainname,
const char *__dirname);
static inline char *bindtextdomain (const char *__domainname,
const char *__dirname)
{
return libintl_bindtextdomain (__domainname, __dirname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define bindtextdomain libintl_bindtextdomain
#endif
extern LIBINTL_DLL_EXPORTED char *bindtextdomain (const char *__domainname, const char *__dirname)
_INTL_ASM (libintl_bindtextdomain);
#endif
/* Specify the character encoding in which the messages from the
DOMAINNAME message catalog will be returned. */
#ifdef _INTL_REDIRECT_INLINE
extern LIBINTL_DLL_EXPORTED char *libintl_bind_textdomain_codeset (const char *__domainname,
const char *__codeset);
static inline char *bind_textdomain_codeset (const char *__domainname,
const char *__codeset)
{
return libintl_bind_textdomain_codeset (__domainname, __codeset);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define bind_textdomain_codeset libintl_bind_textdomain_codeset
#endif
extern LIBINTL_DLL_EXPORTED char *bind_textdomain_codeset (const char *__domainname,
const char *__codeset)
_INTL_ASM (libintl_bind_textdomain_codeset);
#endif
/* Support for format strings with positions in *printf(), following the
POSIX/XSI specification.
Note: These replacements for the *printf() functions are visible only
in source files that #include <libintl.h> or #include "gettext.h".
Packages that use *printf() in source files that don't refer to _()
or gettext() but for which the format string could be the return value
of _() or gettext() need to add this #include. Oh well. */
#if 0
#include <stdio.h>
#include <stddef.h>
/* Get va_list. */
#if __STDC__ || defined __cplusplus || defined _MSC_VER
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#undef fprintf
#define fprintf libintl_fprintf
extern LIBINTL_DLL_EXPORTED int fprintf (FILE *, const char *, ...);
#undef vfprintf
#define vfprintf libintl_vfprintf
extern LIBINTL_DLL_EXPORTED int vfprintf (FILE *, const char *, va_list);
#undef printf
#define printf libintl_printf
extern LIBINTL_DLL_EXPORTED int printf (const char *, ...);
#undef vprintf
#define vprintf libintl_vprintf
extern LIBINTL_DLL_EXPORTED int vprintf (const char *, va_list);
#undef sprintf
#define sprintf libintl_sprintf
extern LIBINTL_DLL_EXPORTED int sprintf (char *, const char *, ...);
#undef vsprintf
#define vsprintf libintl_vsprintf
extern LIBINTL_DLL_EXPORTED int vsprintf (char *, const char *, va_list);
#if 0
#undef snprintf
#define snprintf libintl_snprintf
extern LIBINTL_DLL_EXPORTED int snprintf (char *, size_t, const char *, ...);
#undef vsnprintf
#define vsnprintf libintl_vsnprintf
extern LIBINTL_DLL_EXPORTED int vsnprintf (char *, size_t, const char *, va_list);
#endif
#if 0
#undef asprintf
#define asprintf libintl_asprintf
extern LIBINTL_DLL_EXPORTED int asprintf (char **, const char *, ...);
#undef vasprintf
#define vasprintf libintl_vasprintf
extern LIBINTL_DLL_EXPORTED int vasprintf (char **, const char *, va_list);
#endif
#if 1
#undef fwprintf
#define fwprintf libintl_fwprintf
extern LIBINTL_DLL_EXPORTED int fwprintf (FILE *, const wchar_t *, ...);
#undef vfwprintf
#define vfwprintf libintl_vfwprintf
extern LIBINTL_DLL_EXPORTED int vfwprintf (FILE *, const wchar_t *, va_list);
#undef wprintf
#define wprintf libintl_wprintf
extern LIBINTL_DLL_EXPORTED int wprintf (const wchar_t *, ...);
#undef vwprintf
#define vwprintf libintl_vwprintf
extern LIBINTL_DLL_EXPORTED int vwprintf (const wchar_t *, va_list);
#undef swprintf
#define swprintf libintl_swprintf
extern LIBINTL_DLL_EXPORTED int swprintf (wchar_t *, size_t, const wchar_t *, ...);
#undef vswprintf
#define vswprintf libintl_vswprintf
extern LIBINTL_DLL_EXPORTED int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
#endif
#endif
/* Support for relocatable packages. */
/* Sets the original and the current installation prefix of the package.
Relocation simply replaces a pathname starting with the original prefix
by the corresponding pathname with the current prefix instead. Both
prefixes should be directory names without trailing slash (i.e. use ""
instead of "/"). */
#define libintl_set_relocation_prefix libintl_set_relocation_prefix
extern LIBINTL_DLL_EXPORTED void
libintl_set_relocation_prefix (const char *orig_prefix,
const char *curr_prefix);
#ifdef __cplusplus
}
#endif
#endif /* libintl.h */
source/lib/libintl.lib
BIN
View File
Binary file not shown.
source/locale/AC.pot
-465
View File
@@ -1,465 +0,0 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-09 19:21+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <[email protected]>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: client.cpp:18
msgid "operation not available in multiplayer"
msgstr ""
#: client.cpp:25
msgid "editing in multiplayer requires coopedit mode (1)"
msgstr ""
#: client.cpp:68 client.cpp:218
msgid "aborting connection attempt"
msgstr ""
#: client.cpp:83
#, c-format
msgid "%c2attempting to %sconnect to %c5%s%c4%s%s%c2"
msgstr ""
#: client.cpp:86
#, c-format
msgid "%c2could %c3not resolve%c2 server %c5%s%c2"
msgstr ""
#: client.cpp:94
#, c-format
msgid "%c2attempting to connect over %c1LAN%c2"
msgstr ""
#: client.cpp:111
#, c-format
msgid "%c2could %c3not connect%c2 to server"
msgstr ""
#: client.cpp:189
msgid "disconnected"
msgstr ""
#: client.cpp:224
msgid "not connected"
msgstr ""
#: client.cpp:227 client.cpp:551
msgid "attempting to disconnect..."
msgstr ""
#: client.cpp:523
msgid "attempting to connect..."
msgstr ""
#: client.cpp:528 client.cpp:564
#, c-format
msgid "%c3could not connect to server"
msgstr ""
#: client.cpp:541
msgid "connected to server"
msgstr ""
#: client.cpp:569
#, c-format
msgid "%c3server network error, disconnecting (%s) ..."
msgstr ""
#: client.cpp:656
#, c-format
msgid "%c3map %s is secured, you can not send, receive or overwrite it"
msgstr ""
#: client.cpp:684
#, c-format
msgid "map %s is too large to send"
msgstr ""
#: client.cpp:698
#, c-format
msgid "sending map %s to server..."
msgstr ""
#: client.cpp:703
msgid "requesting map from server..."
msgstr ""
#: client.cpp:722
msgid "getting demo..."
msgstr ""
#: client.cpp:723
#, c-format
msgid "getting demo %d..."
msgstr ""
#: client.cpp:729
msgid "listing demos..."
msgstr ""
#: clientgame.cpp:123
#, c-format
msgid "ignored players: %s"
msgstr ""
#: clientgame.cpp:124
msgid "no players ignored."
msgstr ""
#: clientgame.cpp:144
#, c-format
msgid "muted players: %s"
msgstr ""
#: clientgame.cpp:145
msgid "no players muted."
msgstr ""
#: clientgame.cpp:170
#, c-format
msgid "your name is: %s"
msgstr ""
#: clientgame.cpp:189
#, c-format
msgid "%c3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)"
msgstr ""
#: clientgame.cpp:190
msgid "you need to be dead to become spectator"
msgstr ""
#: clientgame.cpp:191
msgid "you can't change team while editing"
msgstr ""
#: clientgame.cpp:194
#, c-format
msgid "your team is: %s"
msgstr ""
#: clientgame.cpp:797
msgid "intermission:"
msgstr ""
#: clientgame.cpp:798
msgid "game has ended!"
msgstr ""
#: clientgame.cpp:806
#, c-format
msgid "time remaining: %d minutes"
msgstr ""
#: clientgame.cpp:876
#, c-format
msgid "%c3invalid ctf-flag entity (%i)"
msgstr ""
#: clientgame.cpp:947
#, c-format
msgid "game mode is \"%s\"%s"
msgstr ""
#: clientgame.cpp:1176
#, c-format
msgid "%c3invalid vote"
msgstr ""
#: clientgame.cpp:1198
#, c-format
msgid "%c3invalid reason"
msgstr ""
#: clientgame.cpp:1211
#, c-format
msgid "%c3you voted already"
msgstr ""
#: clientgame.cpp:1228
#, c-format
msgid "%s called a vote: %s"
msgstr ""
#: clientgame.cpp:1244
#, c-format
msgid "%c3could not vote: %s"
msgstr ""
#: clientgame.cpp:1255
msgid "failed"
msgstr ""
#: clientgame.cpp:1255
msgid "passed"
msgstr ""
#: clientgame.cpp:1255
#, c-format
msgid "vote %s"
msgstr ""
#: clients2c.cpp:46
#, c-format
msgid "%c3demo was recorded on map revision %d, you have map revision %d"
msgstr ""
#: clients2c.cpp:66
msgid "\"getmap\" to download the current map from the server"
msgstr ""
#: clients2c.cpp:67
#, c-format
msgid "\"getmap\" to download a %s version of the current map from the server"
msgstr ""
#: clients2c.cpp:68
msgid "different"
msgstr ""
#: clients2c.cpp:68
msgid "newer"
msgstr ""
#: clients2c.cpp:68
msgid "older"
msgstr ""
#: clients2c.cpp:336
#, c-format
msgid "%c3you are using a different game protocol (you: %d, server: %d)"
msgstr ""
#: clients2c.cpp:343
msgid "INFO: this server is password protected"
msgstr ""
#: clients2c.cpp:457 clients2c.cpp:492
#, c-format
msgid "%s is now known as %s"
msgstr ""
#: clients2c.cpp:496
#, c-format
msgid "connected: %s"
msgstr ""
#: clients2c.cpp:515
#, c-format
msgid "player %s disconnected"
msgstr ""
#: clients2c.cpp:553
msgid "map deemed unplayable - fix it before you can spawn"
msgstr ""
#: clients2c.cpp:577
msgid "new round starting... fight!"
msgstr ""
#: clients2c.cpp:831
#, c-format
msgid "%s enlarged the map to size %d"
msgstr ""
#: clients2c.cpp:831
#, c-format
msgid "%s started a new map of size %d"
msgstr ""
#: clients2c.cpp:943
msgid "the round is over! next round in 5 seconds..."
msgstr ""
#: clients2c.cpp:944
msgid "the bots have won the round!"
msgstr ""
#: clients2c.cpp:945
msgid "everyone died!"
msgstr ""
#: clients2c.cpp:946
#, c-format
msgid "team %s has won the round!"
msgstr ""
#: clients2c.cpp:947
msgid "you are the survivor!"
msgstr ""
#: clients2c.cpp:948
#, c-format
msgid "%s is the survivor!"
msgstr ""
#: clients2c.cpp:984
#, c-format
msgid "you claimed %s status"
msgstr ""
#: clients2c.cpp:985
#, c-format
msgid "%s claimed %s status"
msgstr ""
#: clients2c.cpp:997
#, c-format
msgid "you can't change to team %s"
msgstr ""
#: clients2c.cpp:1001
msgid "active"
msgstr ""
#: clients2c.cpp:1001
msgid "spectate"
msgstr ""
#: clients2c.cpp:1001
#, c-format
msgid "you can't change to %s mode"
msgstr ""
#: clients2c.cpp:1028
#, c-format
msgid "you're now in team %s"
msgstr ""
#: clients2c.cpp:1031
#, c-format
msgid "the server forced you to team %s"
msgstr ""
#: clients2c.cpp:1042
#, c-format
msgid "player %s switched to team %s"
msgstr ""
#: clients2c.cpp:1045
#, c-format
msgid "the server forced %s to team %s"
msgstr ""
#: clients2c.cpp:1046
msgid "the enemy"
msgstr ""
#: clients2c.cpp:1046
#, c-format
msgid "the server forced %s to %s team"
msgstr ""
#: clients2c.cpp:1046
msgid "your"
msgstr ""
#: clients2c.cpp:1053
#, c-format
msgid "%s changed to active play"
msgstr ""
#: clients2c.cpp:1053
msgid "you"
msgstr ""
#: clients2c.cpp:1156
msgid "no demos available"
msgstr ""
#: clients2c.cpp:1222
#, c-format
msgid "failed writing to \"%s\""
msgstr ""
#: clients2c.cpp:1225
#, c-format
msgid "received demo \"%s\""
msgstr ""
#: clients2c.cpp:1234
#, c-format
msgid "received map \"%s\" from server, reloading.."
msgstr ""
#: clients2c.cpp:1241
#, c-format
msgid "map %s is too large to receive"
msgstr ""
#: md2.h:258
#, c-format
msgid "could not load model skin for %s"
msgstr ""
#: menus.cfg:9
msgid "Multiplayer"
msgstr ""
#: menus.cfg:10
msgid "Singleplayer"
msgstr ""
#: menus.cfg:11
msgid "Settings"
msgstr ""
#: menus.cfg:12
msgid "Demo"
msgstr ""
#: menus.cfg:13
msgid "Editing"
msgstr ""
#: menus.cfg:14
msgid "Help"
msgstr ""
#: menus.cfg:15
msgid "About"
msgstr ""
#: menus.cfg:16
msgid "Quit"
msgstr ""
#: menus.cpp:1351
msgid "..restart AssaultCube for this setting to take effect"
msgstr ""
#: physics.cpp:958
#, c-format
msgid "can't find entity spawn spot! (%d, %d)"
msgstr ""
#: serverbrowser.cpp:1152
#, c-format
msgid ""
"server \"%cs%s%cr\" is in category '%cs%s%cr' because of key '%s', please "
"remove manually"
msgstr ""
#: serverbrowser.cpp:1156
#, c-format
msgid ""
"removing server \"%cs%s%cr\" from favourites category '%cs%s%cr' (rest '%s')"
msgstr ""
#: serverbrowser.cpp:1171
#, c-format
msgid "adding server \"%cs%s%cr\" to favourites category '%cs%s%cr' (new '%s')"
msgstr ""
source/locale/README.txt
-37
View File
@@ -1,37 +0,0 @@
==AC Localization==
Install gnu gettext to get the required tools for building translation files. There are UI tools to help you on this task, as example on Linux you could try gtranslator or kbabel. These tools allow you to manage the translation files without ever touching the command line.
However the following text describes the usage of the underlying tools so you get an understanding of the process.
More information can be found in the gnu gettext documentation/tutorials.
Steps:
1. Initial String Export
Run update_pot_template to extract all localizable strings from the C++ source and from cubescript. The AC.pot template will be updated. Edit AC.pot and fill out the header details, such as charset=UTF-8.
NOTE: This step will be done by a developer, so you can probably just skip this step.
2. Build language specific translation file from the template
2.a) Initial build
To create an initial translation file for your language, you need to run a command to initialize it based on the template.
Run:
msginit -l $lang -o $lang/LC_MESSAGES/AC.po -i AC.pot
Where $lang is the language token, such as "de" or "de_DE".
2.b) Subsequential update builds
Once the AC.pot template file gets updated, you can merge the new strings into your existing translation file:
Run:
msgmerge -s -U $lang/LC_MESSAGES/AC.po AC.pot
Where $lang is the language token, such as "de" or "de_DE".
3. Translation file compilation
Compile your translation file into a binary format which can then be read by AC.
source/locale/compile_mo.sh
-11
View File
@@ -1,11 +0,0 @@
#!/bin/bash
if [ $# -eq 1 ]; then
LC=$1
# "assume" LC is valid .. maybe someone "bored" wants to write some checks, but hey, this isn't a user-interface :-P
msgfmt -c -v -o $LC/LC_MESSAGES/AC.mo $LC/LC_MESSAGES/AC.po
cp -f $LC/LC_MESSAGES/AC.mo ../../packages/locale/$LC/LC_MESSAGES/AC.mo
else
echo "pass me a language-code (LC) to compile for (de, it, ...)"
#echo "you should have prepared ../../packages/locale/__LC__/LC_MESSAGES - where __LC__ is your language code!"
fi
source/locale/de/LC_MESSAGES/AC.mo
BIN
View File
Binary file not shown.
source/locale/de/LC_MESSAGES/AC.po
-484
View File
@@ -1,484 +0,0 @@
# German translations for AssaultCube package.
# Copyright (C) 2010 RabidViper Productions
# This file is distributed under the same license as the AssaultCube package.
# flowtron <[email protected]>, 2010.
#
msgid ""
msgstr ""
"Project-Id-Version: AC-1.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-10-09 19:21+0200\n"
"PO-Revision-Date: 2010-10-08 22:00+0100\n"
"Last-Translator: flowtron <[email protected]>\n"
"Language-Team: German\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: clients2c.cpp:67
#, c-format
msgid "\"getmap\" to download a %s version of the current map from the server"
msgstr "Nutze \"getmap\" um eine %s Version der Karte vom Server zu laden"
#: clients2c.cpp:66
msgid "\"getmap\" to download the current map from the server"
msgstr "Nutze \"getmap\" um die aktuelle Karte vom Server zu laden"
#: client.cpp:83
#, c-format
msgid "%c2attempting to %sconnect to %c5%s%c4%s%s%c2"
msgstr "%c2Versuche %sVerbindung zu %c5%s%c4%s%s%c2 herzustellen"
#: client.cpp:94
#, c-format
msgid "%c2attempting to connect over %c1LAN%c2"
msgstr "%c2Versuche eine %c1LAN%c2 Verbindung herzustellen"
#: client.cpp:111
#, c-format
msgid "%c2could %c3not connect%c2 to server"
msgstr "%c2Konnte %c3keine Verbindung%c2 zum Server herstellen"
# 1 2 3 4 5 6
#: client.cpp:86
#, c-format
msgid "%c2could %c3not resolve%c2 server %c5%s%c2"
msgstr "%1$c2Konnte den Server %4$c5%5$s%6$c2 %2$c3nicht%3$c2 aufloesen"
#: clientgame.cpp:189
#, c-format
msgid "%c3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)"
msgstr ""
"%c3\"%s\" ist kein gueltiger Teamname, waehle CLA, RVSF oder SPECTATOR "
"(Zuschauer)"
#: client.cpp:528 client.cpp:564
#, c-format
msgid "%c3could not connect to server"
msgstr "%c3Konnte keine Verbindung zum Server herstellen"
#: clientgame.cpp:1244
#, c-format
msgid "%c3could not vote: %s"
msgstr "%c3Konnte nicht abstimmen: %s"
#: clients2c.cpp:46
#, c-format
msgid "%c3demo was recorded on map revision %d, you have map revision %d"
msgstr "%c3Demo wurde fuer Kartenrevision %d aufgenommen, Du hast Revision %d"
#: clientgame.cpp:876
#, c-format
msgid "%c3invalid ctf-flag entity (%i)"
msgstr "%c3Ungueltiges CTF-Flaggen Objekt (%i)"
#: clientgame.cpp:1198
#, c-format
msgid "%c3invalid reason"
msgstr "%c3Ungueltige Begruendung"
#: clientgame.cpp:1176
#, c-format
msgid "%c3invalid vote"
msgstr "%c3Ungueltige Abstimmung"
#: client.cpp:656
#, c-format
msgid "%c3map %s is secured, you can not send, receive or overwrite it"
msgstr ""
"%c3Die Karte %s ist geschuetzt. Sie kann nicht gesendet, heruntergeladen "
"oder ueberschrieben werden"
#: client.cpp:569
#, c-format
msgid "%c3server network error, disconnecting (%s) ..."
msgstr "%c3Server Netzwerkfehler. Trenne Verbindung (%s) ..."
#: clients2c.cpp:336
#, c-format
msgid "%c3you are using a different game protocol (you: %d, server: %d)"
msgstr ""
"%c3Das Client- und Server-Protokoll unterscheiden sich (Client: %d, Server: %"
"d)"
#: clientgame.cpp:1211
#, c-format
msgid "%c3you voted already"
msgstr "%c3Du hast bereits abgestimmt"
#: clientgame.cpp:1228
#, c-format
msgid "%s called a vote: %s"
msgstr "%s will abstimmen: %s"
#: clients2c.cpp:1053
#, c-format
msgid "%s changed to active play"
msgstr "%s wechselte in den aktiven Modus"
#: clients2c.cpp:985
#, c-format
msgid "%s claimed %s status"
msgstr "%s ist nun %s"
#: clients2c.cpp:831
#, c-format
msgid "%s enlarged the map to size %d"
msgstr "%s vergroesserte die Karte auf %d"
#: clients2c.cpp:457 clients2c.cpp:492
#, c-format
msgid "%s is now known as %s"
msgstr "%s hat sich umbenannt in %s"
#: clients2c.cpp:948
#, c-format
msgid "%s is the survivor!"
msgstr "%s ueberlebte!"
#: clients2c.cpp:831
#, c-format
msgid "%s started a new map of size %d"
msgstr "%s hat eine neue Karte in der Groesse %d angefangen"
#: menus.cpp:1351
msgid "..restart AssaultCube for this setting to take effect"
msgstr "..Einstellung erst effektiv nach Neustart von AssaultCube"
#: menus.cfg:15
msgid "About"
msgstr "Info"
#: menus.cfg:12
msgid "Demo"
msgstr "Demo"
#: menus.cfg:13
msgid "Editing"
msgstr "Editieren"
#: menus.cfg:14
msgid "Help"
msgstr "Hilfe"
#: clients2c.cpp:343
msgid "INFO: this server is password protected"
msgstr "INFO: Dieser Server wird durch ein Passwort geschuetzt"
#: menus.cfg:9
msgid "Multiplayer"
msgstr "Mehrspieler"
#: menus.cfg:16
msgid "Quit"
msgstr "Beenden"
#: menus.cfg:11
msgid "Settings"
msgstr "Einstellungen"
#: menus.cfg:10
msgid "Singleplayer"
msgstr "Einzelspieler"
#: client.cpp:68 client.cpp:218
msgid "aborting connection attempt"
msgstr "Breche Verbindungsversuch ab"
#: clients2c.cpp:1001
msgid "active"
msgstr "aktiven"
#: serverbrowser.cpp:1171
#, c-format
msgid "adding server \"%cs%s%cr\" to favourites category '%cs%s%cr' (new '%s')"
msgstr ""
"Fuege Server \"%cs%s%cr\" zur Favoriten-Kategorie '%cs%s%cr' (Neu '%s') hinzu"
#: client.cpp:523
msgid "attempting to connect..."
msgstr "Versuche eine Verbindung aufzubauen"
#: client.cpp:227 client.cpp:551
msgid "attempting to disconnect..."
msgstr "Versuche die Verbindung zu trennen..."
#: physics.cpp:958
#, c-format
msgid "can't find entity spawn spot! (%d, %d)"
msgstr "Spawnstelle bietet keinen Platz! (%d, %d)"
#: client.cpp:541
msgid "connected to server"
msgstr "Mit Server verbunden"
#: clients2c.cpp:496
#, c-format
msgid "connected: %s"
msgstr "Verbunden: %s"
#: md2.h:258
#, c-format
msgid "could not load model skin for %s"
msgstr "Textur (skin) fuer 3D-Modell %s konnte nicht geladen werden"
#: clients2c.cpp:68
msgid "different"
msgstr "geaenderte"
#: client.cpp:189
msgid "disconnected"
msgstr "Verbindung getrennt"
#: client.cpp:25
msgid "editing in multiplayer requires coopedit mode (1)"
msgstr ""
"Editieren im Mehrspieler-Modus setzt den Coopedit-"
"Spielmodus (1) voraus"
#: clients2c.cpp:945
msgid "everyone died!"
msgstr "Keiner ueberlebte!"
#: clientgame.cpp:1255
msgid "failed"
msgstr "gescheitert"
#: clients2c.cpp:1222
#, c-format
msgid "failed writing to \"%s\""
msgstr "Fehler beim schreiben von \"%s\""
#: clientgame.cpp:798
msgid "game has ended!"
msgstr "Das Spiel ist vorbei!"
#: clientgame.cpp:947
#, c-format
msgid "game mode is \"%s\"%s"
msgstr "Spielmodus ist \"%s\"%s"
#: client.cpp:723
#, c-format
msgid "getting demo %d..."
msgstr "Fordere Demo %d an..."
#: client.cpp:722
msgid "getting demo..."
msgstr "Fordere Demo an..."
#: clientgame.cpp:123
#, c-format
msgid "ignored players: %s"
msgstr "Ignorierte Spieler: %s"
#: clientgame.cpp:797
msgid "intermission:"
msgstr "Zwischenspiel:"
#: client.cpp:729
msgid "listing demos..."
msgstr "Demoliste..."
#: clients2c.cpp:1241
#, c-format
msgid "map %s is too large to receive"
msgstr "Die Karte %s ist zu gross um empfangen zu werden"
#: client.cpp:684
#, c-format
msgid "map %s is too large to send"
msgstr "Die Karte %s ist zu gross um gesendet zu werden"
#: clients2c.cpp:553
msgid "map deemed unplayable - fix it before you can spawn"
msgstr ""
"Karte als unspielbar eingestuft - kein spielen moeglich bis dies behoben "
"wurde."
#: clientgame.cpp:144
#, c-format
msgid "muted players: %s"
msgstr "Stumme Spieler: %s"
#: clients2c.cpp:577
msgid "new round starting... fight!"
msgstr "Neue Runde beginnt.. kaempfe!"
#: clients2c.cpp:68
msgid "newer"
msgstr "neuere"
#: clients2c.cpp:1156
msgid "no demos available"
msgstr "Keine Demos verfuegbar"
#: clientgame.cpp:124
msgid "no players ignored."
msgstr "Keine Spieler werden ignoriert."
#: clientgame.cpp:145
msgid "no players muted."
msgstr "Keine Spieler stumm gestellt."
#: client.cpp:224
msgid "not connected"
msgstr "Nicht verbunden"
#: clients2c.cpp:68
msgid "older"
msgstr "aeltere"
#: client.cpp:18
msgid "operation not available in multiplayer"
msgstr "Aktion im Mehrspieler-Modus nicht verfuegbar"
#: clientgame.cpp:1255
msgid "passed"
msgstr "erfolgreich"
#: clients2c.cpp:515
#, c-format
msgid "player %s disconnected"
msgstr "Spieler %s getrennt"
#: clients2c.cpp:1042
#, c-format
msgid "player %s switched to team %s"
msgstr "Spieler %s wechselte zum Team %s"
#: clients2c.cpp:1225
#, c-format
msgid "received demo \"%s\""
msgstr "Demo \"%s\" erhalten"
#: clients2c.cpp:1234
#, c-format
msgid "received map \"%s\" from server, reloading.."
msgstr "Karte \"%s\" vom Server erhalten, lade neu.."
#: serverbrowser.cpp:1156
#, c-format
msgid ""
"removing server \"%cs%s%cr\" from favourites category '%cs%s%cr' (rest '%s')"
msgstr ""
"Entferne Server \"%cs%s%cr\" aus der Favoriten-Kategorie '%cs%s%cr' (Rest '%"
"s')"
#: client.cpp:703
msgid "requesting map from server..."
msgstr "Fordere Karte vom Server an..."
#: client.cpp:698
#, c-format
msgid "sending map %s to server..."
msgstr "Sende Karte %s an den Server..."
#: serverbrowser.cpp:1152
#, c-format
msgid ""
"server \"%cs%s%cr\" is in category '%cs%s%cr' because of key '%s', please "
"remove manually"
msgstr ""
"Server \"%cs%s%cr\" ist in Kategorie '%cs%s%cr' wegen Schluessel '%s', bitte "
"enferne diesen von Hand"
#: clients2c.cpp:1001
msgid "spectate"
msgstr "passiven"
#: clients2c.cpp:946
#, c-format
msgid "team %s has won the round!"
msgstr "Team %s hat die Runde gewonnen!"
#: clients2c.cpp:944
msgid "the bots have won the round!"
msgstr "Die Bots haben die Runde gewonnen!"
#: clients2c.cpp:1046
msgid "the enemy"
msgstr "m gegnerischen"
#: clients2c.cpp:943
msgid "the round is over! next round in 5 seconds..."
msgstr "Die Runde ist vorueber! Naechste Runde in 5 Sekunden..."
#: clients2c.cpp:1046
#, c-format
msgid "the server forced %s to %s team"
msgstr "Der Server zwang %s zu%s Team"
#: clients2c.cpp:1045
#, c-format
msgid "the server forced %s to team %s"
msgstr "Der Server zwang %s zum Team %s"
#: clients2c.cpp:1031
#, c-format
msgid "the server forced you to team %s"
msgstr "Der Server zwang Dich zum Team %s"
#: clientgame.cpp:806
#, c-format
msgid "time remaining: %d minutes"
msgstr "verbleibende Zeit: %d Minuten"
#: clientgame.cpp:1255
#, c-format
msgid "vote %s"
msgstr "Abstimmung %s"
#: clients2c.cpp:1053
msgid "you"
msgstr "Du"
#: clients2c.cpp:947
msgid "you are the survivor!"
msgstr "Du hast ueberlebt!"
#: clientgame.cpp:191
msgid "you can't change team while editing"
msgstr "Du kannst nicht das Team wechseln waehrend Du editierst"
#: clients2c.cpp:1001
#, c-format
msgid "you can't change to %s mode"
msgstr "Du kannst nicht in den %s Modus wechseln"
#: clients2c.cpp:997
#, c-format
msgid "you can't change to team %s"
msgstr "Du kannst nicht zum Team %s wechseln"
#: clients2c.cpp:984
#, c-format
msgid "you claimed %s status"
msgstr "Du bist nun %s"
#: clientgame.cpp:190
msgid "you need to be dead to become spectator"
msgstr "Du musst tot sein, um Zuschauer werden zu koennen"
#: clients2c.cpp:1028
#, c-format
msgid "you're now in team %s"
msgstr "Du bist jetzt im Team %s"
#: clients2c.cpp:1046
msgid "your"
msgstr " Deinem"
#: clientgame.cpp:170
#, c-format
msgid "your name is: %s"
msgstr "Dein Name ist: %s"
#: clientgame.cpp:194
#, c-format
msgid "your team is: %s"
msgstr "Du bist im Team: %s"
#~ msgid "bad scope-message for %s"
#~ msgstr "Schlechte Scope-Nachricht fuer %s"
source/locale/de_compile_mo.bat
-3
View File
@@ -1,3 +0,0 @@
msgfmt -c -v -o de\lc_messages\AC.mo de\lc_messages\AC.po
copy /Y de\lc_messages\AC.mo ..\..\packages\locale\de\lc_messages\AC.mo
pause
source/locale/de_compile_mo.sh
-3
View File
@@ -1,3 +0,0 @@
msgfmt -c -v -o de/LC_MESSAGES/AC.mo de/LC_MESSAGES/AC.po
cp -f de/LC_MESSAGES/AC.mo ../../packages/locale/de/LC_MESSAGES/AC.mo
source/locale/de_init_po.sh
-2
View File
@@ -1,2 +0,0 @@
msginit -l de_DE -o de/LC_MESSAGES/AC.po -i AC.pot
source/locale/de_update_po.bat
-2
View File
@@ -1,2 +0,0 @@
msgmerge.exe -s -U de\lc_messages\AC.po AC.pot
pause
source/locale/de_update_po.sh
-2
View File
@@ -1,2 +0,0 @@
msgmerge -s -U de/LC_MESSAGES/AC.po AC.pot
source/locale/translate_cpp_files.txt
-84
View File
@@ -1,84 +0,0 @@
zip.cpp
worldrender.cpp
worldocull.cpp
worldlight.cpp
worldio.cpp
world.h
world.cpp
wizard.cpp
wip.damage4slot.entity.h
wip.CONTEXT.command.cpp
winserviceinstaller.h
weapon.h
weapon.cpp
water.cpp
vote.h
vertmodel.h
v001.newRADARHEIGHT.renderhud.cpp
tristrip.h
tools.h
tools.cpp
texture.cpp
stream.cpp
soundscheduler.cpp
soundlocation.cpp
sound.h
sound.cpp
shadow.cpp
serverms.cpp
server.h
serverfiles.h
serverevents.h
server.cpp
servercontroller.h
serverchecks.h
serverbrowser.cpp
serveractions.h
scoreboard.cpp
scale.h
rndmap.cpp
rendertext.cpp
renderparticles.cpp
rendermodel.cpp
renderhud.cpp
rendergl.cpp
rendercubes.cpp
protos.h
protocol.h
protocol.cpp
platform.h
physics.cpp
pch.cpp
packetqueue.cpp
openal.cpp
oggstream.cpp
model.h
modelcache.h
menus.cpp
md3.h
md2.h
master.cpp
main.cpp
log.cpp
jpegenc.h
i18n.h
i18n.cpp
hudgun.h
geom.h
entity.h
entities.cpp
editing.cpp
docs.cpp
debug.serverfiles.h
cube.h
crypto_tools.h
crypto_tools.cpp
crypto.cpp
console.h
console.cpp
command.h
command.cpp
clients2c.cpp
clientgame.cpp
client.cpp
audiomanager.cpp
source/locale/translate_cubescript_files.txt
-1
View File
@@ -1 +0,0 @@
menus.cfg
source/locale/update_pot_template.bat
-7
View File
@@ -1,7 +0,0 @@
REM search C++ source files
xgettext -d AC -o AC.pot --sort-by-file -k_ -C -D ..\src -f translate_cpp_files.txt
REM add script translations to it
xgettext -d AC -o AC.pot --sort-by-file -k_ -j -L Lisp -D ..\..\config -f translate_cubescript_files.txt
pause
source/locale/update_pot_template.sh
-7
View File
@@ -1,7 +0,0 @@
# search C++ source files
xgettext -d AC -o AC.pot --sort-by-file -k_ -C -D ../src -f translate_cpp_files.txt
# add script translations to it
xgettext -d AC -o AC.pot --sort-by-file -k_ -j -L Lisp -D ../../config -f translate_cubescript_files.txt
source/src/Makefile
+62 -68
View File
@@ -64,7 +64,6 @@ CLIENT_OBJS= \
docs.o \
editing.o \
entities.o \
i18n.o \
log.o \
main.o \
menus.o \
@@ -85,7 +84,6 @@ CLIENT_OBJS= \
server.o \
serverbrowser.o \
shadow.o \
sound.o \
soundlocation.o \
soundscheduler.o \
stream.o \
@@ -220,205 +218,201 @@ depend:
# DO NOT DELETE
crypto.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
crypto.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
crypto.o: weapon.h entity.h world.h command.h varray.h vote.h
crypto.o: console.h protos.h
audiomanager.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
audiomanager.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
audiomanager.o: weapon.h entity.h world.h command.h varray.h vote.h
audiomanager.o: console.h protos.h
client.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
client.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
client.o: weapon.h entity.h world.h command.h varray.h vote.h
client.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
client.o: bot/ac_bot.h
clientgame.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
clientgame.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
clientgame.o: weapon.h entity.h world.h command.h varray.h vote.h
clientgame.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
clientgame.o: bot/ac_bot.h
clients2c.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
clients2c.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
clients2c.o: weapon.h entity.h world.h command.h varray.h vote.h
clients2c.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
clients2c.o: bot/ac_bot.h
command.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
command.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
command.o: weapon.h entity.h world.h command.h varray.h vote.h
command.o: console.h protos.h
console.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
console.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
console.o: weapon.h entity.h world.h command.h varray.h vote.h
console.o: console.h protos.h
docs.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
docs.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
docs.o: entity.h world.h command.h varray.h vote.h console.h protos.h
editing.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
editing.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
editing.o: weapon.h entity.h world.h command.h varray.h vote.h
editing.o: console.h protos.h
entities.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
entities.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
entities.o: weapon.h entity.h world.h command.h varray.h vote.h
entities.o: console.h protos.h
i18n.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
i18n.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
log.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
log.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
log.o: entity.h world.h command.h varray.h vote.h console.h protos.h
main.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
main.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
main.o: entity.h world.h command.h varray.h vote.h console.h protos.h
main.o: jpegenc.h
menus.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
menus.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
menus.o: entity.h world.h command.h varray.h vote.h console.h protos.h
oggstream.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
oggstream.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
oggstream.o: weapon.h entity.h world.h command.h varray.h vote.h
oggstream.o: console.h protos.h
openal.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
openal.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
openal.o: weapon.h entity.h world.h command.h varray.h vote.h
openal.o: console.h protos.h
packetqueue.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
packetqueue.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
packetqueue.o: weapon.h entity.h world.h command.h varray.h vote.h
packetqueue.o: console.h protos.h
physics.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
physics.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
physics.o: weapon.h entity.h world.h command.h varray.h vote.h
physics.o: console.h protos.h
protocol.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
protocol.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
protocol.o: weapon.h entity.h world.h command.h varray.h vote.h
protocol.o: console.h protos.h
rendercubes.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
rendercubes.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
rendercubes.o: weapon.h entity.h world.h command.h varray.h vote.h
rendercubes.o: console.h protos.h
rendergl.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
rendergl.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
rendergl.o: weapon.h entity.h world.h command.h varray.h vote.h
rendergl.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
rendergl.o: bot/ac_bot.h
renderhud.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
renderhud.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
renderhud.o: weapon.h entity.h world.h command.h varray.h vote.h
renderhud.o: console.h protos.h
rendermodel.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
rendermodel.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
rendermodel.o: weapon.h entity.h world.h command.h varray.h vote.h
rendermodel.o: console.h protos.h tristrip.h modelcache.h vertmodel.h md2.h
rendermodel.o: md3.h
renderparticles.o: cube.h platform.h tools.h geom.h model.h protocol.h
renderparticles.o: sound.h weapon.h entity.h world.h i18n.h command.h
renderparticles.o: sound.h weapon.h entity.h world.h command.h
renderparticles.o: varray.h vote.h console.h protos.h
rendertext.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
rendertext.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
rendertext.o: weapon.h entity.h world.h command.h varray.h vote.h
rendertext.o: console.h protos.h
rndmap.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
rndmap.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
rndmap.o: weapon.h entity.h world.h command.h varray.h vote.h
rndmap.o: console.h protos.h
scoreboard.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
scoreboard.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
scoreboard.o: weapon.h entity.h world.h command.h varray.h vote.h
scoreboard.o: console.h protos.h
serverms.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
serverms.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
serverms.o: weapon.h entity.h world.h command.h varray.h vote.h
serverms.o: console.h protos.h
server.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
server.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
server.o: weapon.h entity.h world.h command.h varray.h vote.h
server.o: console.h protos.h server.h servercontroller.h serverfiles.h
server.o: serverchecks.h serverevents.h serveractions.h
serverbrowser.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
serverbrowser.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
serverbrowser.o: weapon.h entity.h world.h command.h varray.h vote.h
serverbrowser.o: console.h protos.h
shadow.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
shadow.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
shadow.o: weapon.h entity.h world.h command.h varray.h vote.h
shadow.o: console.h protos.h
sound.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
sound.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
soundlocation.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
soundlocation.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
soundlocation.o: weapon.h entity.h world.h command.h varray.h vote.h
soundlocation.o: console.h protos.h
soundscheduler.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
soundscheduler.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
soundscheduler.o: weapon.h entity.h world.h command.h varray.h vote.h
soundscheduler.o: console.h protos.h
stream.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
stream.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
stream.o: weapon.h entity.h world.h command.h varray.h vote.h
stream.o: console.h protos.h
texture.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
texture.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
texture.o: weapon.h entity.h world.h command.h varray.h vote.h
texture.o: console.h protos.h scale.h
tools.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
tools.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
tools.o: entity.h world.h command.h varray.h vote.h console.h protos.h
water.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
water.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
water.o: entity.h world.h command.h varray.h vote.h console.h protos.h
weapon.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
weapon.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
weapon.o: weapon.h entity.h world.h command.h varray.h vote.h
weapon.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
weapon.o: bot/ac_bot.h hudgun.h
wizard.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
wizard.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
wizard.o: weapon.h entity.h world.h command.h varray.h vote.h
wizard.o: console.h protos.h
world.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
world.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
world.o: entity.h world.h command.h varray.h vote.h console.h protos.h
world.o: bot/bot.h bot/bot_util.h bot/bot_waypoint.h bot/ac_bot.h
worldio.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
worldio.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
worldio.o: weapon.h entity.h world.h command.h varray.h vote.h
worldio.o: console.h protos.h
worldlight.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
worldlight.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
worldlight.o: weapon.h entity.h world.h command.h varray.h vote.h
worldlight.o: console.h protos.h
worldocull.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
worldocull.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
worldocull.o: weapon.h entity.h world.h command.h varray.h vote.h
worldocull.o: console.h protos.h
worldrender.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
worldrender.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
worldrender.o: weapon.h entity.h world.h command.h varray.h vote.h
worldrender.o: console.h protos.h
zip.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
zip.o: entity.h world.h i18n.h command.h varray.h vote.h console.h protos.h
zip.o: entity.h world.h command.h varray.h vote.h console.h protos.h
bot/bot.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
bot/bot.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
bot/bot.o: weapon.h entity.h world.h command.h varray.h vote.h
bot/bot.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
bot/bot.o: bot/ac_bot.h
bot/botmanager.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
bot/botmanager.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
bot/botmanager.o: weapon.h entity.h world.h command.h varray.h vote.h
bot/botmanager.o: console.h protos.h bot/bot.h bot/bot_util.h
bot/botmanager.o: bot/bot_waypoint.h bot/ac_bot.h
bot/bot_ai.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
bot/bot_ai.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
bot/bot_ai.o: weapon.h entity.h world.h command.h varray.h vote.h
bot/bot_ai.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
bot/bot_ai.o: bot/ac_bot.h
bot/bot_util.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
bot/bot_util.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
bot/bot_util.o: weapon.h entity.h world.h command.h varray.h vote.h
bot/bot_util.o: console.h protos.h bot/bot.h bot/bot_util.h
bot/bot_util.o: bot/bot_waypoint.h bot/ac_bot.h
bot/bot_waypoint.o: cube.h platform.h tools.h geom.h model.h protocol.h
bot/bot_waypoint.o: sound.h weapon.h entity.h world.h i18n.h command.h
bot/bot_waypoint.o: sound.h weapon.h entity.h world.h command.h
bot/bot_waypoint.o: varray.h vote.h console.h protos.h bot/bot.h
bot/bot_waypoint.o: bot/bot_util.h bot/bot_waypoint.h bot/ac_bot.h
bot/ac_bot.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
bot/ac_bot.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
bot/ac_bot.o: weapon.h entity.h world.h command.h varray.h vote.h
bot/ac_bot.o: console.h protos.h bot/bot.h bot/bot_util.h bot/bot_waypoint.h
bot/ac_bot.o: bot/ac_bot.h
bot/ac_bot_ai.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
bot/ac_bot_ai.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
bot/ac_bot_ai.o: weapon.h entity.h world.h command.h varray.h vote.h
bot/ac_bot_ai.o: console.h protos.h bot/bot.h bot/bot_util.h
bot/ac_bot_ai.o: bot/bot_waypoint.h bot/ac_bot.h
cube.h.gch: platform.h tools.h geom.h model.h protocol.h sound.h weapon.h
cube.h.gch: entity.h world.h i18n.h command.h varray.h vote.h console.h
cube.h.gch: entity.h world.h command.h varray.h vote.h console.h
cube.h.gch: protos.h
crypto-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
crypto-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
crypto-standalone.o: sound.h weapon.h entity.h world.h command.h
crypto-standalone.o: varray.h vote.h console.h protos.h
log-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h sound.h
log-standalone.o: weapon.h entity.h world.h i18n.h command.h varray.h vote.h
log-standalone.o: weapon.h entity.h world.h command.h varray.h vote.h
log-standalone.o: console.h protos.h
protocol-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
protocol-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
protocol-standalone.o: sound.h weapon.h entity.h world.h command.h
protocol-standalone.o: varray.h vote.h console.h protos.h
serverms-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
serverms-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
serverms-standalone.o: sound.h weapon.h entity.h world.h command.h
serverms-standalone.o: varray.h vote.h console.h protos.h
server-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
server-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
server-standalone.o: sound.h weapon.h entity.h world.h command.h
server-standalone.o: varray.h vote.h console.h protos.h server.h
server-standalone.o: servercontroller.h serverfiles.h serverchecks.h
server-standalone.o: serverevents.h serveractions.h
stream-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
stream-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
stream-standalone.o: sound.h weapon.h entity.h world.h command.h
stream-standalone.o: varray.h vote.h console.h protos.h
tools-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
tools-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
tools-standalone.o: sound.h weapon.h entity.h world.h command.h
tools-standalone.o: varray.h vote.h console.h protos.h
wizard-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
wizard-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
wizard-standalone.o: sound.h weapon.h entity.h world.h command.h
wizard-standalone.o: varray.h vote.h console.h protos.h
command-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
command-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
command-standalone.o: sound.h weapon.h entity.h world.h command.h
command-standalone.o: varray.h vote.h console.h protos.h
master-standalone.o: cube.h platform.h tools.h geom.h model.h protocol.h
master-standalone.o: sound.h weapon.h entity.h world.h i18n.h command.h
master-standalone.o: sound.h weapon.h entity.h world.h command.h
master-standalone.o: varray.h vote.h console.h protos.h
source/src/client.cpp
+39 -39
View File
@@ -17,14 +17,14 @@ int getclientnum() { return player1 ? player1->clientnum : -1; }
bool multiplayer(bool msg)
{
// check not correct on listen server?
if(curpeer && msg) conoutf(_("operation not available in multiplayer"));
if(curpeer && msg) conoutf("operation not available in multiplayer");
return curpeer!=NULL;
}
bool allowedittoggle()
{
bool allow = !curpeer || gamemode==1;
if(!allow) conoutf(_("editing in multiplayer requires coopedit mode (1)"));
if(!allow) conoutf("editing in multiplayer requires coopedit mode (1)");
return allow;
}
@@ -69,7 +69,7 @@ void connectserv_(const char *servername, int serverport = 0, const char *passwo
if(connpeer)
{
conoutf(_("aborting connection attempt"));
conoutf("aborting connection attempt");
abortconnect();
}
connectrole = role;
@@ -80,10 +80,10 @@ void connectserv_(const char *servername, int serverport = 0, const char *passwo
if(servername)
{
addserver(servername, serverport, 0);
conoutf(_("%c2attempting to %sconnect to %c5%s%c4:%d%c2"), CC, role==CR_DEFAULT?"":"\f8admin\f2", CC, servername, CC, serverport, CC);
conoutf("\f2attempting to %sconnect to \f5%s\f4:%d\f2", role==CR_DEFAULT?"":"\f8admin\f2", servername, serverport);
if(!resolverwait(servername, &address))
{
conoutf(_("%c2could %c3not resolve%c2 server %c5%s%c2"), CC, CC, CC, CC, servername, CC);
conoutf("\f2could \f3not resolve\f2 server \f5%s\f2", servername);
clientpassword[0] = '\0';
connectrole = CR_DEFAULT;
return;
@@ -91,7 +91,7 @@ void connectserv_(const char *servername, int serverport = 0, const char *passwo
}
else
{
conoutf(_("%c2attempting to connect over %c1LAN%c2"), CC, CC, CC);
conoutf("\f2attempting to connect over \f1LAN\f2");
address.host = ENET_HOST_BROADCAST;
}
@@ -108,7 +108,7 @@ void connectserv_(const char *servername, int serverport = 0, const char *passwo
}
else
{
conoutf(_("%c2could %c3not connect%c2 to server"),CC,CC,CC);
conoutf("\f2could \f3not connect\f2 to server");
clientpassword[0] = '\0';
connectrole = CR_DEFAULT;
}
@@ -185,7 +185,7 @@ void disconnect(int onlyclean, int async)
curpeer = NULL;
discmillis = 0;
connected = 0;
conoutf(_("disconnected"));
conoutf("disconnected");
cleanup = true;
}
@@ -215,16 +215,16 @@ void trydisconnect()
{
if(connpeer)
{
conoutf(_("aborting connection attempt"));
conoutf("aborting connection attempt");
abortconnect();
return;
}
if(!curpeer)
{
conoutf(_("not connected"));
conoutf("not connected");
return;
}
conoutf(_("attempting to disconnect..."));
conoutf("attempting to disconnect...");
disconnect(0, !discmillis);
}
@@ -593,12 +593,12 @@ void gets2c() // get updates from the server
if(!clienthost || (!curpeer && !connpeer)) return;
if(connpeer && totalmillis/3000 > connmillis/3000)
{
conoutf(_("attempting to connect..."));
conoutf("attempting to connect...");
connmillis = totalmillis;
++connattempts;
if(connattempts > 3)
{
conoutf(_("%c3could not connect to server"), CC);
conoutf("\f3could not connect to server");
abortconnect();
return;
}
@@ -611,7 +611,7 @@ void gets2c() // get updates from the server
curpeer = connpeer;
connpeer = NULL;
connected = 1;
conoutf(_("connected to server"));
conoutf("connected to server");
exechook(HOOK_SP_MP, "onConnect", "%d", -1);
throttle();
if(editmode) toggleedit(true);
@@ -622,7 +622,7 @@ void gets2c() // get updates from the server
extern packetqueue pktlogger;
pktlogger.queue(event.packet);
if(discmillis) conoutf(_("attempting to disconnect..."));
if(discmillis) conoutf("attempting to disconnect...");
else servertoclient(event.channelID, event.packet->data, (int)event.packet->dataLength);
// destroyed in logger
//enet_packet_destroy(event.packet);
@@ -635,12 +635,12 @@ void gets2c() // get updates from the server
if(event.data>=DISC_NUM) event.data = DISC_NONE;
if(event.peer==connpeer)
{
conoutf(_("%c3could not connect to server"), CC);
conoutf("\f3could not connect to server");
abortconnect();
}
else
{
if(!discmillis || event.data) conoutf(_("%c3server network error, disconnecting (%s) ..."), CC, disc_reason(event.data));
if(!discmillis || event.data) conoutf("\f3server network error, disconnecting (%s) ...", disc_reason(event.data));
disconnect();
}
return;
@@ -733,11 +733,11 @@ bool securemapcheck(const char *map, bool msg)
{
if(msg)
{
conoutf(_("%c3Map %c4%s%c3 is secured. This means you CAN'T send, receive or overwrite it."), CC, CC, map, CC);
conoutf("\f3Map \f4%s\f3 is secured. This means you CAN'T send, receive or overwrite it.", map);
if(connected)
{
conoutf(_("%c3If you get this error often, you (or the server) may be running an outdated game."), CC);
conoutf(_("%c3You can check for updates at %c1http://assault.cubers.net/download.html"), CC, CC);
conoutf("\f3If you get this error often, you (or the server) may be running an outdated game.");
conoutf("\f3You can check for updates at \f1http://assault.cubers.net/download.html");
}
}
return true;
@@ -767,7 +767,7 @@ void sendmap(char *mapname)
putint(p, revision);
if(MAXMAPSENDSIZE - p.length() < mapsize + cfgsizegz || cfgsize > MAXCFGFILESIZE)
{
conoutf(_("map %s is too large to send"), mapname);
conoutf("map %s is too large to send", mapname);
delete[] mapdata;
if(cfgsize) delete[] cfgdata;
return;
@@ -781,7 +781,7 @@ void sendmap(char *mapname)
}
sendpackettoserv(2, p.finalize());
conoutf(_("sending map %s to server..."), mapname);
conoutf("sending map %s to server...", mapname);
}
void getmap(char *name, char *callback)
@@ -789,7 +789,7 @@ void getmap(char *name, char *callback)
if((!name || !*name)
|| (connected && !strcmp(name, getclientmap())) )
{
conoutf(_("requesting map from server..."));
conoutf("requesting map from server...");
packetbuf p(10, ENET_PACKET_FLAG_RELIABLE);
putint(p, SV_RECVMAP);
sendpackettoserv(2, p.finalize());
@@ -819,13 +819,13 @@ void getdemo(int *idx, char *dsp)
{
if(!multiplayer(false))
{
conoutf("%c3Getting demo from server is not available in singleplayer", CC);
conoutf("\f3Getting demo from server is not available in singleplayer");
return;
}
if(dsp && dsp[0]) formatstring(demosubpath)("%s/", dsp);
else copystring(demosubpath, "");
if(*idx<=0) conoutf(_("getting demo..."));
else conoutf(_("getting demo %d..."), *idx);
if(*idx<=0) conoutf("getting demo...");
else conoutf("getting demo %d...", *idx);
addmsg(SV_GETDEMO, "ri", *idx);
}
@@ -833,10 +833,10 @@ void listdemos()
{
if(!multiplayer(false))
{
conoutf("%c3Listing demos from server is not available in singleplayer", CC);
conoutf("\f3Listing demos from server is not available in singleplayer");
return;
}
conoutf(_("listing demos..."));
conoutf("listing demos...");
addmsg(SV_LISTDEMOS, "r");
}
@@ -896,7 +896,7 @@ void resetpckservers()
{
pckservers.deletecontents();
delfile(findfile("config" PATHDIVS "pcksources.cfg", "w"));
conoutf("%c3Restart AssaultCube to take effect after resetting the list of packages source servers", CC);
conoutf("\f3Restart AssaultCube to take effect after resetting the list of packages source servers");
}
void addpckserver(char *addr)
@@ -916,7 +916,7 @@ bool havecurl = false, canceldownloads = false;
void setupcurl()
{
if(curl_global_init(CURL_GLOBAL_NOTHING)) conoutf(_("\f3could not init cURL, content downloads not available"));
if(curl_global_init(CURL_GLOBAL_NOTHING)) conoutf("\f3could not init cURL, content downloads not available");
else
{
havecurl = true;
@@ -999,7 +999,7 @@ size_t write_callback(void *ptr, size_t size, size_t nmemb, FILE *stream)
int progress_callback_dlpackage(void *clientp, double dltotal, double dlnow, double ultotal, double ulnow)
{
package *pck = (package *)clientp;
loadingscreen(_("downloading package %d out of %d...\n%s %.0f/%.0f KB (%.1f%%)\n(ESC to cancel)"), pck->number + 1, pck->number + pendingpackages.numelems,
loadingscreen("downloading package %d out of %d...\n%s %.0f/%.0f KB (%.1f%%)\n(ESC to cancel)", pck->number + 1, pck->number + pendingpackages.numelems,
pck->name, dlnow/double(1024.0), dltotal/double(1024.0), dltotal == 0 ? 0 : (dlnow/dltotal * double(100.0)));
if(interceptkey(SDLK_ESCAPE))
{
@@ -1025,7 +1025,7 @@ int processdownload(package *pck)
{
const char *pckname = findfile(path(pck->name, true), "w+");
// with textures/sounds, the image/audio file itself is sent. Just need to copy it from the temporary file
if(rename(tmpname, pckname)) conoutf(_("\f3failed to install"), pckname);
if(rename(tmpname, pckname)) conoutf("\f3failed to install", pckname);
if(pck->type == PCK_TEXTURE) rereadtexturelists = 1;
else rereadsoundlists = 1;
break;
@@ -1047,7 +1047,7 @@ int processdownload(package *pck)
}
default:
conoutf(_("could not install package %s"), pck->name);
conoutf("could not install package %s", pck->name);
break;
}
delfile(tmpname);
@@ -1063,7 +1063,7 @@ double dlpackage(package *pck)
FILE *outfile = fopen(tmpname, "wb");
string req, pckname = "";
sprintf(req, "%s/%s%s", pck->source->addr, strreplace(pckname, pck->name, " ", "%20"), (pck->type==PCK_MAP || pck->type==PCK_MAPMODEL || pck->type==PCK_SKYBOX) ? ".zip" : "");
conoutf(_("downloading %s from %s ..."), pck->name, pck->source->addr);
conoutf("downloading %s from %s ...", pck->name, pck->source->addr);
if(!outfile)
{
pck->pending = false;
@@ -1094,14 +1094,14 @@ double dlpackage(package *pck)
{
// mark source unresponsive
pck->source->responsive = false;
conoutf(_("\f3could not connect to %s"), pck->source->addr);
conoutf("\f3could not connect to %s", pck->source->addr);
// try to find another source
pckserver *source = NULL;
loopv(pckservers) if(pckservers[i]->responsive) { source = pckservers[i]; break; }
if(!source)
{
conoutf(_("\f3no more servers to connect to"));
conoutf("\f3no more servers to connect to");
canceldownloads = true;
return 0;
}
@@ -1117,8 +1117,8 @@ double dlpackage(package *pck)
return dlpackage(pck); // retry current
}
if(!result && httpresult == 200) processdownload(pck);
else if(result == CURLE_ABORTED_BY_CALLBACK) conoutf(_("\f3download cancelled"));
else conoutf(_("\f2request for %s failed (cURL %d, HTTP %d)"), req, result, httpresult);
else if(result == CURLE_ABORTED_BY_CALLBACK) conoutf("\f3download cancelled");
else conoutf("\f2request for %s failed (cURL %d, HTTP %d)", req, result, httpresult);
return (!result && httpresult == 200) ? dlsize : 0;
}
@@ -1154,7 +1154,7 @@ bool requirepackage(int type, const char *path)
{
pckserver *source = NULL;
loopv(pckservers) if(pckservers[i]->responsive) { source = pckservers[i]; break; }
if(!source) { conoutf(_("\f3no responsive source server found, can't download")); return false; }
if(!source) { conoutf("\f3no responsive source server found, can't download"); return false; }
char *cleanpath = unixpath(newstring(path));
filtertext(cleanpath, cleanpath, FTXT__MEDIAFILEPATH);
source/src/clientgame.cpp
+28 -32
View File
@@ -119,8 +119,8 @@ void listignored()
string pl;
pl[0] = '\0';
loopv(players) if(players[i] && players[i]->ignored) concatformatstring(pl, ", %s", colorname(players[i]));
if(*pl) conoutf(_("ignored players: %s"), pl + 2);
else conoutf(_("no players were ignored."));
if(*pl) conoutf("ignored players: %s", pl + 2);
else conoutf("no players were ignored.");
}
void clearignored(int *cn)
@@ -139,8 +139,8 @@ void listmuted()
string pl;
pl[0] = '\0';
loopv(players) if(players[i] && players[i]->muted) concatformatstring(pl, ", %s", colorname(players[i]));
if(*pl) conoutf(_("muted players: %s"), pl + 2);
else conoutf(_("no players were muted."));
if(*pl) conoutf("muted players: %s", pl + 2);
else conoutf("no players were muted.");
}
void clearmuted(char *cn)
@@ -167,7 +167,7 @@ void newname(const char *name)
updateclientname(player1);
addmsg(SV_SWITCHNAME, "rs", player1->name);
}
else conoutf(_("your name is: %s"), player1->name);
else conoutf("your name is: %s", player1->name);
}
SVARFF(curname, { curname = exchangestr(curname, player1->name); }, {} );
@@ -183,11 +183,11 @@ void newteam(char *name)
{
int nt = teamatoi(name);
if(nt == player1->team) return; // same team
if(!team_isvalid(nt)) { conoutf(_("%c3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)"), CC, name); return; }
if(player1->state == CS_EDITING) conoutf(_("you can't change team while editing"));
if(!team_isvalid(nt)) { conoutf("\f3\"%s\" is not a valid team name (try CLA, RVSF or SPECTATOR)", name); return; }
if(player1->state == CS_EDITING) conoutf("you can't change team while editing");
else addmsg(SV_SWITCHTEAM, "ri", nt);
}
else conoutf(_("your team is: %s"), team_string(player1->team));
else conoutf("your team is: %s", team_string(player1->team));
}
void benchme()
@@ -231,7 +231,7 @@ VARP(autoscreenshot, 0, 0, 1);
void stopdemo()
{
if(watchingdemo) enddemoplayback();
else conoutf(_("not playing a demo"));
else conoutf("not playing a demo");
}
COMMAND(stopdemo, "");
@@ -843,7 +843,7 @@ COMMANDF(burstshots, "si", (char *gun, int *shots)
if(*shots >= 0) burstshotssettings[guni] = min(*shots, (guns[guni].magsize-1));
else intret(burstshotssettings[guni]);
}
else conoutf(_("invalid gun specified"));
else conoutf("invalid gun specified");
});
// damage arriving from the network, monsters, yourself, all ends up here.
@@ -968,8 +968,8 @@ void timeupdate(int milliscur, int millismax)
extern bool needsautoscreenshot;
if(autoscreenshot) needsautoscreenshot = true;
player1->attacking = false;
conoutf(_("intermission:"));
conoutf(_("game has ended!"));
conoutf("intermission:");
conoutf("game has ended!");
consolescores();
showscores(true);
exechook(HOOK_SP_MP, "start_intermission", "");
@@ -984,8 +984,8 @@ void timeupdate(int milliscur, int millismax)
hudoutf("%s1 minute left!", sec==60 ? "" : "less than ");
exechook(HOOK_SP_MP, "onLastMin", "");
}
else if(!clockdisplay) conoutf(_("time remaining: %d minutes"), minutesremaining);
else clientlogf(_("time remaining: %d minutes"), minutesremaining);
else if(!clockdisplay) conoutf("time remaining: %d minutes", minutesremaining);
else clientlogf("time remaining: %d minutes", minutesremaining);
}
}
@@ -1051,7 +1051,7 @@ void preparectf(bool cleanonly=false)
if(e.type==CTF_FLAG)
{
e.spawned = true;
if(e.attr2>=2) { conoutf(_("%c3invalid ctf-flag entity (%i)"), CC, i); e.attr2 = 0; }
if(e.attr2>=2) { conoutf("\f3invalid ctf-flag entity (%i)", i); e.attr2 = 0; }
flaginfo &f = flaginfos[e.attr2];
f.flagent = &e;
f.pos.x = (float) e.x;
@@ -1137,7 +1137,7 @@ void startmap(const char *name, bool reset, bool norespawn) // called just aft
player1->followplayercn = -1;
if(m_valid(gamemode) && !m_mp(gamemode)) respawnself();
else findplayerstart(player1);
if(good_map()==MAP_IS_BAD) conoutf(_("You cannot play in this map due to quality requisites. Please, report this incident."));
if(good_map()==MAP_IS_BAD) conoutf("You cannot play in this map due to quality requisites. Please, report this incident.");
if (mapstats_hud) showmapstats();
if(!reset) return;
@@ -1155,15 +1155,11 @@ void startmap(const char *name, bool reset, bool norespawn) // called just aft
lastgametimeupdate = 0;
arenaintermission = 0;
bool noflags = (m_ctf || m_ktf) && (!numflagspawn[0] || !numflagspawn[1]);
if(*clientmap) conoutf(_("game mode is \"%s\"%s"), modestr(gamemode, modeacronyms > 0), noflags ? " - \f2but there are no flag bases on this map" : "");
if(*clientmap) conoutf("game mode is \"%s\"%s", modestr(gamemode, modeacronyms > 0), noflags ? " - \f2but there are no flag bases on this map" : "");
if(showmodedescriptions && (multiplayer(false) || m_botmode))
{
loopv(gmdescs) if(gmdescs[i].mode == gamemode)
{
//conoutf(_("%c1%s"), CC, gmdescs[i].desc); // 3rd useless call to translation - these should be translated inside the cube-script-definition
conoutf("\f1%s", gmdescs[i].desc);
}
loopv(gmdescs) if(gmdescs[i].mode == gamemode) conoutf("\f1%s", gmdescs[i].desc);
}
// run once
@@ -1419,7 +1415,7 @@ void callvote(int type, const char *arg1, const char *arg2, const char *arg3)
sendpackettoserv(1, p.finalize());
exechook(HOOK_SP_MP, "onCallVote", "%d %d [%s] [%s]", type, player1->clientnum, arg1, arg2);
}
else conoutf(_("%c3invalid vote"), CC);
else conoutf("\f3invalid vote");
}
void scallvote(int *type, const char *arg1, const char *arg2)
@@ -1443,9 +1439,9 @@ void scallvote(int *type, const char *arg1, const char *arg2)
if (!arg1 || !isdigit(arg1[0]) || !arg2 || strlen(arg2) <= 3 || !multiplayer(false))
{
if(!multiplayer(false))
conoutf(_("%c3%s is not available in singleplayer."), CC, t == SA_BAN ? "Ban" : "Kick");
else if(arg1 && !isdigit(arg1[0])) conoutf(_("%c3invalid vote"), CC);
else conoutf(_("%c3invalid reason"), CC);
conoutf("\f3%s is not available in singleplayer.", t == SA_BAN ? "Ban" : "Kick");
else if(arg1 && !isdigit(arg1[0])) conoutf("\f3invalid vote");
else conoutf("\f3invalid reason");
break;
}
}
@@ -1464,7 +1460,7 @@ void scallvote(int *type, const char *arg1, const char *arg2)
int vote(int v)
{
if(!curvote || v < 0 || v >= VOTE_NUM) return 0;
if(curvote->localplayervoted) { conoutf(_("%c3you voted already"), CC); return 0; }
if(curvote->localplayervoted) { conoutf("\f3you voted already"); return 0; }
packetbuf p(MAXTRANS, ENET_PACKET_FLAG_RELIABLE);
putint(p, SV_VOTE);
putint(p, v);
@@ -1482,7 +1478,7 @@ void displayvote(votedisplayinfo *v)
if(!v) return;
DELETEP(curvote);
curvote = v;
conoutf(_("%s called a vote: %s"), v->owner ? colorname(v->owner) : "", curvote->desc);
conoutf("%s called a vote: %s", v->owner ? colorname(v->owner) : "", curvote->desc);
audiomgr.playsound(S_CALLVOTE, SP_HIGHEST);
curvote->localplayervoted = false;
votepending = 1;
@@ -1499,7 +1495,7 @@ void callvotesuc()
void callvoteerr(int e)
{
if(e < 0 || e >= VOTEE_NUM) return;
conoutf(_("%c3could not vote: %s"), CC, voteerrorstr(e));
conoutf("\f3could not vote: %s", voteerrorstr(e));
DELETEP(calledvote);
}
@@ -1510,7 +1506,7 @@ void voteresult(int v)
{
curvote->result = v;
curvote->millis = totalmillis + 5000;
conoutf(_("vote %s"), v == VOTE_YES ? _("passed") : _("failed"));
conoutf("vote %s", v == VOTE_YES ? "passed" : "failed");
if(multiplayer(false)) audiomgr.playsound(v == VOTE_YES ? S_VOTEPASS : S_VOTEFAIL, SP_HIGH);
exechook(HOOK_SP_MP, "onVoteEnd", "");
votepending = 0;
@@ -1584,7 +1580,7 @@ void whois(int *cn)
{
playerent *p = players[i];
uint2ip(p->address, ip);
if(m_teammode) conoutf(_("%c0INFO: %c5%s has %d teamkills."), CC, CC, p->name, p->tks);
if(m_teammode) conoutf("\f0INFO: \f5%s has %d teamkills.", p->name, p->tks);
if(ip[3] != 0 || player1->clientrole==CR_ADMIN)
conoutf("WHOIS client %d:\n\f5name\t%s\n\f5IP\t%d.%d.%d.%d", p->clientnum, colorname(p), ip[0], ip[1], ip[2], ip[3]); // full IP
else conoutf("WHOIS client %d:\n\f5name\t%s\n\f5IP\t%d.%d.%d.x", p->clientnum, colorname(p), ip[0], ip[1], ip[2]); // censored IP
@@ -1610,7 +1606,7 @@ void setadmin(int *claim, char *password)
{
if(!*claim && (player1->clientrole))
{
conoutf(_("you released admin status"));
conoutf("you released admin status");
addmsg(SV_SETADMIN, "ri", 0);
}
else if(*claim != 0 && password)
source/src/clients2c.cpp
+36 -36
View File
@@ -47,7 +47,7 @@ bool changemapserv(char *name, int mode, int download, int revision) // f
bool revmatch = hdr.maprevision == revision || revision == 0;
if(watchingdemo)
{
if(loaded && !revmatch) conoutf(_("%c3demo was recorded on map revision %d, you have map revision %d"), CC, revision, hdr.maprevision);
if(loaded && !revmatch) conoutf("\f3demo was recorded on map revision %d, you have map revision %d", revision, hdr.maprevision);
}
else
{
@@ -67,9 +67,9 @@ bool changemapserv(char *name, int mode, int download, int revision) // f
}
else
{
if(!loaded || download < 10) conoutf(_("\"getmap\" to download the current map from the server"));
else conoutf(_("\"getmap\" to download a %s version of the current map from the server"),
revision == 0 ? _("different") : (revision > hdr.maprevision ? _("newer") : _("older")));
if(!loaded || download < 10) conoutf("\"getmap\" to download the current map from the server");
else conoutf("\"getmap\" to download a %s version of the current map from the server",
revision == 0 ? "different" : (revision > hdr.maprevision ? "newer" : "older"));
}
}
}
@@ -418,7 +418,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
int mycn = getint(p), prot = getint(p);
if(prot!=CUR_PROTOCOL_VERSION && !(watchingdemo && prot == -PROTOCOL_VERSION))
{
conoutf(_("%c3incompatible game protocol (local protocol: %d :: server protocol: %d)"), CC, CUR_PROTOCOL_VERSION, prot);
conoutf("\f3incompatible game protocol (local protocol: %d :: server protocol: %d)", CUR_PROTOCOL_VERSION, prot);
conoutf("\f3if this occurs a lot, obtain an upgrade from \f1http://assault.cubers.net");
if(watchingdemo) conoutf("breaking loop : \f3this demo is using a different protocol\f5 : end it now!"); // SVN-WiP-bug: causes endless retry loop else!
else disconnect();
@@ -426,7 +426,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
}
sessionid = getint(p);
player1->clientnum = mycn;
if(getint(p) > 0) conoutf(_("INFO: this server is password protected"));
if(getint(p) > 0) conoutf("INFO: this server is password protected");
sendintro();
break;
}
@@ -556,7 +556,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
if(!text[0]) copystring(text, "unarmed");
if(d)
{
if(strcmp(d->name, text)) conoutf(_("%s is now known as %s"), colorname(d), colorname(d, text));
if(strcmp(d->name, text)) conoutf("%s is now known as %s", colorname(d), colorname(d, text));
exechook(HOOK_SP, "onNameChange", "%d \"%s\"", d->clientnum, text);
copystring(d->name, text, MAXNAMELEN+1);
updateclientname(d);
@@ -593,11 +593,11 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
if(d->name[0]) // already connected
{
if(strcmp(d->name, text))
conoutf(_("%s is now known as %s"), colorname(d), colorname(d, text));
conoutf("%s is now known as %s", colorname(d), colorname(d, text));
}
else // new client
{
conoutf(_("connected: %s"), colorname(d, text));
conoutf("connected: %s", colorname(d, text));
}
copystring(d->name, text, MAXNAMELEN+1);
exechook(HOOK_SP_MP, "onConnect", "%d", d->clientnum);
@@ -620,7 +620,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
int cn = getint(p);
playerent *d = getclient(cn);
if(!d) break;
if(d->name[0]) conoutf(_("player %s disconnected"), colorname(d));
if(d->name[0]) conoutf("player %s disconnected", colorname(d));
zapplayer(players[cn]);
exechook(HOOK_SP_MP, "onDisconnect", "%d", d->clientnum);
break;
@@ -658,7 +658,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
if ( map_quality == MAP_IS_BAD )
{
loopi(6+2*NUMGUNS) getint(p);
conoutf(_("map deemed unplayable - fix it before you can spawn"));
conoutf("map deemed unplayable - fix it before you can spawn");
break;
}
@@ -682,7 +682,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
if(m_arena && !localwrongmap)
{
if(connected) closemenu(NULL);
conoutf(_("new round starting... fight!"));
conoutf("new round starting... fight!");
hudeditf(HUDMSG_TIMER, "FIGHT!");
if(m_botmode) BotManager.RespawnBots();
}
@@ -938,7 +938,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
if(size>=0) empty_world(size, true);
else empty_world(-1, true);
if(d && d!=player1)
conoutf(size>=0 ? _("%s started a new map of size %d") : _("%s enlarged the map to size %d"), colorname(d), sfactor);
conoutf(size>=0 ? "%s started a new map of size %d" : "%s enlarged the map to size %d", colorname(d), sfactor);
break;
}
@@ -1064,12 +1064,12 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
{
int acn = getint(p);
playerent *alive = getclient(acn);
conoutf(_("the round is over! next round in 5 seconds..."));
if(m_botmode && acn==-2) hudoutf(_("the bots have won the round!"));
else if(acn==-1) hudoutf(_("everyone died!"));
else if(m_teammode) hudoutf(_("team %s has won the round!"), team_string(alive->team));
else if(alive==player1) hudoutf(_("you are the survivor!"));
else hudoutf(_("%s is the survivor!"), colorname(alive));
conoutf("the round is over! next round in 5 seconds...");
if(m_botmode && acn==-2) hudoutf("the bots have won the round!");
else if(acn==-1) hudoutf("everyone died!");
else if(m_teammode) hudoutf("team %s has won the round!", team_string(alive->team));
else if(alive==player1) hudoutf("you are the survivor!");
else hudoutf("%s is the survivor!", colorname(alive));
arenaintermission = lastmillis;
break;
}
@@ -1105,8 +1105,8 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
if(pl->name[0])
{
// two messages required to allow for proper german translation - is there a better way to do it?
if(pl==player1) conoutf(_("you claimed %s status"), r == CR_ADMIN ? "admin" : "master");
else conoutf(_("%s claimed %s status"), colorname(pl), r == CR_ADMIN ? "admin" : "master");
if(pl==player1) conoutf("you claimed %s status", r == CR_ADMIN ? "admin" : "master");
else conoutf("%s claimed %s status", colorname(pl), r == CR_ADMIN ? "admin" : "master");
}
}
}
@@ -1118,13 +1118,13 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
int t = getint(p);
if(m_teammode)
{
if(team_isvalid(t)) conoutf(_("you can't change to team %s"), team_string(t));
if(team_isvalid(t)) conoutf("you can't change to team %s", team_string(t));
}
else
{
if(team_isspect(t)) conoutf(_("you can't change to spectate mode"));
else if (player1->state!=CS_ALIVE) conoutf(_("you can't change to active mode"));
else conoutf(_("you can't switch teams while being alive"));
if(team_isspect(t)) conoutf("you can't change to spectate mode");
else if (player1->state!=CS_ALIVE) conoutf("you can't change to active mode");
else conoutf("you can't switch teams while being alive");
}
break;
}
@@ -1151,10 +1151,10 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
switch(ftr)
{
case FTR_PLAYERWISH:
conoutf(_("you're now in team %s"), nts);
conoutf("you're now in team %s", nts);
break;
case FTR_AUTOTEAM:
hudoutf(_("the server forced you to team %s"), nts);
hudoutf("the server forced you to team %s", nts);
break;
}
}
@@ -1165,18 +1165,18 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
switch(ftr)
{
case FTR_PLAYERWISH:
conoutf(_("player %s switched to team %s"), pls, nts); // new message
conoutf("player %s switched to team %s", pls, nts); // new message
break;
case FTR_AUTOTEAM:
if(watchingdemo || team_isspect(player1->team)) conoutf(_("the server forced %s to team %s"), colorname(d), nts);
else hudoutf(_("the server forced %s to %s team"), colorname(d), et ? _("the enemy") : _("your"));
if(watchingdemo || team_isspect(player1->team)) conoutf("the server forced %s to team %s", colorname(d), nts);
else hudoutf("the server forced %s to %s team", colorname(d), et ? "the enemy" : "your");
break;
}
}
if(you && !team_isspect(d->team) && team_isspect(fnt) && d->state == CS_DEAD) spectatemode(SM_FLY);
}
}
else if(d->team != fnt && ftr == FTR_PLAYERWISH && !team_isactive(d->team)) conoutf(_("%s changed to active play"), you ? _("you") : colorname(d));
else if(d->team != fnt && ftr == FTR_PLAYERWISH && !team_isactive(d->team)) conoutf("%s changed to active play", you ? "you" : colorname(d));
d->team = fnt;
if(team_isspect(d->team)) d->state = CS_SPECTATE;
}
@@ -1315,7 +1315,7 @@ void parsemessages(int cn, playerent *d, ucharbuf &p, bool demo = false)
demo_mlines.shrink(0);
if(!demos)
{
conoutf(_("no demos available"));
conoutf("no demos available");
mline &m = demo_mlines.add();
copystring(m.name, "no demos available");
menumanual(downloaddemomenu,m.name);
@@ -1470,10 +1470,10 @@ void receivefile(uchar *data, int len)
stream *demo = openrawfile(fname, "wb");
if(!demo)
{
conoutf(_("failed writing to \"%s\""), fname);
conoutf("failed writing to \"%s\"", fname);
return;
}
conoutf(_("received demo \"%s\""), fname);
conoutf("received demo \"%s\"", fname);
demo->write(&p.buf[p.len], demosize);
delete demo;
break;
@@ -1482,14 +1482,14 @@ void receivefile(uchar *data, int len)
case SV_RECVMAP:
{
getstring(text, p);
conoutf(_("received map \"%s\" from server, reloading.."), text);
conoutf("received map \"%s\" from server, reloading..", text);
int mapsize = getint(p);
int cfgsize = getint(p);
int cfgsizegz = getint(p);
/* int revision = */ getint(p);
int size = mapsize + cfgsizegz;
if(MAXMAPSENDSIZE < mapsize + cfgsizegz || cfgsize > MAXCFGFILESIZE) { // sam's suggestion
conoutf(_("map %s is too large to receive"), text);
conoutf("map %s is too large to receive", text);
} else {
if(p.remaining() < size)
{
source/src/cube.h
-4
View File
@@ -1,9 +1,6 @@
#ifndef __CUBE_H__
#define __CUBE_H__
// to "trick" i18n/gettext
#define CC '\f'
#include "platform.h"
#include "tools.h"
#include "geom.h"
@@ -13,7 +10,6 @@
#include "weapon.h"
#include "entity.h"
#include "world.h"
#include "i18n.h"
#include "command.h"
#ifndef STANDALONE
source/src/i18n.cpp
-24
View File
@@ -1,24 +0,0 @@
// internationalization and localization
#include "cube.h"
#include <locale.h>
SVARFP(lang, "en", filterlang(lang, lang));
i18nmanager::i18nmanager(const char *domain, const char *basepath) : domain(domain), basepath(basepath)
{
locale = setlocale(LC_ALL, ""); // use current default locale
bindtextdomain(domain, basepath); // set base path
textdomain(domain);
setlocale(LC_NUMERIC, "C"); // make sure numeric is consistent (very important for float usage in scripts)
}
// export gettext to cubescript
// this way we can provide localization of strings within cubescript
void script_gettext(char *msgid)
{
const char *translated = _gettext(msgid);
result(translated);
}
COMMANDN(gettext, script_gettext, "s");
source/src/i18n.h
-14
View File
@@ -1,14 +0,0 @@
// internationalization and localization
// localization manager
struct i18nmanager
{
const char *domain;
const char *basepath;
char *locale;
i18nmanager(const char *domain, const char *basepath); // initialize locale system
};
extern char *lang;
source/src/main.cpp
+3 -3
View File
@@ -124,6 +124,8 @@ VARF(fullscreen, 0, 0, 1, setfullscreen(fullscreen!=0));
VARF(fullscreen, 0, 1, 1, setfullscreen(fullscreen!=0));
#endif
SVARFP(lang, "en", filterlang(lang, lang));
void writeinitcfg()
{
if(!restoredinits) return;
@@ -143,7 +145,7 @@ void writeinitcfg()
extern int audio, soundchannels;
f->printf("audio %d\n", audio > 0 ? 1 : 0);
f->printf("soundchannels %d\n", soundchannels);
f->printf("lang %s\n", lang);
if(lang && *lang) f->printf("lang %s\n", lang);
delete f;
}
@@ -1176,8 +1178,6 @@ int main(int argc, char **argv)
createconfigtemplates("config/configtemplates.zip");
i18nmanager i18n("AC", path("packages/locale", true));
initing = NOT_INITING;
#define STRINGIFY_(x) #x
source/src/md2.h
+1 -1
View File
@@ -257,7 +257,7 @@ struct md2 : vertmodel
Texture *skin;
loadskin(loadname, pname, skin);
loopv(mdl.meshes) mdl.meshes[i]->skin = skin;
if(skin==notexture) conoutf(_("could not load model skin for %s"), name1);
if(skin==notexture) conoutf("could not load model skin for %s", name1);
loadingmd2 = this;
defformatstring(name2)("packages/models/%s/md2.cfg", loadname);
per_idents = false;
source/src/menus.cpp
+1 -1
View File
@@ -1470,7 +1470,7 @@ void addchange(const char *desc, int type)
if(!applydialog) return;
if(type!=CHANGE_GFX)
{
conoutf(_("..restart AssaultCube for this setting to take effect"));
conoutf("..restart AssaultCube for this setting to take effect");
return;
}
bool changed = false;
source/src/physics.cpp
+1 -1
View File
@@ -1067,7 +1067,7 @@ void entinmap(physent *d) // brute force but effective way to find a free spa
}
// leave ent at original pos, possibly stuck
d->resetinterp();
conoutf(_("can't find entity spawn spot! (%d, %d)"), d->o.x, d->o.y);
conoutf("can't find entity spawn spot! (%d, %d)", d->o.x, d->o.y);
}
void vecfromyawpitch(float yaw, float pitch, int move, int strafe, vec &m)
source/src/platform.h
-2
View File
@@ -58,12 +58,10 @@
#include "GL/glext.h"
#ifdef __APPLE__
#include "INTL/libintl.h"
#include "OpenAL/al.h"
#include "OpenAL/alc.h"
#include "Vorbis/vorbisfile.h"
#else
#include <libintl.h>
#include "AL/al.h"
#include "AL/alc.h"
#include "vorbis/vorbisfile.h"
source/src/protos.h
+1
View File
@@ -528,6 +528,7 @@ extern void computeraytable(float vx, float vy, float fov);
extern int isoccluded(float vx, float vy, float cx, float cy, float csize);
// main
extern char *lang;
extern SDL_Surface *screen;
extern int colorbits, depthbits, stencilbits;
source/src/serverbrowser.cpp
+3 -3
View File
@@ -1175,11 +1175,11 @@ bool serverskey(void *menu, int code, bool isdown, int unicode)
if(!desc) desc = "";
if(*ak)
{ // server was automatically added to this favourite group, don't remove
conoutf(_("server \"%cs%s%cr\" is in category '%cs%s%cr' because of key '%s', please remove manually"), CC, servers[j]->sdesc, CC, CC, desc, CC, ak);
conoutf("server \"\fs%s\fr\" is in category '\fs%s\fr' because of key '%s', please remove manually", servers[j]->sdesc, desc, ak);
}
else if(rest)
{ // remove from favourite group
conoutf(_("removing server \"%cs%s%cr\" from favourites category '%cs%s%cr' (rest '%s')"), CC, servers[j]->sdesc, CC, CC, desc, CC, rest);
conoutf("removing server \"\fs%s\fr\" from favourites category '\fs%s\fr' (rest '%s')", servers[j]->sdesc, desc, rest);
alias(keyalias, rest);
}
else
@@ -1194,7 +1194,7 @@ bool serverskey(void *menu, int code, bool isdown, int unicode)
delete[] newkey;
}
else alias(keyalias, text);
conoutf(_("adding server \"%cs%s%cr\" to favourites category '%cs%s%cr' (new '%s')"), CC, servers[j]->sdesc, CC, CC, desc, CC, getalias(keyalias));
conoutf("adding server \"\fs%s\fr\" to favourites category '\fs%s\fr' (new '%s')", servers[j]->sdesc, desc, getalias(keyalias));
}
return true;
}
source/src/sound.cpp
-4
View File
@@ -1,4 +0,0 @@
// sound.cpp: uses OpenAL, some code chunks are from devmaster.net and gamedev.net
#include "cube.h"
source/src/tools.h
-12
View File
@@ -846,18 +846,6 @@ inline char *newstringbuf(const char *s) { return newstring(s, MAXSTRLEN-
inline void delstring(const char *s) { delete[] (char *)s; }
#define DELSTRING(s) if(s) { delstring(s); s = NULL; }
#ifndef STANDALONE
inline const char *_gettext(const char *msgid)
{
if(msgid && msgid[0] != '\0')
return gettext(msgid);
else
return "";
}
#endif
#define _(s) _gettext(s)
const int islittleendian = 1;
#ifdef SDL_BYTEORDER
#define endianswap16 SDL_Swap16
source/src/weapon.cpp
+1 -1
View File
@@ -778,7 +778,7 @@ void accuracyreset()
{
accuracym[i].hits=accuracym[i].shots=0;
}
conoutf(_("Your accuracy has been reset."));
conoutf("Your accuracy has been reset.");
}
COMMAND(accuracyreset, "");
// weapon
source/vcpp/cube.vcproj
+3 -48
View File
@@ -84,7 +84,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib efx-util.lib odbc32.lib odbccp32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib libintl.lib libcurl.lib wldap32.lib"
AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib efx-util.lib odbc32.lib odbccp32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib libcurl.lib wldap32.lib"
OutputFile="../../bin_win32/ac_client.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -186,7 +186,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib libintl.lib libcurl.lib wldap32.lib"
AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib libcurl.lib wldap32.lib"
OutputFile="../../bin_win32/ac_client.exe"
LinkIncremental="2"
SuppressStartupBanner="true"
@@ -293,7 +293,7 @@
<Tool
Name="VCLinkerTool"
AdditionalOptions="/PROFILE"
AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib libintl.lib jpeg.lib libcurl.lib wldap32.lib"
AdditionalDependencies="enet.lib ogg.lib libvorbisfile.lib openal32.lib zdll.lib opengl32.lib SDL.lib SDL_image.lib ws2_32.lib winmm.lib Dbghelp.lib jpeg.lib libcurl.lib wldap32.lib"
OutputFile="..\..\bin_win32\ac_client.exe"
LinkIncremental="1"
SuppressStartupBanner="true"
@@ -561,10 +561,6 @@
RelativePath="..\src\hudgun.h"
>
</File>
<File
RelativePath="..\src\i18n.h"
>
</File>
<File
RelativePath="..\src\md2.h"
>
@@ -1405,26 +1401,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\i18n.cpp"
>
<FileConfiguration
Name="Standalone|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
<FileConfiguration
Name="Standalone Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\log.cpp"
>
@@ -2002,27 +1978,6 @@
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\sound.cpp"
>
<FileConfiguration
Name="Standalone|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
UsePrecompiledHeader="2"
/>
</FileConfiguration>
<FileConfiguration
Name="Standalone Debug|Win32"
ExcludedFromBuild="true"
>
<Tool
Name="VCCLCompilerTool"
/>
</FileConfiguration>
</File>
<File
RelativePath="..\src\soundlocation.cpp"
>
source/xcode/Frameworks/INTL.framework/Headers
-1
View File
@@ -1 +0,0 @@
Versions/Current/Headers
source/xcode/Frameworks/INTL.framework/INTL
-1
View File
@@ -1 +0,0 @@
Versions/Current/INTL
source/xcode/Frameworks/INTL.framework/Resources
-1
View File
@@ -1 +0,0 @@
Versions/Current/Resources
source/xcode/Frameworks/INTL.framework/Versions/A/Headers/libintl.h
-464
View File
@@ -1,464 +0,0 @@
/* Message catalogs for internationalization.
Copyright (C) 1995-1997, 2000-2010 Free Software Foundation, Inc.
This program is free software; you can redistribute it and/or modify it
under the terms of the GNU Library General Public License as published
by the Free Software Foundation; either version 2, or (at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Library General Public License for more details.
You should have received a copy of the GNU Library General Public
License along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301,
USA. */
#ifndef _LIBINTL_H
#define _LIBINTL_H 1
#include <locale.h>
#if (defined __APPLE__ && defined __MACH__) && 1
# include <xlocale.h>
#endif
/* The LC_MESSAGES locale category is the category used by the functions
gettext() and dgettext(). It is specified in POSIX, but not in ANSI C.
On systems that don't define it, use an arbitrary value instead.
On Solaris, <locale.h> defines __LOCALE_H (or _LOCALE_H in Solaris 2.5)
then includes <libintl.h> (i.e. this file!) and then only defines
LC_MESSAGES. To avoid a redefinition warning, don't define LC_MESSAGES
in this case. */
#if !defined LC_MESSAGES && !(defined __LOCALE_H || (defined _LOCALE_H && defined __sun))
# define LC_MESSAGES 1729
#endif
/* We define an additional symbol to signal that we use the GNU
implementation of gettext. */
#define __USE_GNU_GETTEXT 1
/* Provide information about the supported file formats. Returns the
maximum minor revision number supported for a given major revision. */
#define __GNU_GETTEXT_SUPPORTED_REVISION(major) \
((major) == 0 || (major) == 1 ? 1 : -1)
/* Resolve a platform specific conflict on DJGPP. GNU gettext takes
precedence over _conio_gettext. */
#ifdef __DJGPP__
# undef gettext
#endif
#ifdef __cplusplus
extern "C" {
#endif
/* Version number: (major<<16) + (minor<<8) + subminor */
#define LIBINTL_VERSION 0x001201
extern int libintl_version;
/* We redirect the functions to those prefixed with "libintl_". This is
necessary, because some systems define gettext/textdomain/... in the C
library (namely, Solaris 2.4 and newer, and GNU libc 2.0 and newer).
If we used the unprefixed names, there would be cases where the
definition in the C library would override the one in the libintl.so
shared library. Recall that on ELF systems, the symbols are looked
up in the following order:
1. in the executable,
2. in the shared libraries specified on the link command line, in order,
3. in the dependencies of the shared libraries specified on the link
command line,
4. in the dlopen()ed shared libraries, in the order in which they were
dlopen()ed.
The definition in the C library would override the one in libintl.so if
either
* -lc is given on the link command line and -lintl isn't, or
* -lc is given on the link command line before -lintl, or
* libintl.so is a dependency of a dlopen()ed shared library but not
linked to the executable at link time.
Since Solaris gettext() behaves differently than GNU gettext(), this
would be unacceptable.
The redirection happens by default through macros in C, so that &gettext
is independent of the compilation unit, but through inline functions in
C++, in order not to interfere with the name mangling of class fields or
class methods called 'gettext'. */
/* The user can define _INTL_REDIRECT_INLINE or _INTL_REDIRECT_MACROS.
If he doesn't, we choose the method. A third possible method is
_INTL_REDIRECT_ASM, supported only by GCC. */
#if !(defined _INTL_REDIRECT_INLINE || defined _INTL_REDIRECT_MACROS)
# if defined __GNUC__ && __GNUC__ >= 2 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1) && !defined __MINGW32__ && !(__GNUC__ == 2 && defined _AIX) && (defined __STDC__ || defined __cplusplus)
# define _INTL_REDIRECT_ASM
# else
# ifdef __cplusplus
# define _INTL_REDIRECT_INLINE
# else
# define _INTL_REDIRECT_MACROS
# endif
# endif
#endif
/* Auxiliary macros. */
#ifdef _INTL_REDIRECT_ASM
# define _INTL_ASM(cname) __asm__ (_INTL_ASMNAME (__USER_LABEL_PREFIX__, #cname))
# define _INTL_ASMNAME(prefix,cnamestring) _INTL_STRINGIFY (prefix) cnamestring
# define _INTL_STRINGIFY(prefix) #prefix
#else
# define _INTL_ASM(cname)
#endif
/* _INTL_MAY_RETURN_STRING_ARG(n) declares that the given function may return
its n-th argument literally. This enables GCC to warn for example about
printf (gettext ("foo %y")). */
#if defined __GNUC__ && __GNUC__ >= 3 && !(defined __APPLE_CC__ && __APPLE_CC__ > 1 && defined __cplusplus)
# define _INTL_MAY_RETURN_STRING_ARG(n) __attribute__ ((__format_arg__ (n)))
#else
# define _INTL_MAY_RETURN_STRING_ARG(n)
#endif
/* Look up MSGID in the current default message catalog for the current
LC_MESSAGES locale. If not found, returns MSGID itself (the default
text). */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_gettext (const char *__msgid)
_INTL_MAY_RETURN_STRING_ARG (1);
static inline char *gettext (const char *__msgid)
{
return libintl_gettext (__msgid);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define gettext libintl_gettext
#endif
extern char *gettext (const char *__msgid)
_INTL_ASM (libintl_gettext)
_INTL_MAY_RETURN_STRING_ARG (1);
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current
LC_MESSAGES locale. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_dgettext (const char *__domainname, const char *__msgid)
_INTL_MAY_RETURN_STRING_ARG (2);
static inline char *dgettext (const char *__domainname, const char *__msgid)
{
return libintl_dgettext (__domainname, __msgid);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dgettext libintl_dgettext
#endif
extern char *dgettext (const char *__domainname, const char *__msgid)
_INTL_ASM (libintl_dgettext)
_INTL_MAY_RETURN_STRING_ARG (2);
#endif
/* Look up MSGID in the DOMAINNAME message catalog for the current CATEGORY
locale. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_dcgettext (const char *__domainname, const char *__msgid,
int __category)
_INTL_MAY_RETURN_STRING_ARG (2);
static inline char *dcgettext (const char *__domainname, const char *__msgid,
int __category)
{
return libintl_dcgettext (__domainname, __msgid, __category);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dcgettext libintl_dcgettext
#endif
extern char *dcgettext (const char *__domainname, const char *__msgid,
int __category)
_INTL_ASM (libintl_dcgettext)
_INTL_MAY_RETURN_STRING_ARG (2);
#endif
/* Similar to `gettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
static inline char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
{
return libintl_ngettext (__msgid1, __msgid2, __n);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define ngettext libintl_ngettext
#endif
extern char *ngettext (const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_ASM (libintl_ngettext)
_INTL_MAY_RETURN_STRING_ARG (1) _INTL_MAY_RETURN_STRING_ARG (2);
#endif
/* Similar to `dgettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
static inline char *dngettext (const char *__domainname, const char *__msgid1,
const char *__msgid2, unsigned long int __n)
{
return libintl_dngettext (__domainname, __msgid1, __msgid2, __n);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dngettext libintl_dngettext
#endif
extern char *dngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n)
_INTL_ASM (libintl_dngettext)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
#endif
/* Similar to `dcgettext' but select the plural form corresponding to the
number N. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
static inline char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
{
return libintl_dcngettext (__domainname, __msgid1, __msgid2, __n, __category);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define dcngettext libintl_dcngettext
#endif
extern char *dcngettext (const char *__domainname,
const char *__msgid1, const char *__msgid2,
unsigned long int __n, int __category)
_INTL_ASM (libintl_dcngettext)
_INTL_MAY_RETURN_STRING_ARG (2) _INTL_MAY_RETURN_STRING_ARG (3);
#endif
/* Set the current default message catalog to DOMAINNAME.
If DOMAINNAME is null, return the current default.
If DOMAINNAME is "", reset to the default of "messages". */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_textdomain (const char *__domainname);
static inline char *textdomain (const char *__domainname)
{
return libintl_textdomain (__domainname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define textdomain libintl_textdomain
#endif
extern char *textdomain (const char *__domainname)
_INTL_ASM (libintl_textdomain);
#endif
/* Specify that the DOMAINNAME message catalog will be found
in DIRNAME rather than in the system locale data base. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_bindtextdomain (const char *__domainname,
const char *__dirname);
static inline char *bindtextdomain (const char *__domainname,
const char *__dirname)
{
return libintl_bindtextdomain (__domainname, __dirname);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define bindtextdomain libintl_bindtextdomain
#endif
extern char *bindtextdomain (const char *__domainname, const char *__dirname)
_INTL_ASM (libintl_bindtextdomain);
#endif
/* Specify the character encoding in which the messages from the
DOMAINNAME message catalog will be returned. */
#ifdef _INTL_REDIRECT_INLINE
extern char *libintl_bind_textdomain_codeset (const char *__domainname,
const char *__codeset);
static inline char *bind_textdomain_codeset (const char *__domainname,
const char *__codeset)
{
return libintl_bind_textdomain_codeset (__domainname, __codeset);
}
#else
#ifdef _INTL_REDIRECT_MACROS
# define bind_textdomain_codeset libintl_bind_textdomain_codeset
#endif
extern char *bind_textdomain_codeset (const char *__domainname,
const char *__codeset)
_INTL_ASM (libintl_bind_textdomain_codeset);
#endif
/* Support for format strings with positions in *printf(), following the
POSIX/XSI specification.
Note: These replacements for the *printf() functions are visible only
in source files that #include <libintl.h> or #include "gettext.h".
Packages that use *printf() in source files that don't refer to _()
or gettext() but for which the format string could be the return value
of _() or gettext() need to add this #include. Oh well. */
#if !1
#include <stdio.h>
#include <stddef.h>
/* Get va_list. */
#if (defined __STDC__ && __STDC__) || defined __cplusplus || defined _MSC_VER
# include <stdarg.h>
#else
# include <varargs.h>
#endif
#if !(defined fprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef fprintf
#define fprintf libintl_fprintf
extern int fprintf (FILE *, const char *, ...);
#endif
#if !(defined vfprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vfprintf
#define vfprintf libintl_vfprintf
extern int vfprintf (FILE *, const char *, va_list);
#endif
#if !(defined printf && defined _GL_STDIO_H) /* don't override gnulib */
#undef printf
#if defined __NetBSD__ || defined __BEOS__ || defined __CYGWIN__ || defined __MINGW32__
/* Don't break __attribute__((format(printf,M,N))).
This redefinition is only possible because the libc in NetBSD, Cygwin,
mingw does not have a function __printf__.
Alternatively, we could have done this redirection only when compiling with
__GNUC__, together with a symbol redirection:
extern int printf (const char *, ...)
__asm__ (#__USER_LABEL_PREFIX__ "libintl_printf");
But doing it now would introduce a binary incompatibility with already
distributed versions of libintl on these systems. */
# define libintl_printf __printf__
#endif
#define printf libintl_printf
extern int printf (const char *, ...);
#endif
#if !(defined vprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vprintf
#define vprintf libintl_vprintf
extern int vprintf (const char *, va_list);
#endif
#if !(defined sprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef sprintf
#define sprintf libintl_sprintf
extern int sprintf (char *, const char *, ...);
#endif
#if !(defined vsprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vsprintf
#define vsprintf libintl_vsprintf
extern int vsprintf (char *, const char *, va_list);
#endif
#if 1
#if !(defined snprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef snprintf
#define snprintf libintl_snprintf
extern int snprintf (char *, size_t, const char *, ...);
#endif
#if !(defined vsnprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vsnprintf
#define vsnprintf libintl_vsnprintf
extern int vsnprintf (char *, size_t, const char *, va_list);
#endif
#endif
#if 1
#if !(defined asprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef asprintf
#define asprintf libintl_asprintf
extern int asprintf (char **, const char *, ...);
#endif
#if !(defined vasprintf && defined _GL_STDIO_H) /* don't override gnulib */
#undef vasprintf
#define vasprintf libintl_vasprintf
extern int vasprintf (char **, const char *, va_list);
#endif
#endif
#if 0
#undef fwprintf
#define fwprintf libintl_fwprintf
extern int fwprintf (FILE *, const wchar_t *, ...);
#undef vfwprintf
#define vfwprintf libintl_vfwprintf
extern int vfwprintf (FILE *, const wchar_t *, va_list);
#undef wprintf
#define wprintf libintl_wprintf
extern int wprintf (const wchar_t *, ...);
#undef vwprintf
#define vwprintf libintl_vwprintf
extern int vwprintf (const wchar_t *, va_list);
#undef swprintf
#define swprintf libintl_swprintf
extern int swprintf (wchar_t *, size_t, const wchar_t *, ...);
#undef vswprintf
#define vswprintf libintl_vswprintf
extern int vswprintf (wchar_t *, size_t, const wchar_t *, va_list);
#endif
#endif
/* Support for the locale chosen by the user. */
#if (defined __APPLE__ && defined __MACH__) || defined _WIN32 || defined __WIN32__ || defined __CYGWIN__
#undef setlocale
#define setlocale libintl_setlocale
extern char *setlocale (int, const char *);
#if 1
#undef newlocale
#define newlocale libintl_newlocale
extern locale_t newlocale (int, const char *, locale_t);
#endif
#endif
/* Support for relocatable packages. */
/* Sets the original and the current installation prefix of the package.
Relocation simply replaces a pathname starting with the original prefix
by the corresponding pathname with the current prefix instead. Both
prefixes should be directory names without trailing slash (i.e. use ""
instead of "/"). */
#define libintl_set_relocation_prefix libintl_set_relocation_prefix
extern void
libintl_set_relocation_prefix (const char *orig_prefix,
const char *curr_prefix);
#ifdef __cplusplus
}
#endif
#endif /* libintl.h */
source/xcode/Frameworks/INTL.framework/Versions/A/INTL
BIN
View File
Binary file not shown.
source/xcode/Frameworks/INTL.framework/Versions/A/Resources/English.lproj/InfoPlist.strings
BIN
View File
Binary file not shown.
source/xcode/Frameworks/INTL.framework/Versions/A/Resources/Info.plist
-22
View File
@@ -1,22 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
<key>CFBundleDevelopmentRegion</key>
<string>English</string>
<key>CFBundleExecutable</key>
<string>INTL</string>
<key>CFBundleIdentifier</key>
<string>com.fsf.INTL</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundleName</key>
<string>INTL</string>
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>0.18.1.1</string>
</dict>
</plist>
source/xcode/Frameworks/INTL.framework/Versions/Current
-1
View File
@@ -1 +0,0 @@
A
source/xcode/assaultcube.xcodeproj/project.pbxproj
-16
View File
@@ -32,10 +32,8 @@
66899E770C14862300927C34 /* macutils.mm in Sources */ = {isa = PBXBuildFile; fileRef = 66899E760C14862300927C34 /* macutils.mm */; };
9E595539121EA8E9005ED5F7 /* crypto.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 9E595536121EA8E9005ED5F7 /* crypto.cpp */; };
9EAE4C10120F2F370041E6E4 /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 9EAE4BD8120F2D0A0041E6E4 /* Localizable.strings */; };
9EB8171A11ED9AEF00799589 /* INTL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EB8171211ED9AEF00799589 /* INTL.framework */; };
9EB8171C11ED9AEF00799589 /* Ogg.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EB8171411ED9AEF00799589 /* Ogg.framework */; };
9EB8172111ED9AEF00799589 /* Vorbis.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9EB8171911ED9AEF00799589 /* Vorbis.framework */; };
9EB8179311ED9EDF00799589 /* INTL.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171211ED9AEF00799589 /* INTL.framework */; };
9EB8179511ED9EDF00799589 /* Ogg.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171411ED9AEF00799589 /* Ogg.framework */; };
9EB8179A11ED9EDF00799589 /* Vorbis.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 9EB8171911ED9AEF00799589 /* Vorbis.framework */; };
9EB8181D11EDA56D00799589 /* assaultcube.icns in Resources */ = {isa = PBXBuildFile; fileRef = 9EB817DE11EDA3A300799589 /* assaultcube.icns */; };
@@ -76,7 +74,6 @@
B914CEBF11CAC42F009BA307 /* serverbrowser.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7011CAC42F009BA307 /* serverbrowser.cpp */; };
B914CEC411CAC42F009BA307 /* serverms.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7511CAC42F009BA307 /* serverms.cpp */; };
B914CEC511CAC42F009BA307 /* shadow.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7611CAC42F009BA307 /* shadow.cpp */; };
B914CEC611CAC42F009BA307 /* sound.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7711CAC42F009BA307 /* sound.cpp */; };
B914CEC811CAC42F009BA307 /* soundlocation.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7911CAC42F009BA307 /* soundlocation.cpp */; };
B914CEC911CAC42F009BA307 /* soundscheduler.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7A11CAC42F009BA307 /* soundscheduler.cpp */; };
B914CECA11CAC42F009BA307 /* stream.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE7B11CAC42F009BA307 /* stream.cpp */; };
@@ -97,7 +94,6 @@
B96D0D590920970C00B6C936 /* Launcher.m in Sources */ = {isa = PBXBuildFile; fileRef = B96D0D580920970C00B6C936 /* Launcher.m */; };
B96D0D630920971300B6C936 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = B96D0D5A0920971300B6C936 /* MainMenu.nib */; };
B96D0D6D0920976E00B6C936 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = B96D0D6C0920976E00B6C936 /* main.m */; };
B9EF952411CEE3D300B773C1 /* i18n.cpp in Sources */ = {isa = PBXBuildFile; fileRef = B914CE5111CAC42F009BA307 /* i18n.cpp */; };
B9FA3B7D0DD9E6E400581F8D /* OpenAL.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = B9FA3B7C0DD9E6E400581F8D /* OpenAL.framework */; };
/* End PBXBuildFile section */
@@ -121,7 +117,6 @@
4F9390711A15985A0049877C /* SDL_image.framework in CopyFiles */,
4FEAF3391A147FAE00B42D47 /* SDL.framework in CopyFiles */,
4FEAF3341A1475E600B42D47 /* libcurl.framework in CopyFiles */,
9EB8179311ED9EDF00799589 /* INTL.framework in CopyFiles */,
9EB8179511ED9EDF00799589 /* Ogg.framework in CopyFiles */,
9EB8179A11ED9EDF00799589 /* Vorbis.framework in CopyFiles */,
);
@@ -164,7 +159,6 @@
9E595536121EA8E9005ED5F7 /* crypto.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = crypto.cpp; sourceTree = "<group>"; };
9E595538121EA8E9005ED5F7 /* crypto_tools.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = crypto_tools.h; sourceTree = "<group>"; };
9EAE4BD9120F2D0A0041E6E4 /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/Localizable.strings; sourceTree = "<group>"; };
9EB8171211ED9AEF00799589 /* INTL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = INTL.framework; path = Frameworks/INTL.framework; sourceTree = "<group>"; };
9EB8171411ED9AEF00799589 /* Ogg.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Ogg.framework; path = Frameworks/Ogg.framework; sourceTree = "<group>"; };
9EB8171511ED9AEF00799589 /* SDL.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL.framework; path = Frameworks/SDL.framework; sourceTree = "<group>"; };
9EB8171611ED9AEF00799589 /* SDL_image.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = SDL_image.framework; path = Frameworks/SDL_image.framework; sourceTree = "<group>"; };
@@ -189,8 +183,6 @@
B914CE4D11CAC42F009BA307 /* entity.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = entity.h; sourceTree = "<group>"; };
B914CE4E11CAC42F009BA307 /* geom.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = geom.h; sourceTree = "<group>"; };
B914CE5011CAC42F009BA307 /* hudgun.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = hudgun.h; sourceTree = "<group>"; };
B914CE5111CAC42F009BA307 /* i18n.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = i18n.cpp; sourceTree = "<group>"; };
B914CE5211CAC42F009BA307 /* i18n.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = i18n.h; sourceTree = "<group>"; };
B914CE5311CAC42F009BA307 /* log.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = log.cpp; sourceTree = "<group>"; };
B914CE5411CAC42F009BA307 /* main.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = main.cpp; sourceTree = "<group>"; };
B914CE5611CAC42F009BA307 /* md2.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = md2.h; sourceTree = "<group>"; };
@@ -226,7 +218,6 @@
B914CE7411CAC42F009BA307 /* serverfiles.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = serverfiles.h; sourceTree = "<group>"; };
B914CE7511CAC42F009BA307 /* serverms.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = serverms.cpp; sourceTree = "<group>"; };
B914CE7611CAC42F009BA307 /* shadow.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = shadow.cpp; sourceTree = "<group>"; };
B914CE7711CAC42F009BA307 /* sound.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = sound.cpp; sourceTree = "<group>"; };
B914CE7811CAC42F009BA307 /* sound.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = sound.h; sourceTree = "<group>"; };
B914CE7911CAC42F009BA307 /* soundlocation.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundlocation.cpp; sourceTree = "<group>"; };
B914CE7A11CAC42F009BA307 /* soundscheduler.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = soundscheduler.cpp; sourceTree = "<group>"; };
@@ -272,7 +263,6 @@
4FEAF3331A14757700B42D47 /* libcurl.framework in Frameworks */,
B9FA3B7D0DD9E6E400581F8D /* OpenAL.framework in Frameworks */,
B94198C409207E810029DAD1 /* OpenGL.framework in Frameworks */,
9EB8171A11ED9AEF00799589 /* INTL.framework in Frameworks */,
9EB8171C11ED9AEF00799589 /* Ogg.framework in Frameworks */,
9EB8172111ED9AEF00799589 /* Vorbis.framework in Frameworks */,
);
@@ -306,7 +296,6 @@
1058C7A0FEA54F0111CA2CBB /* Linked Frameworks */ = {
isa = PBXGroup;
children = (
9EB8171211ED9AEF00799589 /* INTL.framework */,
9EB8171411ED9AEF00799589 /* Ogg.framework */,
9EB8171911ED9AEF00799589 /* Vorbis.framework */,
9EB8171511ED9AEF00799589 /* SDL.framework */,
@@ -421,8 +410,6 @@
B914CE4D11CAC42F009BA307 /* entity.h */,
B914CE4E11CAC42F009BA307 /* geom.h */,
B914CE5011CAC42F009BA307 /* hudgun.h */,
B914CE5111CAC42F009BA307 /* i18n.cpp */,
B914CE5211CAC42F009BA307 /* i18n.h */,
9EFB9B6E12634B1600FCE687 /* jpegenc.h */,
B914CE5311CAC42F009BA307 /* log.cpp */,
B914CE5411CAC42F009BA307 /* main.cpp */,
@@ -459,7 +446,6 @@
B914CE7411CAC42F009BA307 /* serverfiles.h */,
B914CE7511CAC42F009BA307 /* serverms.cpp */,
B914CE7611CAC42F009BA307 /* shadow.cpp */,
B914CE7711CAC42F009BA307 /* sound.cpp */,
B914CE7811CAC42F009BA307 /* sound.h */,
B914CE7911CAC42F009BA307 /* soundlocation.cpp */,
B914CE7A11CAC42F009BA307 /* soundscheduler.cpp */,
@@ -670,7 +656,6 @@
B914CEBF11CAC42F009BA307 /* serverbrowser.cpp in Sources */,
B914CEC411CAC42F009BA307 /* serverms.cpp in Sources */,
B914CEC511CAC42F009BA307 /* shadow.cpp in Sources */,
B914CEC611CAC42F009BA307 /* sound.cpp in Sources */,
B914CEC811CAC42F009BA307 /* soundlocation.cpp in Sources */,
B914CEC911CAC42F009BA307 /* soundscheduler.cpp in Sources */,
B914CECA11CAC42F009BA307 /* stream.cpp in Sources */,
@@ -685,7 +670,6 @@
B914CEDA11CAC42F009BA307 /* worldocull.cpp in Sources */,
B914CEDB11CAC42F009BA307 /* worldrender.cpp in Sources */,
B914CEDC11CAC42F009BA307 /* zip.cpp in Sources */,
B9EF952411CEE3D300B773C1 /* i18n.cpp in Sources */,
9E595539121EA8E9005ED5F7 /* crypto.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;