Author: schubi2 Date: Tue Jun 17 09:25:56 2008 New Revision: 10382 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10382&view=rev Log: translations Modified: trunk/dialogsolver/package/libqdialogsolver1.spec.in trunk/dialogsolver/src/QZyppSolverDialog.cpp trunk/dialogsolver/src/getText.h trunk/dialogsolver/src/resgraphview.cpp trunk/dialogsolver/src/restreewidget.cpp Modified: trunk/dialogsolver/package/libqdialogsolver1.spec.in URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/package/libqdialogsolver1.spec.in?rev=10382&r1=10381&r2=10382&view=diff ============================================================================== --- trunk/dialogsolver/package/libqdialogsolver1.spec.in (original) +++ trunk/dialogsolver/package/libqdialogsolver1.spec.in Tue Jun 17 09:25:56 2008 @@ -59,7 +59,7 @@ -DCMAKE_SKIP_RPATH=1 \ .. make %{?jobs:-j %jobs} VERBOSE=1 -make -C po %{?jobs:-j %jobs} translations +#make -C po %{?jobs:-j %jobs} translations %install cd build Modified: trunk/dialogsolver/src/QZyppSolverDialog.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/QZyppSolverDialog.cpp?rev=10382&r1=10381&r2=10382&view=diff ============================================================================== --- trunk/dialogsolver/src/QZyppSolverDialog.cpp (original) +++ trunk/dialogsolver/src/QZyppSolverDialog.cpp Tue Jun 17 09:25:56 2008 @@ -7,8 +7,7 @@ #include "QZyppSolverDialog.h" #include "solvertree.h" - -#define i18n(MSG) QString(MSG) +#include "getText.h" QZyppSolverDialog::QZyppSolverDialog(zypp::solver::detail::Resolver_Ptr r) : QDialog(0,"Solvertree",true) Modified: trunk/dialogsolver/src/getText.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/getText.h?rev=10382&r1=10381&r2=10382&view=diff ============================================================================== --- trunk/dialogsolver/src/getText.h (original) +++ trunk/dialogsolver/src/getText.h Tue Jun 17 09:25:56 2008 @@ -15,16 +15,16 @@ #define DIALOGSOLVER_GETTEXT_H /** Just tag text for translation. */ -#define N_(MSG) MSG +#define N_(MSG) QString(MSG) /** Return translated text. */ -#define _(MSG) ::dialogsolver::dgettext( MSG ) +#define _(MSG) QString(::dialogsolver::dgettext( MSG )) /** Return translated text. */ -#define i18n(MSG) ::dialogsolver::dgettext( MSG ) +#define i18n(MSG) QString(::dialogsolver::dgettext( MSG )) /** Return translated text (plural form). */ -#define _PL(MSG1,MSG2,N) ::dialogsolver::dngettext( MSG1; MSG2, N ) +#define _PL(MSG1,MSG2,N) QString(::dialogsolver::dngettext( MSG1; MSG2, N )) /////////////////////////////////////////////////////////////////// namespace dialogsolver Modified: trunk/dialogsolver/src/resgraphview.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/resgraphview.cpp?rev=10382&r1=10381&r2=10382&view=diff ============================================================================== --- trunk/dialogsolver/src/resgraphview.cpp (original) +++ trunk/dialogsolver/src/resgraphview.cpp Tue Jun 17 09:25:56 2008 @@ -43,10 +43,10 @@ #include "zypp/ZYppFactory.h" #include "zypp/ResFilters.h" #include "zypp/base/Algorithm.h" +#include "getText.h" #define LABEL_WIDTH 160 #define LABEL_HEIGHT 90 -#define i18n(MSG) QString(MSG) using namespace zypp; Modified: trunk/dialogsolver/src/restreewidget.cpp URL: http://svn.opensuse.org/viewcvs/zypp/trunk/dialogsolver/src/restreewidget.cpp?rev=10382&r1=10381&r2=10382&view=diff ============================================================================== --- trunk/dialogsolver/src/restreewidget.cpp (original) +++ trunk/dialogsolver/src/restreewidget.cpp Tue Jun 17 09:25:56 2008 @@ -33,8 +33,7 @@ #include #include "resgraphview.h" #include "zypp/Resolver.h" - -#define i18n(MSG) QString(MSG) +#include "getText.h" /* * Constructs a ResTreeWidget as a child of 'parent', with the -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org