[unstable] Merge changes from stable: rx -> regex, Byrial's timezone

patch, translation updates.

1 files changed, 3 insertions, 3 deletions

diff --git a/main.c b/main.c
index 73220fb9..382f1e29 100644
--- a/main.c
+++ b/main.c
@@ -208,10 +208,10 @@ static void show_version (void)
 	"-HAVE_REGCOMP  "
 #endif
 
-#ifdef USE_GNU_RX
-	"+USE_GNU_RX  "
+#ifdef USE_GNU_REGEX
+	"+USE_GNU_REGEX  "
 #else
-	"-USE_GNU_RX  "
+	"-USE_GNU_REGEX  "
 #endif
 
 #ifdef HAVE_COLOR