Add support for pgettext()

Primarily gives it a shorthand, but also make gcc tolerate its
use for format strings.

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index e3b2ca2edfdfd0162552998159760aedefa9f4f1..6f29fe154a11d6c7b1743865ad10b926d2bd6211 100644 (file)
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -23,6 +23,7 @@ if (GETTEXT_XGETTEXT_EXECUTABLE)
       "--output=${CMAKE_CURRENT_SOURCE_DIR}/tigervnc.pot"
       --default-domain=tigervnc
       --keyword=_
+      --keyword=p_:1c,2
       --keyword=N_
       "--copyright-holder=TigerVNC Team and many others \(see README.txt\)"
       --msgid-bugs-address=tigervnc-devel@googlegroups.com

diff --git a/vncviewer/i18n.h b/vncviewer/i18n.h
index 0ce9e1bf23ae8da3ec8a5f2a11b5541e94a07f8d..ee0e020da3a966e461c99ba17c06ea7e1bc557ca 100644 (file)
--- a/vncviewer/i18n.h
+++ b/vncviewer/i18n.h
@@ -22,7 +22,16 @@
 
 #include "gettext.h"
 
+/* Need to tell gcc that pgettext() doesn't screw up format strings */
+#ifdef __GNUC__
+static const char *
+pgettext_aux (const char *domain,
+              const char *msg_ctxt_id, const char *msgid,
+              int category) __attribute__ ((format_arg (3)));
+#endif
+
 #define _(String) gettext (String)
+#define p_(Context, String) pgettext (Context, String)
 #define N_(String) gettext_noop (String)
 
 #endif /* _I18N_H */