From cafb5a55ba84f11c6049a474bd5ef08e3915e0af Mon Sep 17 00:00:00 2001 From: Michele Calgaro Date: Fri, 7 Aug 2020 21:48:07 +0900 Subject: Revert "Allow extraction of strings for rotations in tderandr" This reverts commit 879b8a1c054f8dee6f7672c56b7bcac4f8b548aa (cherry picked from commit 40d566dff5ed6c36ddfff3c0193564fc801ae369) --- CMakeL10n.txt | 12 +----------- tderandr/libtderandr.h | 8 ++++---- 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/CMakeL10n.txt b/CMakeL10n.txt index c7670275d..1606387a8 100644 --- a/CMakeL10n.txt +++ b/CMakeL10n.txt @@ -40,14 +40,6 @@ if( EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/../dependencies/tqt3/src/xml/qxml.cpp ) endif( ) -##### prepare tderandr/libtderandr.h ############# - -# hide "#define" to allow strings to be extracted using xgettext -file( READ ${CMAKE_CURRENT_SOURCE_DIR}/tderandr/libtderandr.h _tderandr_h ) -string( REGEX REPLACE "\n(#define[^\n]*)(I18N_NOOP)" "\n/*\\1*/\\2" _tderandr_h ${_tderandr_h} ) -file( WRITE ${CMAKE_CURRENT_SOURCE_DIR}/tderandr/libtderandr.h.tde_l10n "${_tderandr_h}" ) - - ##### prepare tdeabc/addressee strings ########## # read file @@ -112,7 +104,6 @@ tde_l10n_create_template( "." "tdeabc/scripts/entrylist.tde_l10n" "tdecore/tde-config.cpp.cmake" - "tderandr/libtderandr.h.tde_l10n" "../dependencies/tqt3/src" "../dependencies/tqt3/src/xml/qxml.cpp.tde_l10n" EXCLUDES @@ -130,9 +121,8 @@ tde_l10n_create_template( "^tdeio/" "^tdeioslave/" "^tdeprint/" - "^tderandr/libtderandr.h$" - "^tdestyles/.*/config/" "^tdeui/colors/" + "^tdestyles/.*/config/" "/dependencies/tqt3/src/xml/qxml.cpp$" KEYWORDS tr tr:1,2 diff --git a/tderandr/libtderandr.h b/tderandr/libtderandr.h index 1bf38c0f5..0e07ad96e 100644 --- a/tderandr/libtderandr.h +++ b/tderandr/libtderandr.h @@ -35,10 +35,10 @@ #include #include -#define ROTATION_0_DEGREES_STRING I18N_NOOP("0 degrees") -#define ROTATION_90_DEGREES_STRING I18N_NOOP("90 degrees") -#define ROTATION_180_DEGREES_STRING I18N_NOOP("180 degrees") -#define ROTATION_270_DEGREES_STRING I18N_NOOP("270 degrees") +#define ROTATION_0_DEGREES_STRING "0 degrees" +#define ROTATION_90_DEGREES_STRING "90 degrees" +#define ROTATION_180_DEGREES_STRING "180 degrees" +#define ROTATION_270_DEGREES_STRING "270 degrees" /** * Simple API covering most of the uses of libtderandr. -- cgit v1.2.1