[glom] Correct the date format in the en_CA locale.

[Murray Cumming <murrayc src gnome org>]

commit aa15e4b24c3c6c9240648e09322fd1b16130e649
Author: Murray Cumming <murrayc murrayc com>
Date:   Tue Oct 18 13:26:39 2011 +0200

    Correct the date format in the en_CA locale.
    
    	* en_CA.po: Added a translation for the date format, because the default
    	does not show 4-digit years. This avoids the warning at startup, which
    	asks the translator to deal with it.
    	Note that I used YYYY/MM/DD instead of DD/MM/YYY, because a) It is
      apparrently	the official format for Canada, though the other one is still
      common, and b) date parsing failed with DD/MM/YY in this locale.

 po/ChangeLog |   41 ++++++++---------------------------------
 po/en_CA.po  |   12 ++++++++++++
 2 files changed, 20 insertions(+), 33 deletions(-)
---
diff --git a/po/ChangeLog b/po/ChangeLog
index 8989cdd..23f9edd 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,38 +1,13 @@
-2011-09-08  Murray Cumming  <murrayc murrayc-desktop>
+2011-10-18  Murray Cumming  <murrayc murrayc com>
 
-	reviewed by: <delete if not using a buddy>
-
-	* POTFILES.in:
-
-2011-09-01  Murray Cumming  <murrayc murrayc-desktop>
-
-	reviewed by: <delete if not using a buddy>
-
-	* POTFILES.in:
-
-2011-08-29  Murray Cumming  <murrayc murrayc-desktop>
-
-	reviewed by: <delete if not using a buddy>
-
-	* POTFILES.in:
-
-2011-07-11  Murray Cumming  <murrayc murrayc-desktop>
+	Correct the date format in the en_CA locale. 
 
-	reviewed by: <delete if not using a buddy>
-
-	* POTFILES.in:
-
-2010-09-08  Murray Cumming  <murrayc murrayc-desktop>
-
-	reviewed by: <delete if not using a buddy>
-
-	* POTFILES.in:
-
-2009-09-03  Murray Cumming  <murrayc murrayc-x61>
-
-	reviewed by: <delete if not using a buddy>
-
-	* POTFILES.in:
+	* en_CA.po: Added a translation for the date format, because the default
+	does not show 4-digit years. This avoids the warning at startup, which 
+	asks the translator to deal with it.
+	Note that I used YYYY/MM/DD instead of DD/MM/YYY, because a) It is 
+  apparrently	the official format for Canada, though the other one is still 
+  common, and b) date parsing failed with DD/MM/YY in this locale.
 
 2009-04-26  Mario BlÃttermann  <mariobl gnome org>
 
diff --git a/po/en_CA.po b/po/en_CA.po
index d1ef394..4d5403f 100644
--- a/po/en_CA.po
+++ b/po/en_CA.po
@@ -959,6 +959,18 @@ msgstr "Boolean"
 msgid "Image"
 msgstr "Image"
 
+#. TRANSLATORS: Please only translate this string if you know that strftime()
+#. * shows only 2 year digits when using format "x". We want to always display
+#. * 4 year digits. For instance, en_GB should translate it to "%d/%m/%Y".
+#. * Glom will show a warning in the terminal at startup if this is necessary
+#. * and default to %d/%m/%Y" if it detects a problem, but that might not be
+#. * correct for your locale.
+#. * Thanks.
+#: ../glom/libglom/data_structure/glomconversions.cc:78
+#, no-c-format
+msgid "%x"
+msgstr "%Y/%m/%d"
+
 #: ../glom/data_structure/translatable_item.cc:238
 msgid "Layout Item"
 msgstr "Layout Item"