mirror of
https://github.com/irssi/irssi.git
synced 2025-01-03 14:56:47 -05:00
Getting rid of gettext, moved some _(..) texts to themes and left some error
messages hard coded. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1503 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen
cras
parent
fe5c94b050
commit
c2b2d45bd6
@ -13,7 +13,7 @@ if BUILD_SERVERTEST
|
||||
SERVERTEST=servertest
|
||||
endif
|
||||
|
||||
SUBDIRS = po intl src $(SERVERTEST) docs scripts
|
||||
SUBDIRS = src $(SERVERTEST) docs scripts
|
||||
|
||||
confdir = $(sysconfdir)/irssi
|
||||
conf_DATA = config default.theme colorless.theme
|
||||
|
||||
22
autogen.sh
22
autogen.sh
@ -19,10 +19,6 @@ echo "/* automatically created by autogen.sh */" > irssi-version.h.in
|
||||
echo "#define IRSSI_VERSION \"@VERSION@\"" >> irssi-version.h.in
|
||||
echo "#define IRSSI_VERSION_DATE \"$version_date\"" >> irssi-version.h.in
|
||||
|
||||
# create POTFILES.in
|
||||
echo "Updating POTFILES.in..."
|
||||
find src -name '*.c'|grep -v 'src/perl/.*/' > po/POTFILES.in
|
||||
|
||||
# create help files
|
||||
echo "Creating help files..."
|
||||
perl syntax.pl
|
||||
@ -60,16 +56,6 @@ DIE=0
|
||||
}
|
||||
}
|
||||
|
||||
grep "^AM_GNU_GETTEXT" $srcdir/configure.in >/dev/null && {
|
||||
(gettextize --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`gettext' installed to compile $PKG_NAME."
|
||||
echo "Get ftp://alpha.gnu.org/gnu/gettext-0.10.35.tar.gz"
|
||||
echo "(or a newer version if it is available)"
|
||||
DIE=1
|
||||
}
|
||||
}
|
||||
|
||||
(automake --version) < /dev/null > /dev/null 2>&1 || {
|
||||
echo
|
||||
echo "**Error**: You must have \`automake' installed to compile $PKG_NAME."
|
||||
@ -107,14 +93,6 @@ xlc )
|
||||
esac
|
||||
|
||||
rm -f aclocal.m4
|
||||
if grep "^AM_GNU_GETTEXT" configure.in >/dev/null; then
|
||||
echo "Creating aclocal.m4 ..."
|
||||
test -r aclocal.m4 || touch aclocal.m4
|
||||
echo "Running gettextize... Ignore non-fatal messages."
|
||||
echo "no" | gettextize --force --copy
|
||||
echo "Making aclocal.m4 writable ..."
|
||||
test -r aclocal.m4 && chmod u+w aclocal.m4
|
||||
fi
|
||||
if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then
|
||||
echo "Running libtoolize..."
|
||||
libtoolize --force --copy
|
||||
|
||||
19
configure.in
19
configure.in
@ -364,6 +364,7 @@ cat > conftest.c <<EOF
|
||||
#include <math.h>
|
||||
int modfunc(void){return (int)floor(1.2);}
|
||||
EOF
|
||||
|
||||
./libtool --mode=compile $CC $CFLAGS -c conftest.c 2> /dev/null > /dev/null
|
||||
if test ! -s conftest.lo; then
|
||||
AC_ERROR([error compiling test module])
|
||||
@ -667,22 +668,6 @@ done
|
||||
|
||||
FE_COMMON_LIBS="$FE_COMMON_LIBS../fe-common/core/libfe_common_core.a"
|
||||
|
||||
dnl **
|
||||
dnl ** internationalization support
|
||||
dnl **
|
||||
|
||||
ALL_LINGUAS="pl pt_BR fr de sv"
|
||||
AM_GNU_GETTEXT
|
||||
|
||||
dnl stupid gettext.. we must not leave the po/ dir from SUBDIRS or
|
||||
dnl "make dist" doesn't work, and po/Makefile doesn't check if MSGFMT
|
||||
dnl exists or not, so instead of failing in po/ dir if there's no msgfmt,
|
||||
dnl we just do some stupid echos.
|
||||
if test "x$MSGFMT" = "xno"; then
|
||||
MSGFMT=echo
|
||||
GMSGFMT=echo
|
||||
fi
|
||||
|
||||
dnl ** common libraries needed by frontends
|
||||
COMMON_NOUI_LIBS="$CHAT_LIBS $CORE_LIBS $INTLLIBS"
|
||||
COMMON_LIBS="$FE_COMMON_LIBS $COMMON_NOUI_LIBS"
|
||||
@ -716,8 +701,6 @@ fi
|
||||
|
||||
AC_OUTPUT(
|
||||
Makefile
|
||||
po/Makefile.in
|
||||
intl/Makefile
|
||||
src/Makefile
|
||||
src/core/Makefile
|
||||
src/irc/Makefile
|
||||
|
||||
@ -1,10 +0,0 @@
|
||||
*.gmo
|
||||
*.mo
|
||||
Makefile
|
||||
Makefile.in
|
||||
Makefile.in.in
|
||||
POTFILES
|
||||
POTFILES.in
|
||||
cat-id-tbl.c
|
||||
irssi.pot
|
||||
stamp-cat-id
|
||||
164
po/de.po
164
po/de.po
@ -1,164 +0,0 @@
|
||||
# Germanc translation of Irssi
|
||||
# Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
# Thomas Heinen <cochi@uni-paderborn.de>, 2000.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: Irssi 0.7.23\n"
|
||||
"POT-Creation-Date: 2001-02-22 10:49+0200\n"
|
||||
"PO-Revision-Date: 1999-12-01 10:35-0200\n"
|
||||
"Last-Translator: Thomas Heinen <cochi@uni-paderborn.de>\n"
|
||||
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8-bit\n"
|
||||
|
||||
#: src/core/args.c:55
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of available command line options.\n"
|
||||
msgstr ""
|
||||
"Fehler in Option %s: %s. \n"
|
||||
"Benutzen Sie '%s --help' fuer eine Liste verfuegbarer Optionen.\n"
|
||||
|
||||
#. Display the text when we have already waited
|
||||
#. for a while
|
||||
#: src/core/net-disconnect.c:150
|
||||
msgid "Please wait, waiting for servers to close connections..\n"
|
||||
msgstr "Bitte warten, schliesse Serververbindungen..\n"
|
||||
|
||||
#: src/core/network.c:507
|
||||
msgid "Host not found"
|
||||
msgstr "Host nicht gefunden"
|
||||
|
||||
#: src/core/network.c:509
|
||||
msgid "No IP address found for name"
|
||||
msgstr "Keine IP Adresse zum Namen gefunden"
|
||||
|
||||
#: src/core/network.c:511
|
||||
msgid "A non-recovable name server error occurred"
|
||||
msgstr "Ein nicht behebbarer Nameserverfehler ist aufgetreten"
|
||||
|
||||
#: src/core/network.c:513
|
||||
msgid "A temporary error on an authoritative name server"
|
||||
msgstr "Temporaerer Fehler des authoritativen Nameservers"
|
||||
|
||||
#: src/core/settings.c:494
|
||||
#, fuzzy, c-format
|
||||
msgid "Couldn't create %s directory"
|
||||
msgstr ""
|
||||
"Datei kann nicht erzeugt werden:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:497
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:534
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:564
|
||||
#, fuzzy, c-format
|
||||
msgid "Couldn't save configuration file: %s"
|
||||
msgstr ""
|
||||
"Datei kann nicht erzeugt werden:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:585
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Configuration file was modified while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. Use /SAVE or /RELOAD to get rid of this "
|
||||
"message."
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
msgid "Automatically connect to server/ircnet"
|
||||
msgstr "Automatisch verbinden mit Server/IRCNet"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "SERVER"
|
||||
msgstr "SERVER"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "Autoconnect password"
|
||||
msgstr "Autoconnect Passwort"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "Autoconnect port"
|
||||
msgstr "Autoconnect Port"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "PORT"
|
||||
msgstr "PORT"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:125
|
||||
msgid "Disable autoconnecting"
|
||||
msgstr "Autoconnect deaktivieren"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:126
|
||||
msgid "Specify nick to use"
|
||||
msgstr "Bitte Nickname angeben"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:127
|
||||
#, fuzzy
|
||||
msgid "Specify host name to use"
|
||||
msgstr "Bitte Nickname angeben"
|
||||
|
||||
#: src/fe-common/core/printtext.c:417
|
||||
msgid "%_Warning:%_ %s"
|
||||
msgstr "%_Warnung:%_ %s"
|
||||
|
||||
#: src/fe-common/core/printtext.c:419
|
||||
msgid "%_Error:%_ %s"
|
||||
msgstr "%_Fehler:%_ %s"
|
||||
|
||||
#: src/fe-common/core/themes.c:735
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in theme %s:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:262
|
||||
msgid "Y"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:281
|
||||
msgid "Overwrite config (y/N)?"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/irc/fe-irc-commands.c:418
|
||||
msgid "Operator password:"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-text/irssi.c:281
|
||||
msgid "Can't initialize screen handling, quitting.\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/lib-popt/popthelp.c:24
|
||||
#, fuzzy
|
||||
msgid "Show this help message"
|
||||
msgstr "Keine externen Nachrichten"
|
||||
|
||||
#: src/lib-popt/popthelp.c:25
|
||||
#, fuzzy
|
||||
msgid "Display brief usage message"
|
||||
msgstr "private Nachrichten"
|
||||
169
po/fr.po
169
po/fr.po
@ -1,169 +0,0 @@
|
||||
# French translation of irssi
|
||||
# Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
# Frédéric L. W. Meunier <0@pervalidus.net>, 2000.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: irssi 0.7.97.1\n"
|
||||
"POT-Creation-Date: 2001-02-22 10:49+0200\n"
|
||||
"PO-Revision-Date: 2000-12-05 09:21-0200\n"
|
||||
"Last-Translator: Frédéric L. W. Meunier <0@pervalidus.net>\n"
|
||||
"Language-Team: French <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: src/core/args.c:55
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of available command line options.\n"
|
||||
msgstr ""
|
||||
"Erreur dans l'option %s: %s.\n"
|
||||
"Utilisez '%s --help' pour voir une liste complète d'options de ligne de "
|
||||
"commande disponibles.\n"
|
||||
|
||||
#. Display the text when we have already waited
|
||||
#. for a while
|
||||
#: src/core/net-disconnect.c:150
|
||||
msgid "Please wait, waiting for servers to close connections..\n"
|
||||
msgstr ""
|
||||
"Attendez s'il vous plaît, en attendant serveurs pour fermer connexions..\n"
|
||||
|
||||
#: src/core/network.c:507
|
||||
msgid "Host not found"
|
||||
msgstr "Host non trouvé"
|
||||
|
||||
#: src/core/network.c:509
|
||||
msgid "No IP address found for name"
|
||||
msgstr "Aucunne adresse IP trouvée pour nom"
|
||||
|
||||
#: src/core/network.c:511
|
||||
msgid "A non-recovable name server error occurred"
|
||||
msgstr "Une erreur non réparable de serveur de noms s'est produite"
|
||||
|
||||
#: src/core/network.c:513
|
||||
msgid "A temporary error on an authoritative name server"
|
||||
msgstr "Une erreur provisoire sur un serveur de noms bien fondé"
|
||||
|
||||
#: src/core/settings.c:494
|
||||
#, fuzzy, c-format
|
||||
msgid "Couldn't create %s directory"
|
||||
msgstr "Je n'ai pas pu créer le répertoire %s/.irssi"
|
||||
|
||||
#: src/core/settings.c:497
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi"
|
||||
msgstr ""
|
||||
"%s/.irssi n'est pas un répertoire.\n"
|
||||
"Vous devez le retirer avec la commande: rm ~/.irssi"
|
||||
|
||||
#: src/core/settings.c:509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Erreurs ignorées dans le fichier de configuration:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:534
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Erreurs dans le fichier de configuration:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:564
|
||||
#, c-format
|
||||
msgid "Couldn't save configuration file: %s"
|
||||
msgstr "Je n'ai pas pu sauvegarder le fichier de configuration: %s"
|
||||
|
||||
#: src/core/settings.c:585
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"Configuration file was modified while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. Use /SAVE or /RELOAD to get rid of this "
|
||||
"message."
|
||||
msgstr ""
|
||||
"Le fichier de configuration a été modifié tandis que irssi fonctionnait. "
|
||||
"Sauvegarde de la configuration dans le fichier '%s'"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
msgid "Automatically connect to server/ircnet"
|
||||
msgstr "Automatiquement connecter au serveur/ircnet"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "SERVER"
|
||||
msgstr "SERVEUR"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "Autoconnect password"
|
||||
msgstr "Mot de passe pour autoconnexion"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "Autoconnect port"
|
||||
msgstr "Porte pour autoconnexion"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "PORT"
|
||||
msgstr "PORTE"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:125
|
||||
msgid "Disable autoconnecting"
|
||||
msgstr "Invalider autoconnexion"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:126
|
||||
msgid "Specify nick to use"
|
||||
msgstr "Spécifier nick à utiliser"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:127
|
||||
msgid "Specify host name to use"
|
||||
msgstr "Spécifier nom de host à utiliser"
|
||||
|
||||
#: src/fe-common/core/printtext.c:417
|
||||
msgid "%_Warning:%_ %s"
|
||||
msgstr "%_Attention:%_ %s"
|
||||
|
||||
#: src/fe-common/core/printtext.c:419
|
||||
msgid "%_Error:%_ %s"
|
||||
msgstr "%_Erreur:%_ %s"
|
||||
|
||||
#: src/fe-common/core/themes.c:735
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"Ignored errors in theme %s:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Erreurs ignorées dans le thème:\n"
|
||||
"%s"
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:262
|
||||
msgid "Y"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:281
|
||||
msgid "Overwrite config (y/N)?"
|
||||
msgstr "Recouvrer config (y/N)?"
|
||||
|
||||
#: src/fe-common/irc/fe-irc-commands.c:418
|
||||
msgid "Operator password:"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-text/irssi.c:281
|
||||
msgid "Can't initialize screen handling, quitting.\n"
|
||||
msgstr "Je ne peut pas initialiser la manipulation d'écran, quitter.\n"
|
||||
|
||||
#: src/lib-popt/popthelp.c:24
|
||||
msgid "Show this help message"
|
||||
msgstr "Montrer ce message d'aide"
|
||||
|
||||
#: src/lib-popt/popthelp.c:25
|
||||
msgid "Display brief usage message"
|
||||
msgstr "Afficher bref message d'utilisation"
|
||||
155
po/pl.po
155
po/pl.po
@ -1,155 +0,0 @@
|
||||
# SOME DESCRIPTIVE TITLE.
|
||||
# Copyright (C) YEAR Free Software Foundation, Inc.
|
||||
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: PACKAGE VERSION\n"
|
||||
"POT-Creation-Date: 2001-02-22 10:49+0200\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: ENCODING\n"
|
||||
|
||||
#: src/core/args.c:55
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of available command line options.\n"
|
||||
msgstr ""
|
||||
|
||||
#. Display the text when we have already waited
|
||||
#. for a while
|
||||
#: src/core/net-disconnect.c:150
|
||||
msgid "Please wait, waiting for servers to close connections..\n"
|
||||
msgstr "Prosze czekaæ, trwa zamykanie po³±czeñ do serwerów..\n"
|
||||
|
||||
#: src/core/network.c:507
|
||||
msgid "Host not found"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/network.c:509
|
||||
msgid "No IP address found for name"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/network.c:511
|
||||
msgid "A non-recovable name server error occurred"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/network.c:513
|
||||
msgid "A temporary error on an authoritative name server"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:494
|
||||
#, fuzzy, c-format
|
||||
msgid "Couldn't create %s directory"
|
||||
msgstr "Nie mo¿na utworzyæ katalogu %s/.irssi"
|
||||
|
||||
#: src/core/settings.c:497
|
||||
#, c-format
|
||||
msgid ""
|
||||
"%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:534
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:564
|
||||
#, c-format
|
||||
msgid "Couldn't save configuration file: %s"
|
||||
msgstr ""
|
||||
|
||||
#: src/core/settings.c:585
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Configuration file was modified while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. Use /SAVE or /RELOAD to get rid of this "
|
||||
"message."
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
msgid "Automatically connect to server/ircnet"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "SERVER"
|
||||
msgstr "SERWER"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "Autoconnect password"
|
||||
msgstr "Has³o autopo³±czenia"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "Autoconnect port"
|
||||
msgstr "Port autopo³±czenia"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "PORT"
|
||||
msgstr "PORT"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:125
|
||||
msgid "Disable autoconnecting"
|
||||
msgstr "Wy³±czenie autopo³±czenia"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:126
|
||||
msgid "Specify nick to use"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:127
|
||||
msgid "Specify host name to use"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/printtext.c:417
|
||||
msgid "%_Warning:%_ %s"
|
||||
msgstr "%_Ostrze¿enie:%_ %s"
|
||||
|
||||
#: src/fe-common/core/printtext.c:419
|
||||
msgid "%_Error:%_ %s"
|
||||
msgstr "%_B³±d:%_ %s"
|
||||
|
||||
#: src/fe-common/core/themes.c:735
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in theme %s:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:262
|
||||
msgid "Y"
|
||||
msgstr "Y"
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:281
|
||||
msgid "Overwrite config (y/N)?"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/irc/fe-irc-commands.c:418
|
||||
msgid "Operator password:"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-text/irssi.c:281
|
||||
msgid "Can't initialize screen handling, quitting.\n"
|
||||
msgstr ""
|
||||
|
||||
#: src/lib-popt/popthelp.c:24
|
||||
msgid "Show this help message"
|
||||
msgstr ""
|
||||
|
||||
#: src/lib-popt/popthelp.c:25
|
||||
msgid "Display brief usage message"
|
||||
msgstr ""
|
||||
168
po/pt_BR.po
168
po/pt_BR.po
@ -1,168 +0,0 @@
|
||||
# Brazilian Portuguese translation of irssi
|
||||
# Copyright (C) 2000 Free Software Foundation, Inc.
|
||||
# Frédéric L. W. Meunier <0@pervalidus.net>, 2000.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: irssi 0.7.97.1\n"
|
||||
"POT-Creation-Date: 2001-02-22 10:49+0200\n"
|
||||
"PO-Revision-Date: 2000-12-05 06:55-0200\n"
|
||||
"Last-Translator: Frédéric L. W. Meunier <0@pervalidus.net>\n"
|
||||
"Language-Team: Brazilian Portuguese <ldp-br@bazar.conectiva.com.br>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=ISO-8859-1\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
|
||||
#: src/core/args.c:55
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of available command line options.\n"
|
||||
msgstr ""
|
||||
"Erro na opção %s: %s.\n"
|
||||
"Use '%s --help' para ver uma lista completa de opções de linha de comando "
|
||||
"disponíveis.\n"
|
||||
|
||||
#. Display the text when we have already waited
|
||||
#. for a while
|
||||
#: src/core/net-disconnect.c:150
|
||||
msgid "Please wait, waiting for servers to close connections..\n"
|
||||
msgstr "Espere por favor, esperando servidores para fechar conexões..\n"
|
||||
|
||||
#: src/core/network.c:507
|
||||
msgid "Host not found"
|
||||
msgstr "Host não encontrado"
|
||||
|
||||
#: src/core/network.c:509
|
||||
msgid "No IP address found for name"
|
||||
msgstr "Nenhum endereço IP encontrado para nome"
|
||||
|
||||
#: src/core/network.c:511
|
||||
msgid "A non-recovable name server error occurred"
|
||||
msgstr "Um erro não recuperável de servidor de nomes ocorreu"
|
||||
|
||||
#: src/core/network.c:513
|
||||
msgid "A temporary error on an authoritative name server"
|
||||
msgstr "Um erro temporário em um servidor de nomes autoritativo"
|
||||
|
||||
#: src/core/settings.c:494
|
||||
#, fuzzy, c-format
|
||||
msgid "Couldn't create %s directory"
|
||||
msgstr "Não foi possível criar o diretório %s/.irssi"
|
||||
|
||||
#: src/core/settings.c:497
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi"
|
||||
msgstr ""
|
||||
"%s/.irssi não é um diretório.\n"
|
||||
"Você deve removê-lo com o comando: rm ~/.irssi"
|
||||
|
||||
#: src/core/settings.c:509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Ignorados erros no arquivo de configuração:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:534
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Erros no arquivo de configuração:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:564
|
||||
#, c-format
|
||||
msgid "Couldn't save configuration file: %s"
|
||||
msgstr "Não pûde salvar o arquivo de configuração: %s"
|
||||
|
||||
#: src/core/settings.c:585
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"Configuration file was modified while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. Use /SAVE or /RELOAD to get rid of this "
|
||||
"message."
|
||||
msgstr ""
|
||||
" O arquivo de configuração foi modificado enquanto o irssi estava "
|
||||
"funcionando. Salvando configuração no arquivo '%s'"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
msgid "Automatically connect to server/ircnet"
|
||||
msgstr "Automaticamente conectar no servidor/ircnet"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "SERVER"
|
||||
msgstr "SERVIDOR"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "Autoconnect password"
|
||||
msgstr "Senha para autoconexão"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "Autoconnect port"
|
||||
msgstr "Porta para autoconexão"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "PORT"
|
||||
msgstr "PORTA"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:125
|
||||
msgid "Disable autoconnecting"
|
||||
msgstr "Disabilitar autoconexão"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:126
|
||||
msgid "Specify nick to use"
|
||||
msgstr "Espeficar nick para usar"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:127
|
||||
msgid "Specify host name to use"
|
||||
msgstr "Especificar nome de host para usar"
|
||||
|
||||
#: src/fe-common/core/printtext.c:417
|
||||
msgid "%_Warning:%_ %s"
|
||||
msgstr "%_Atenção:%_ %s"
|
||||
|
||||
#: src/fe-common/core/printtext.c:419
|
||||
msgid "%_Error:%_ %s"
|
||||
msgstr "%_Erro:%_ %s"
|
||||
|
||||
#: src/fe-common/core/themes.c:735
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"Ignored errors in theme %s:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Ignorados erros no tema:\n"
|
||||
"%s"
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:262
|
||||
msgid "Y"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:281
|
||||
msgid "Overwrite config (y/N)?"
|
||||
msgstr "Sobrescrever config (y/N)?"
|
||||
|
||||
#: src/fe-common/irc/fe-irc-commands.c:418
|
||||
msgid "Operator password:"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-text/irssi.c:281
|
||||
msgid "Can't initialize screen handling, quitting.\n"
|
||||
msgstr "Não posso inicializar manipulação da tela, saindo.\n"
|
||||
|
||||
#: src/lib-popt/popthelp.c:24
|
||||
msgid "Show this help message"
|
||||
msgstr "Mostrar esta mensagem de ajuda"
|
||||
|
||||
#: src/lib-popt/popthelp.c:25
|
||||
msgid "Display brief usage message"
|
||||
msgstr "Mostrar breve mensagem de uso"
|
||||
166
po/sv.po
166
po/sv.po
@ -1,166 +0,0 @@
|
||||
# översättning av irssi till svenska
|
||||
# Copyright (C) 2000 Per von Zweigbergk
|
||||
# Per von Zweigbergk <pvz@iname.com>, 2000.
|
||||
#
|
||||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: irssi 0.7.95\n"
|
||||
"POT-Creation-Date: 2001-02-22 10:49+0200\n"
|
||||
"PO-Revision-Date: 2000-08-14 01:51+0200\n"
|
||||
"Last-Translator: Per von Zweigbergk <pvz@iname.com>\n"
|
||||
"Language-Team: Per von Zweigbergh <pvz@iname.com>\n"
|
||||
"MIME-Version: 1.0\n"
|
||||
"Content-Type: text/plain; charset=CHARSET\n"
|
||||
"Content-Transfer-Encoding: ENCODING\n"
|
||||
|
||||
#: src/core/args.c:55
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of available command line options.\n"
|
||||
msgstr ""
|
||||
"Fel vid argument %s: %s.\n"
|
||||
"Kör '%s --help' för att se en fullständig lista av tillgängliga "
|
||||
"kommandoradsväxlar.\n"
|
||||
|
||||
#. Display the text when we have already waited
|
||||
#. for a while
|
||||
#: src/core/net-disconnect.c:150
|
||||
msgid "Please wait, waiting for servers to close connections..\n"
|
||||
msgstr "Var god dröj, väntar på att servrarna ska avsluta uppkopplingarna...\n"
|
||||
|
||||
#: src/core/network.c:507
|
||||
msgid "Host not found"
|
||||
msgstr "Värdnamnet hittades inte"
|
||||
|
||||
#: src/core/network.c:509
|
||||
msgid "No IP address found for name"
|
||||
msgstr "Ingen IP-address fanns för värdnamnet"
|
||||
|
||||
#: src/core/network.c:511
|
||||
msgid "A non-recovable name server error occurred"
|
||||
msgstr "Ett allvarligt namnserverfel uppstod"
|
||||
|
||||
#: src/core/network.c:513
|
||||
msgid "A temporary error on an authoritative name server"
|
||||
msgstr "Ett tillfälligt fel på en autorativ namnserver uppstod"
|
||||
|
||||
#: src/core/settings.c:494
|
||||
#, fuzzy, c-format
|
||||
msgid "Couldn't create %s directory"
|
||||
msgstr "Kunde inte skapa katalogen %s/.irssi"
|
||||
|
||||
#: src/core/settings.c:497
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi"
|
||||
msgstr ""
|
||||
"%s/.irssi är inte en katalog.\n"
|
||||
"Du borde ta bort den med kommandot: rm ~/.irssi"
|
||||
|
||||
#: src/core/settings.c:509
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Ignored errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Ignorerade felaktigheter i konfigurationsfilen:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:534
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Errors in configuration file:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Felaktigheter i konfigurationsfilen:\n"
|
||||
"%s"
|
||||
|
||||
#: src/core/settings.c:564
|
||||
#, c-format
|
||||
msgid "Couldn't save configuration file: %s"
|
||||
msgstr "Kunde inte spara konfigurationen till konfigurationsfilen: %s"
|
||||
|
||||
#: src/core/settings.c:585
|
||||
#, c-format
|
||||
msgid ""
|
||||
"Configuration file was modified while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. Use /SAVE or /RELOAD to get rid of this "
|
||||
"message."
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
msgid "Automatically connect to server/ircnet"
|
||||
msgstr "Koppla automatiskt upp mot server/irc-nätverk"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:122
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "SERVER"
|
||||
msgstr "SERVER"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:123
|
||||
msgid "Autoconnect password"
|
||||
msgstr "Lösenord för automatisk uppkoppling"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "Autoconnect port"
|
||||
msgstr "Portnummer för automatisk uppkoppling"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:124
|
||||
msgid "PORT"
|
||||
msgstr "PORT"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:125
|
||||
msgid "Disable autoconnecting"
|
||||
msgstr "Avaktivera automatisk uppkoppling"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:126
|
||||
msgid "Specify nick to use"
|
||||
msgstr "Välj vilket nicknamn du vill använda"
|
||||
|
||||
#: src/fe-common/core/fe-common-core.c:127
|
||||
msgid "Specify host name to use"
|
||||
msgstr "Välj vilket värdnamn du vill använda"
|
||||
|
||||
#: src/fe-common/core/printtext.c:417
|
||||
msgid "%_Warning:%_ %s"
|
||||
msgstr "%_Varning:%_ %s"
|
||||
|
||||
#: src/fe-common/core/printtext.c:419
|
||||
msgid "%_Error:%_ %s"
|
||||
msgstr "%_Fel:%_ %s"
|
||||
|
||||
#: src/fe-common/core/themes.c:735
|
||||
#, fuzzy, c-format
|
||||
msgid ""
|
||||
"Ignored errors in theme %s:\n"
|
||||
"%s"
|
||||
msgstr ""
|
||||
"Ignorerade felaktigheter i tema:\n"
|
||||
"%s"
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:262
|
||||
msgid "Y"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/core/fe-settings.c:281
|
||||
msgid "Overwrite config (y/N)?"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-common/irc/fe-irc-commands.c:418
|
||||
msgid "Operator password:"
|
||||
msgstr ""
|
||||
|
||||
#: src/fe-text/irssi.c:281
|
||||
msgid "Can't initialize screen handling, quitting.\n"
|
||||
msgstr "Ett skärmhanteringsinitieringsfel uppstod, avslutar.\n"
|
||||
|
||||
#: src/lib-popt/popthelp.c:24
|
||||
msgid "Show this help message"
|
||||
msgstr "Visa det här hjälpmeddelandet"
|
||||
|
||||
#: src/lib-popt/popthelp.c:25
|
||||
msgid "Display brief usage message"
|
||||
msgstr "Visa ett kortfattat hjälpmeddelande."
|
||||
@ -11,7 +11,6 @@ PERLDIR=perl
|
||||
endif
|
||||
|
||||
noinst_HEADERS = \
|
||||
nls.h \
|
||||
common.h
|
||||
|
||||
SUBDIRS = lib-popt lib-config core irc fe-common $(PERLDIR) $(TEXTUI) $(BOTUI)
|
||||
|
||||
@ -44,7 +44,6 @@
|
||||
#endif
|
||||
|
||||
#include "core/memdebug.h"
|
||||
#include "nls.h"
|
||||
|
||||
#define g_free_not_null(a) \
|
||||
G_STMT_START { \
|
||||
|
||||
@ -52,12 +52,10 @@ void args_execute(int argc, char *argv[])
|
||||
while ((nextopt = poptGetNextOpt(con)) > 0) ;
|
||||
|
||||
if (nextopt != -1) {
|
||||
printf(_("Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of "
|
||||
"available command line options.\n"),
|
||||
poptBadOption(con, 0),
|
||||
poptStrerror(nextopt),
|
||||
argv[0]);
|
||||
printf("Error on option %s: %s.\n"
|
||||
"Run '%s --help' to see a full list of "
|
||||
"available command line options.\n",
|
||||
poptBadOption(con, 0), poptStrerror(nextopt), argv[0]);
|
||||
exit(1);
|
||||
}
|
||||
|
||||
|
||||
@ -147,8 +147,8 @@ void net_disconnect_deinit(void)
|
||||
} else if (first) {
|
||||
/* Display the text when we have already waited
|
||||
for a while */
|
||||
printf(_("Please wait, waiting for servers to close "
|
||||
"connections..\n"));
|
||||
printf("Please wait, waiting for servers to close "
|
||||
"connections..\n");
|
||||
fflush(stdout);
|
||||
|
||||
first = 0;
|
||||
|
||||
@ -540,13 +540,13 @@ const char *net_gethosterror(int error)
|
||||
#else
|
||||
switch (error) {
|
||||
case HOST_NOT_FOUND:
|
||||
return _("Host not found");
|
||||
return "Host not found";
|
||||
case NO_ADDRESS:
|
||||
return _("No IP address found for name");
|
||||
return "No IP address found for name";
|
||||
case NO_RECOVERY:
|
||||
return _("A non-recovable name server error occurred");
|
||||
return "A non-recovable name server error occurred";
|
||||
case TRY_AGAIN:
|
||||
return _("A temporary error on an authoritative name server");
|
||||
return "A temporary error on an authoritative name server";
|
||||
}
|
||||
|
||||
/* unknown error */
|
||||
|
||||
@ -367,8 +367,8 @@ void settings_check_module(const char *module)
|
||||
if (node == NULL) return;
|
||||
|
||||
errors = g_string_new(NULL);
|
||||
g_string_sprintf(errors, _("Unknown settings in configuration "
|
||||
"file for module %s:"), module);
|
||||
g_string_sprintf(errors, "Unknown settings in configuration "
|
||||
"file for module %s:", module);
|
||||
|
||||
count = 0;
|
||||
for (tmp = node->value; tmp != NULL; tmp = tmp->next) {
|
||||
@ -511,7 +511,7 @@ static CONFIG_REC *parse_configfile(const char *fname)
|
||||
config = config_open(path, -1);
|
||||
if (config == NULL) {
|
||||
last_config_error_msg =
|
||||
g_strdup_printf(_("Error opening configuration file %s: %s"),
|
||||
g_strdup_printf("Error opening configuration file %s: %s",
|
||||
path, g_strerror(errno));
|
||||
config = config_open(NULL, -1);
|
||||
}
|
||||
@ -536,12 +536,11 @@ static void init_configfile(void)
|
||||
if (stat(str, &statbuf) != 0) {
|
||||
/* ~/.irssi not found, create it. */
|
||||
if (mkpath(str, 0700) != 0) {
|
||||
g_error(_("Couldn't create %s directory"), str);
|
||||
g_error("Couldn't create %s directory", str);
|
||||
}
|
||||
} else if (!S_ISDIR(statbuf.st_mode)) {
|
||||
g_error(_("%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi"),
|
||||
str);
|
||||
g_error("%s is not a directory.\n"
|
||||
"You should remove it with command: rm ~/.irssi", str);
|
||||
}
|
||||
g_free(str);
|
||||
|
||||
@ -551,8 +550,8 @@ static void init_configfile(void)
|
||||
/* any errors? */
|
||||
if (config_last_error(mainconfig) != NULL) {
|
||||
last_config_error_msg =
|
||||
g_strdup_printf(_("Ignored errors in configuration "
|
||||
"file:\n%s"),
|
||||
g_strdup_printf("Ignored errors in configuration "
|
||||
"file:\n%s",
|
||||
config_last_error(mainconfig));
|
||||
}
|
||||
|
||||
@ -576,7 +575,7 @@ int settings_reread(const char *fname)
|
||||
}
|
||||
|
||||
if (config_last_error(tempconfig) != NULL) {
|
||||
str = g_strdup_printf(_("Errors in configuration file:\n%s"),
|
||||
str = g_strdup_printf("Errors in configuration file:\n%s",
|
||||
config_last_error(tempconfig));
|
||||
signal_emit("gui dialog", 2, "error", str);
|
||||
g_free(str);
|
||||
@ -606,8 +605,7 @@ int settings_save(const char *fname)
|
||||
irssi_config_save_state(fname);
|
||||
config_last_modifycounter = mainconfig->modifycounter;
|
||||
if (error) {
|
||||
str = g_strdup_printf(_("Couldn't save "
|
||||
"configuration file: %s"),
|
||||
str = g_strdup_printf("Couldn't save configuration file: %s",
|
||||
config_last_error(mainconfig));
|
||||
signal_emit("gui dialog", 2, "error", str);
|
||||
g_free(str);
|
||||
@ -627,12 +625,11 @@ static void sig_autosave(void)
|
||||
settings_save(NULL);
|
||||
else {
|
||||
fname = g_strconcat(mainconfig->fname, ".autosave", NULL);
|
||||
str = g_strdup_printf(_("Configuration file was modified "
|
||||
"while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. "
|
||||
"Use /SAVE or /RELOAD to get rid of "
|
||||
"this message."),
|
||||
fname);
|
||||
str = g_strdup_printf("Configuration file was modified "
|
||||
"while irssi was running. Saving "
|
||||
"configuration to file '%s' instead. "
|
||||
"Use /SAVE or /RELOAD to get rid of "
|
||||
"this message.", fname);
|
||||
signal_emit("gui dialog", 2, "warning", str);
|
||||
g_free(str);
|
||||
|
||||
|
||||
@ -119,12 +119,12 @@ static void sig_channel_destroyed(CHANNEL_REC *channel)
|
||||
void fe_common_core_init(void)
|
||||
{
|
||||
static struct poptOption options[] = {
|
||||
{ "connect", 'c', POPT_ARG_STRING, &autocon_server, 0, N_("Automatically connect to server/ircnet"), N_("SERVER") },
|
||||
{ "password", 'w', POPT_ARG_STRING, &autocon_password, 0, N_("Autoconnect password"), N_("SERVER") },
|
||||
{ "port", 'p', POPT_ARG_INT, &autocon_port, 0, N_("Autoconnect port"), N_("PORT") },
|
||||
{ "noconnect", '!', POPT_ARG_NONE, &no_autoconnect, 0, N_("Disable autoconnecting"), NULL },
|
||||
{ "nick", 'n', POPT_ARG_STRING, &cmdline_nick, 0, N_("Specify nick to use"), NULL },
|
||||
{ "hostname", 'h', POPT_ARG_STRING, &cmdline_hostname, 0, N_("Specify host name to use"), NULL },
|
||||
{ "connect", 'c', POPT_ARG_STRING, &autocon_server, 0, "Automatically connect to server/ircnet", "SERVER" },
|
||||
{ "password", 'w', POPT_ARG_STRING, &autocon_password, 0, "Autoconnect password", "SERVER" },
|
||||
{ "port", 'p', POPT_ARG_INT, &autocon_port, 0, "Autoconnect port", "PORT" },
|
||||
{ "noconnect", '!', POPT_ARG_NONE, &no_autoconnect, 0, "Disable autoconnecting", NULL },
|
||||
{ "nick", 'n', POPT_ARG_STRING, &cmdline_nick, 0, "Specify nick to use", NULL },
|
||||
{ "hostname", 'h', POPT_ARG_STRING, &cmdline_hostname, 0, "Specify host name to use", NULL },
|
||||
{ NULL, '\0', 0, NULL }
|
||||
};
|
||||
|
||||
|
||||
@ -262,7 +262,7 @@ static void settings_save_fe(const char *fname)
|
||||
|
||||
static void settings_save_confirm(const char *line, char *fname)
|
||||
{
|
||||
if (g_strncasecmp(line, _("Y"), 1) == 0)
|
||||
if (line[0] == 'Y')
|
||||
settings_save_fe(fname);
|
||||
g_free(fname);
|
||||
}
|
||||
@ -270,6 +270,8 @@ static void settings_save_confirm(const char *line, char *fname)
|
||||
/* SYNTAX: SAVE [<file>] */
|
||||
static void cmd_save(const char *data)
|
||||
{
|
||||
char *format;
|
||||
|
||||
if (*data == '\0')
|
||||
data = mainconfig->fname;
|
||||
|
||||
@ -280,14 +282,17 @@ static void cmd_save(const char *data)
|
||||
|
||||
printformat(NULL, NULL, MSGLEVEL_CLIENTNOTICE,
|
||||
TXT_CONFIG_MODIFIED, data);
|
||||
|
||||
format = format_get_text(MODULE_NAME, NULL, NULL, NULL,
|
||||
TXT_OVERWRITE_CONFIG);
|
||||
keyboard_entry_redirect((SIGNAL_FUNC) settings_save_confirm,
|
||||
_("Overwrite config (y/N)?"),
|
||||
0, g_strdup(data));
|
||||
format, 0, g_strdup(data));
|
||||
g_free(format);
|
||||
}
|
||||
|
||||
static void settings_clean_confirm(const char *line)
|
||||
{
|
||||
if (g_strncasecmp(line, _("Y"), 1) == 0)
|
||||
if (line[0] == 'Y')
|
||||
settings_clean_invalid();
|
||||
}
|
||||
|
||||
@ -295,7 +300,7 @@ static void sig_settings_errors(const char *msg)
|
||||
{
|
||||
printtext(NULL, NULL, MSGLEVEL_CLIENTERROR, "%s", msg);
|
||||
keyboard_entry_redirect((SIGNAL_FUNC) settings_clean_confirm,
|
||||
_("Remove unknown settings from config file (Y/n)?"),
|
||||
"Remove unknown settings from config file (Y/n)?",
|
||||
0, NULL);
|
||||
}
|
||||
|
||||
|
||||
@ -222,6 +222,7 @@ FORMAT_REC fecommon_core_formats[] = {
|
||||
{ "config_reloaded", "Reloaded configuration", 1, { 0 } },
|
||||
{ "config_modified", "Configuration file was modified since irssi was last started - do you want to overwrite the possible changes?", 1, { 0 } },
|
||||
{ "glib_error", "{error GLib $0} $1", 2, { 0, 0 } },
|
||||
{ "overwrite_config", "Overwrite config (y/N)?", 0 },
|
||||
|
||||
{ NULL, NULL, 0 }
|
||||
};
|
||||
|
||||
@ -187,7 +187,8 @@ enum {
|
||||
TXT_CONFIG_SAVED,
|
||||
TXT_CONFIG_RELOADED,
|
||||
TXT_CONFIG_MODIFIED,
|
||||
TXT_GLIB_ERROR
|
||||
TXT_GLIB_ERROR,
|
||||
TXT_OVERWRITE_CONFIG
|
||||
};
|
||||
|
||||
extern FORMAT_REC fecommon_core_formats[];
|
||||
|
||||
@ -414,9 +414,9 @@ static void sig_gui_dialog(const char *type, const char *text)
|
||||
char *format;
|
||||
|
||||
if (g_strcasecmp(type, "warning") == 0)
|
||||
format = _("%_Warning:%_ %s");
|
||||
format = "%_Warning:%_ %s";
|
||||
else if (g_strcasecmp(type, "error") == 0)
|
||||
format = _("%_Error:%_ %s");
|
||||
format = "%_Error:%_ %s";
|
||||
else
|
||||
format = "%s";
|
||||
|
||||
|
||||
@ -788,7 +788,7 @@ static int theme_read(THEME_REC *theme, const char *path, const char *data)
|
||||
config_parse(config);
|
||||
|
||||
if (config_last_error(config) != NULL) {
|
||||
str = g_strdup_printf(_("Ignored errors in theme %s:\n%s"),
|
||||
str = g_strdup_printf("Ignored errors in theme %s:\n%s",
|
||||
theme->name, config_last_error(config));
|
||||
read_error(str);
|
||||
g_free(str);
|
||||
|
||||
@ -396,7 +396,7 @@ static void cmd_oper_got_pass(const char *password, OPER_PASS_REC *rec)
|
||||
/* SYNTAX: OPER [<nick> [<password>]] */
|
||||
static void cmd_oper(const char *data, IRC_SERVER_REC *server)
|
||||
{
|
||||
char *nick, *password;
|
||||
char *nick, *password, *format;
|
||||
void *free_arg;
|
||||
|
||||
g_return_if_fail(data != NULL);
|
||||
@ -414,9 +414,13 @@ static void cmd_oper(const char *data, IRC_SERVER_REC *server)
|
||||
rec->server = server;
|
||||
rec->nick = g_strdup(*nick != '\0' ? nick : server->nick);
|
||||
|
||||
format = format_get_text(MODULE_NAME, NULL, server, NULL,
|
||||
IRCTXT_ASK_OPER_PASS);
|
||||
|
||||
keyboard_entry_redirect((SIGNAL_FUNC) cmd_oper_got_pass,
|
||||
_("Operator password:"),
|
||||
format,
|
||||
ENTRY_REDIRECT_FLAG_HIDDEN, rec);
|
||||
g_free(format);
|
||||
|
||||
signal_stop();
|
||||
}
|
||||
|
||||
@ -161,6 +161,7 @@ FORMAT_REC fecommon_irc_formats[] = {
|
||||
{ "silenced", "Silenced {nick $0}", 1, { 0 } },
|
||||
{ "unsilenced", "Unsilenced {nick $0}", 1, { 0 } },
|
||||
{ "silence_line", "{nick $0}: silence {ban $1}", 2, { 0, 0 } },
|
||||
{ "ask_oper_pass", "Operator password:", 0 },
|
||||
|
||||
{ NULL, NULL, 0 }
|
||||
};
|
||||
|
||||
@ -130,7 +130,8 @@ enum {
|
||||
|
||||
IRCTXT_SILENCED,
|
||||
IRCTXT_UNSILENCED,
|
||||
IRCTXT_SILENCE_LINE
|
||||
IRCTXT_SILENCE_LINE,
|
||||
IRCTXT_ASK_OPER_PASS
|
||||
};
|
||||
|
||||
extern FORMAT_REC fecommon_irc_formats[];
|
||||
|
||||
@ -282,7 +282,7 @@ int main(int argc, char **argv)
|
||||
args_execute(argc, argv);
|
||||
|
||||
if (!init_screen())
|
||||
g_error(_("Can't initialize screen handling, quitting.\n"));
|
||||
g_error("Can't initialize screen handling, quitting.\n");
|
||||
|
||||
textui_finish_init();
|
||||
main_loop = g_main_new(TRUE);
|
||||
|
||||
@ -21,8 +21,8 @@ static void displayArgs(poptContext con, enum poptCallbackReason foo,
|
||||
|
||||
struct poptOption poptHelpOptions[] = {
|
||||
{ NULL, '\0', POPT_ARG_CALLBACK, (void *)&displayArgs, '\0', NULL },
|
||||
{ "help", '?', 0, NULL, '?', N_("Show this help message") },
|
||||
{ "usage", '\0', 0, NULL, 'u', N_("Display brief usage message") },
|
||||
{ "help", '?', 0, NULL, '?', "Show this help message" },
|
||||
{ "usage", '\0', 0, NULL, 'u', "Display brief usage message" },
|
||||
{ NULL, '\0', 0, NULL, 0 }
|
||||
} ;
|
||||
|
||||
|
||||
24
src/nls.h
24
src/nls.h
@ -1,24 +0,0 @@
|
||||
#ifdef ENABLE_NLS
|
||||
|
||||
# ifdef HAVE_LIBINTL_H
|
||||
# include <libintl.h>
|
||||
# else
|
||||
# include "../intl/libgettext.h"
|
||||
# endif
|
||||
|
||||
# define _(String) gettext (String)
|
||||
# ifdef gettext_noop
|
||||
# define N_(String) gettext_noop (String)
|
||||
# else
|
||||
# define N_(String) (String)
|
||||
# endif
|
||||
#else
|
||||
/* Stubs that do something close enough. */
|
||||
# define textdomain(String) (String)
|
||||
# define gettext(String) (String)
|
||||
# define dgettext(Domain,Message) (Message)
|
||||
# define dcgettext(Domain,Message,Type) (Message)
|
||||
# define bindtextdomain(Domain,Directory) (Domain)
|
||||
# define _(String) (String)
|
||||
# define N_(String) (String)
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user