--- pgp/src/language.h	2018/04/24 16:38:33	1.1.1.2
+++ pgp/src/language.h	2018/04/24 16:39:15	1.1.1.3
@@ -12,22 +12,9 @@
 
 extern char	*PSTR (char *s);
 
-extern char language[]; /* language selector prefix for string file */
-
-/* Internal/External representation conversion macros for conversion of
- * user ID's (will be implemented in a future release of PGP, now they
- * are just dummies)
+/* Use the dummy macro _PSTR for strings that should be extracted, but
+ * shouldn't be processed by the PSTR function (eg. array initializers).
  */
-#define	CONVERT_TO_CANONICAL_CHARSET(s) /* String to internal string (at same place) */
-#define	LOCAL_CHARSET(s)	s	/* String to external string */
-
-extern char INT_C(char c);      /* Char to internal char */
-extern char EXT_C(char c);      /* Char to external char */
+#define _PSTR(x)	x
 
-/* Plaintext files import/export conversion modes */
-
-#define NO_CONV  0      /* No conversion needed */
-#define INT_CONV 1      /* Convert text to internal representation */
-#define EXT_CONV 2      /* Convert text to external representation */
-
-extern int CONVERSION;  /* Global var to rule copyfiles */
+extern char language[]; /* language selector prefix for string file */