Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Already on GitHub? Sign in to your account

Fix faulty theme building #17

Merged
merged 3 commits into from Aug 29, 2011
Jump to file or symbol
Failed to load files and symbols.
+31 −53
Split
@@ -378,8 +378,7 @@
format_add("passwd", _("%> Password changed\n"), 1);
format_add("passwd_failed", _("%! Error while changing password: %1\n"), 1);
format_add("passwd_timeout", _("%! Password changing timed out\n"), 1);
- format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually "
- "change your session password using /session password", 1);
+ format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually change your session password using /session password", 1);
format_add("passwd_abuse", "%! (%1) Somebody want to clear our password (%2)", 1);
format_add("change", _("%> Informations in public directory chenged\n"), 1);
format_add("change_failed", _("%! Error while changing information in public directory\n"), 1);
@@ -765,10 +764,8 @@
format_add("gg_version", _("%> %TGadu-Gadu%n: libgadu %g%1%n (headers %c%2%n), protocol %g%3%n (%c0x%4%n)"), 1);
format_add("gpg_key_unset", _("%) GPGKEY for uid: %W%1%n UNSET!"), 1);
format_add("gpg_key_not_found", _("%> GPGKEY for uid: %W%1%n NOT FOUND!"), 1);
- format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n"
- "%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
- format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n"
- "%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
+ format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
+ format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
format_add("gpg_key_set_ok", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon"), 1);
format_add("gpg_key_set_okf", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon (Forcing key is not nessesary here!)"), 1);
format_add("gpg_key_set_okbutver", _("%! Keys matched, but lasttime we fail to verify key. Encryption won't work until forced."), 1);
@@ -849,10 +846,8 @@
// format_add("RPL_WHOREPLY", "%g|| %c%3 %W%7 %n%8 %6 %4@%5 %W%9\n", 1);
format_add("RPL_WHOREPLY", "%g|| %c%3 %W%7 %n%8 %6 %4@%5 %W%9\n", 1);
format_add("RPL_AWAY", _("%G||%n away : %2 - %3\n"), 1);
- format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
- format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
// format_add("IRC_WHOERROR", _("%G.+===%g-----\n%G||%n %3 (%2)\n"), 1);
// format_add("IRC_ERR_NOSUCHNICK", _("%n %3 (%2)\n"), 1);
format_add("RPL_WHOISCHANNELS", _("%G||%n %|channels : %3\n"), 1);
@@ -965,8 +960,7 @@
format_add("jabber_vacation", _("%> You'd set up your vacation status: %g%2%n (since: %3 expires@%4)"), 1);
format_add("jabber_muc_recv", "%B<%w%X%5%3%B>%n %4", 1);
format_add("jabber_muc_send", "%B<%n%X%5%W%3%B>%n %4", 1);
- format_add("jabber_muc_room_created",
- _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
+ format_add("jabber_muc_room_created", _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
format_add("jabber_muc_banlist", _("%g|| %n %5 - %W%2%n: ban %c%3%n [%4]"), 1); /* %1 sesja %2 kanal %3 kto %4 reason %5 numerek */
// format_add("jabber_send_chan", _("%B<%W%2%B>%n %5"), 1);
// format_add("jabber_send_chan_n", _("%B<%W%2%B>%n %5"), 1);
@@ -991,8 +985,7 @@
format_add("jabber_gpg_config", _("%> (%1) First set gpg_key and gpg_password before turning on gpg_active!"), 1); /* sesja */
format_add("jabber_gpg_ok", _("%) (%1) GPG support: %gENABLED%n using key: %W%2%n"), 1); /* sesja, klucz */
format_add("jabber_gpg_sok", _("%) GPG key: %W%2%n"), 1); /* sesja, klucz for /status */
- format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\n" /* sesja, klucz, error */
- "OpenGPG support for this session disabled."), 1);
+ format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\nOpenGPG support for this session disabled."), 1); /* sesja, klucz, error */
format_add("jabber_msg_xmlsyntaxerr", _("%! Expat syntax-checking failed on your message: %T%1%n. Please correct your code or use double ^R to disable syntax-checking."), 1);
format_add("jabber_conversations_begin", _("%g,+=%G--%n (%1) %GAvailable Reply-IDs:%n"), 1);
format_add("jabber_conversations_item", _("%g|| %n %1 - %W%2%n (%g%3%n [%c%4%n])"), 1); /* %1 - n, %2 - user, %3 - subject, %4 - thread */
@@ -365,9 +365,9 @@ Copyright 2000 Free Software Foundation, Inc.
</para>
<programlisting role="shell">
<![CDATA[
-grep -R -I 'format_add("' * | cut -d: -f2- | \
- perl -ne '/format_add\("(.*?)".+"(.*)".*/; print $1." ".$2."\n"' \
- > my.theme
+find . -name '*.c' -type f | xargs sed \
+ '/^[ \t]*format_add("/!d;s///;s/"[^"]*"\(.*\)".*/ \1/' \
+ > my.theme
]]>
</programlisting>
<para>
@@ -795,5 +795,5 @@ tekst tekst2
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
@@ -332,5 +332,5 @@ $ ./configure --with-libintl-prefix=/usr/local/include
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
@@ -38,5 +38,5 @@
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
@@ -363,9 +363,9 @@ Copyright 2000 Free Software Foundation, Inc.
</para>
<programlisting role="shell">
<![CDATA[
-grep -R -I 'format_add("' * | cut -d: -f2- | \
- perl -ne '/format_add\("(.*?)".+"(.*)".*/; print $1." ".$2."\n"' \
- > my.theme
+find . -name '*.c' -type f | xargs sed \
+ '/^[ \t]*format_add("/!d;s///;s/"[^"]*"\(.*\)".*/ \1/' \
+ > my.theme
]]>
</programlisting>
<para>
@@ -793,5 +793,5 @@ tekst tekst2
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
@@ -384,5 +384,5 @@ $ ./configure --with-libintl-prefix=/usr/local/include
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
@@ -38,5 +38,5 @@
</sect1>
</chapter>
<!--
- vim: filetype=docbk encoding=iso-8859-2
+ vim: filetype=docbk fileencoding=iso-8859-2
-->
View
@@ -1801,8 +1801,7 @@ void theme_init()
format_add("passwd", _("%> Password changed\n"), 1);
format_add("passwd_failed", _("%! Error while changing password: %1\n"), 1);
format_add("passwd_timeout", _("%! Password changing timed out\n"), 1);
- format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually "
- "change your session password using /session password", 1);
+ format_add("passwd_possible_abuse", "%> (%1) Password reply send by wrong uid: %2, if this is good server uid please report this to developers and manually change your session password using /session password", 1);
format_add("passwd_abuse", "%! (%1) Somebody want to clear our password (%2)", 1);
/* changing information in public catalog */
View
@@ -589,10 +589,8 @@ static int gpg_theme_init() {
format_add("gpg_key_unset", _("%) GPGKEY for uid: %W%1%n UNSET!"), 1);
format_add("gpg_key_not_found", _("%> GPGKEY for uid: %W%1%n NOT FOUND!"), 1);
- format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n"
- "%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
- format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n"
- "%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
+ format_add("gpg_key_set_new", _("%) You've set up new key for uid: %W%1%n keyid: %W%2%n\n%) Encryption will be disabled until you force key (gpg:key --forcekey) NOT RECOMENDED or we verify key (signed presence is enough)"), 1);
+ format_add("gpg_key_set_newf", _("%) You've forced setting new key for uid: %W%1%n keyid: %W%2%n\n%! Forcing key is not good idea... Please rather use /gpg:key --setkey coz key will be verified before encryption..."), 1);
format_add("gpg_key_set_ok", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon"), 1);
format_add("gpg_key_set_okf", _("%> Keys you've set up for uid: %W%1%n match with our internal DB. Happy encrypted talk. F**k echelon (Forcing key is not nessesary here!)"), 1);
View
@@ -2238,11 +2238,9 @@ static int irc_theme_init()
format_add("RPL_AWAY", _("%G||%n away : %2 - %3\n"), 1);
/* in whois %2 is always nick */
- format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOISUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
- format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n"
- "%G||%n realname : %6\n"), 1);
+ format_add("RPL_WHOWASUSER", _("%G.+===%g-----\n%G||%n (%T%2%n) (%3@%4)\n%G||%n realname : %6\n"), 1);
/* %2 - nick %3 - there is/ was no such nickname / channel, and so on... */
/*
View
@@ -1199,8 +1199,7 @@ static int jabber_theme_init() {
/* %1 - sessionname, %2 - mucjid %3 - text */
format_add("jabber_muc_notice", "%n-%P%2%n- %3", 1);
- format_add("jabber_muc_room_created",
- _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
+ format_add("jabber_muc_room_created", _("%> Room %W%2%n created, now to configure it: type %W/admin %g%2%n to get configuration form, or type %W/admin %g%2%n --instant to create instant one"), 1);
format_add("jabber_muc_banlist", _("%g|| %n %5 - %W%2%n: ban %c%3%n [%4]"), 1); /* %1 sesja %2 kanal %3 kto %4 reason %5 numerek */
#if 0
format_add("jabber_send_chan", _("%B<%W%2%B>%n %5"), 1);
@@ -1258,8 +1257,7 @@ static int jabber_theme_init() {
format_add("jabber_gpg_config", _("%> (%1) First set gpg_key and gpg_password before turning on gpg_active!"), 1); /* sesja */
format_add("jabber_gpg_ok", _("%) (%1) GPG support: %gENABLED%n using key: %W%2%n"), 1); /* sesja, klucz */
format_add("jabber_gpg_sok", _("%) GPG key: %W%2%n"), 1); /* sesja, klucz for /status */
- format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\n" /* sesja, klucz, error */
- "OpenGPG support for this session disabled."), 1);
+ format_add("jabber_gpg_fail", _("%> (%1) We didn't manage to sign testdata using key: %W%2%n (%R%3%n)\nOpenGPG support for this session disabled."), 1); /* sesja, klucz, error */
/* stream:features */
/* %1 - sesja, %2 - serwer, %3 - nazwa, %4 - XMLNS, %5 - z czym sie je */
@@ -107,5 +107,5 @@
</sect3>
</sect2>
<!--
-vim: ft=docbk encoding=iso-8859-2
+vim: ft=docbk fileencoding=iso-8859-2
-->
View
@@ -593,14 +593,8 @@ static int ncurses_theme_init() {
/* prompty i statusy dla ui-ncurses */
format_add("ncurses_prompt_none", "", 1);
format_add("ncurses_prompt_query", "[%Y%1%n] ", 1);
- format_add("statusbar", " %c(%w%{time}%c)%w %c(%w%{?session %{?away %G}%{?avail %Y}%{?chat %W}%{?dnd %K}%{?xa %g}%{?gone %R}"
- "%{?invisible %C}%{?notavail %r}%{session}}%{?!session ---}%c) %{?window (%wwin%c/%w%{?typing %C}%{window}}"
- "%{?query %c:%W%{query}}%{?debug %c(%Cdebug}%c)%w%{?activity %c(%wact%c/%W}%{activity}%{?activity %c)%w}"
- "%{?mail %c(%wmail%c/%w}%{mail}%{?mail %c)}%{?more %c(%Gmore%c)}", 1);
- format_add("header", " %{?query %c(%{?query_away %w}%{?query_avail %W}%{?query_invisible %K}%{?query_notavail %k}"
- "%{?query_chat %W}%{?query_dnd %K}%{query_xa %g}%{?query_gone %R}%{?query_unknown %M}%{?query_error %m}%{?query_blocking %m}"
- "%{query}%{?query_descr %c/%w%{query_descr}}%c) %{?query_ip (%wip%c/%w%{query_ip}%c)} %{irctopic}}"
- "%{?!query %c(%wekg2%c/%w%{version}%c) (%w%{url}%c)}", 1);
+ format_add("statusbar", " %c(%w%{time}%c)%w %c(%w%{?session %{?away %G}%{?avail %Y}%{?chat %W}%{?dnd %K}%{?xa %g}%{?gone %R}%{?invisible %C}%{?notavail %r}%{session}}%{?!session ---}%c) %{?window (%wwin%c/%w%{?typing %C}%{window}}%{?query %c:%W%{query}}%{?debug %c(%Cdebug}%c)%w%{?activity %c(%wact%c/%W}%{activity}%{?activity %c)%w}%{?mail %c(%wmail%c/%w}%{mail}%{?mail %c)}%{?more %c(%Gmore%c)}", 1);
+ format_add("header", " %{?query %c(%{?query_away %w}%{?query_avail %W}%{?query_invisible %K}%{?query_notavail %k}%{?query_chat %W}%{?query_dnd %K}%{query_xa %g}%{?query_gone %R}%{?query_unknown %M}%{?query_error %m}%{?query_blocking %m}%{query}%{?query_descr %c/%w%{query_descr}}%c) %{?query_ip (%wip%c/%w%{query_ip}%c)} %{irctopic}}%{?!query %c(%wekg2%c/%w%{version}%c) (%w%{url}%c)}", 1);
format_add("statusbar_act_important", "%Y", 1);
format_add("statusbar_act_important2us", "%W", 1);
format_add("statusbar_act", "%K", 1);
View
@@ -921,5 +921,5 @@ ekg.variable_add('zmienna_testowa', 'warto
</programlisting>
</sect2>
<!--
-vim: ft=docbk encoding=iso-8859-2
+vim: ft=docbk fileencoding=iso-8859-2
-->
View
@@ -952,9 +952,7 @@ EXPORTNOT void theme_init() {
format_add("remote_warndebug", "ekg2-remote: %r%1\n", 1);
format_add("remote_okdebug", "ekg2-remote: %G%1\n", 1);
- format_add("remote_welcome", _("%> %|%Tekg2-remote-0.4%n (%ge%Gk%gg %Gr%ge%Gl%go%Ga%gd%Ge%gd%n)\n"
- "Connected to: %T%1%n\n%rNOTE: All commands except /quit will be executed remotely!\n"
- "If you want to shutdown remote ekg2 type %W/exit [reason]%n"), 1);
+ format_add("remote_welcome", _("%> %|%Tekg2-remote-0.4%n (%ge%Gk%gg %Gr%ge%Gl%go%Ga%gd%Ge%gd%n)\nConnected to: %T%1%n\n%rNOTE: All commands except /quit will be executed remotely!\nIf you want to shutdown remote ekg2 type %W/exit [reason]%n"), 1);
format_add("remote_console_charset_using", _("%) %Tekg2-remote%n detected that your console works under: %W%1%n Please verify and run ekg2-remote -c your-encoding if needed"), 1);
}