From 744e55cbdf43c96c3f5b0fca49166553dcc7be7a Mon Sep 17 00:00:00 2001
From: Pierre Ossman <ossman@cendio.se>
Date: Wed, 3 Dec 2014 14:00:54 +0100
Subject: [PATCH] Add comments for translators where requested

---
 po/CMakeLists.txt            | 1 +
 vncviewer/CConn.cxx          | 4 ++++
 vncviewer/X11PixelBuffer.cxx | 4 ++++
 vncviewer/vncviewer.cxx      | 2 ++
 4 files changed, 11 insertions(+)

diff --git a/po/CMakeLists.txt b/po/CMakeLists.txt
index b4c69792..513cfcc8 100644
--- a/po/CMakeLists.txt
+++ b/po/CMakeLists.txt
@@ -27,6 +27,7 @@ if (GETTEXT_XGETTEXT_EXECUTABLE)
       --msgid-bugs-address=tigervnc-devel@googlegroups.com
       --sort-by-file
       --add-location
+      --add-comments
       ${po_source}
     COMMENT "Updating tigervnc.pot"
     VERBATIM
diff --git a/vncviewer/CConn.cxx b/vncviewer/CConn.cxx
index 23f07b4d..a7328476 100644
--- a/vncviewer/CConn.cxx
+++ b/vncviewer/CConn.cxx
@@ -183,12 +183,15 @@ const char *CConn::connectionInfo()
   strcat(infoText, scratch);
   strcat(infoText, "\n");
 
+  // TRANSLATORS: Will be filled in with a string describing the
+  // protocol pixel format in a fairly language neutral way
   cp.pf().print(pfStr, 100);
   snprintf(scratch, sizeof(scratch),
            _("Pixel format: %s"), pfStr);
   strcat(infoText, scratch);
   strcat(infoText, "\n");
 
+  // TRANSLATORS: Similar to the earlier "Pixel format" string
   serverPF.print(pfStr, 100);
   snprintf(scratch, sizeof(scratch),
            _("(server default %s)"), pfStr);
@@ -426,6 +429,7 @@ void CConn::dataRect(const Rect& r, int encoding)
     lastServerEncoding = encoding;
 
   if (!Decoder::supported(encoding)) {
+    // TRANSLATORS: Refers to a VNC protocol encoding type
     vlog.error(_("Unknown rect encoding %d"), encoding);
     throw Exception(_("Unknown rect encoding"));
   }
diff --git a/vncviewer/X11PixelBuffer.cxx b/vncviewer/X11PixelBuffer.cxx
index a7794277..29f0f933 100644
--- a/vncviewer/X11PixelBuffer.cxx
+++ b/vncviewer/X11PixelBuffer.cxx
@@ -56,6 +56,8 @@ static PixelFormat display_pf()
     if (format[i].depth == fl_visual->depth) break;
 
   if (i == nformats)
+    // TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+    // to translate.
     throw rfb::Exception(_("Display lacks pixmap format for default depth"));
 
   switch (format[i].bits_per_pixel) {
@@ -65,6 +67,8 @@ static PixelFormat display_pf()
     bpp = format[i].bits_per_pixel;
     break;
   default:
+    // TRANSLATORS: "pixmap" is an X11 concept and may not be suitable
+    // to translate.
     throw rfb::Exception(_("Couldn't find suitable pixmap format"));
   }
 
diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx
index cf52de5b..bf4bfb18 100644
--- a/vncviewer/vncviewer.cxx
+++ b/vncviewer/vncviewer.cxx
@@ -460,6 +460,8 @@ int main(int argc, char** argv)
 #ifndef WIN32
   /* Specifying -via and -listen together is nonsense */
   if (listenMode && strlen(via.getValueStr()) > 0) {
+    // TRANSLATORS: "Parameters" are command line arguments, or settings
+    // from a file or the Windows registry.
     vlog.error(_("Parameters -listen and -via are incompatible"));
     fl_alert(_("Parameters -listen and -via are incompatible"));
     exit_vncviewer();
-- 
2.39.5