TDE
/
tdelibs
7
1
Fork 0
Code Issues 16 Pull Requests 8 Releases Wiki Activity

Rename kde.pot to tde.pot

Browse Source 
This relates to Bug 1910
pull/16/head
Timothy Pearson 10 years ago
parent e1f2a0bb29
commit 427ebd3a97
5 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File

2
CMakeLists.txt
Unescape View File

@ -1002,7 +1002,7 @@ set( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined" )
##### headers ################################### ##### headers ###################################
install( FILES install( FILES
kde.pot tde.pot
DESTINATION ${INCLUDE_INSTALL_DIR} ) DESTINATION ${INCLUDE_INSTALL_DIR} )

8
Makefile.am.in
Unescape View File

@ -36,7 +36,7 @@ $(top_srcdir)/acinclude.m4: $(top_srcdir)/libltdl/ltdl.m4
AUTOMAKE_OPTIONS = foreign 1.6.1 AUTOMAKE_OPTIONS = foreign 1.6.1
potdir = $(kde_includes) potdir = $(kde_includes)
pot_DATA = kde.pot pot_DATA = tde.pot
messages: messages:
cd tdeabc/scripts && perl ./makeaddressee cd tdeabc/scripts && perl ./makeaddressee
@ -55,12 +55,12 @@ messages:
find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\ find $$dirs -maxdepth 1 -name "*.h" -print >> files ;\
echo ./tdecore/tde-config.cpp.in >> files ;\ echo ./tdecore/tde-config.cpp.in >> files ;\
$(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \ $(EXTRACTRC) `find $$dirs -maxdepth 1 \( -name "*.rc" -o -name "*.ui" \) ` ./dnssd/kcm_tdednssd.kcfg > rc.cpp; \
: > kde.pot ;\ : > tde.pot ;\
$(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot $(XGETTEXT) -ktranslate -x qt-messages.pot rc.cpp `cat files` && cat messages.po qt-messages.pot > $(podir)/tdelibs.pot
$(XGETTEXT) common_texts.cpp -o kde.pot $(XGETTEXT) common_texts.cpp -o tde.pot
rm -f dirs rm -f dirs
EXTRA_DIST = admin kde.pot \ EXTRA_DIST = admin tde.pot \
COMPILING COMPILING.html COPYING.BSD DEBUG \ COMPILING COMPILING.html COPYING.BSD DEBUG \
KDE2PORTING.html NAMING common_texts.cpp tdelibs.lsm kdoc.rules \ KDE2PORTING.html NAMING common_texts.cpp tdelibs.lsm kdoc.rules \
qt-messages.pot configure.in.in configure.in.mid configure.in.bot qt-messages.pot configure.in.in configure.in.mid configure.in.bot

2
tdecore/kdebug.h
Unescape View File

@ -25,6 +25,8 @@
#include <tqstring.h> #include <tqstring.h>
#include "tdelibs_export.h" #include "tdelibs_export.h"
#undef NDEBUG
class TQWidget; class TQWidget;
class TQDateTime; class TQDateTime;
class TQDate; class TQDate;

5
tdecore/ksock.cpp
Unescape View File

@ -330,15 +330,20 @@ bool TDEServerSocket::init( unsigned short int _port )
return true; return true;
} }
// RAJA FIXME DEBUG ONLY
extern char *__progname;
bool TDEServerSocket::bindAndListen() bool TDEServerSocket::bindAndListen()
{ {
if (d == NULL || d->ks == NULL) if (d == NULL || d->ks == NULL)
return false; return false;
printf("[RAJA DEBUG 640.0] In TDEServerSocket::bindAndListen [%s]\n\r", __progname); fflush(stdout);
int ret = d->ks->listen( SOMAXCONN ); int ret = d->ks->listen( SOMAXCONN );
if (ret < 0) if (ret < 0)
{ {
printf("[RAJA DEBUG 640.1] Error listening on socket [%d]\n\r", ret); fflush(stdout);
kdWarning(170) << "Error listening on socket: " << ret << "\n"; kdWarning(170) << "Error listening on socket: " << ret << "\n";
delete d->ks; delete d->ks;
d->ks = NULL; d->ks = NULL;

2
tdeioslave/iso/Makefile.am
Unescape View File

@ -62,6 +62,6 @@ uninstall-local:
messages: messages:
LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \ LIST=`find . -name \*.h -o -name \*.hh -o -name \*.H -o -name \*.hxx -o -name \*.hpp -o -name \*.cpp -o -name \*.cc -o -name \*.cxx -o -name \*.ecpp -o -name \*.C`; \
if test -n "$$LIST"; then \ if test -n "$$LIST"; then \
$(XGETTEXT) -C -ki18n -x $(kde_includes)/kde.pot $$LIST -o ../po/iso.pot; \ $(XGETTEXT) -C -ki18n -x $(kde_includes)/tde.pot $$LIST -o ../po/iso.pot; \
fi fi

Write Preview
Loading…
Cancel
Save