svn path=/trunk/; revision=7704
2008-11-28 Matthias Clasen <mclasen@redhat.com>
2008-11-28 Matthias Clasen <mclasen@redhat.com>
+ * glib/gkeyfile.c: Refer to @locale parameters as locale identifier
+ in docs.
+
+2008-11-28 Matthias Clasen <mclasen@redhat.com>
+
Bug 557603 – carbon check output misplaced
* configure.in: Call AC_PROG_CPP early to avoid it messing up
Bug 557603 – carbon check output misplaced
* configure.in: Call AC_PROG_CPP early to avoid it messing up
@008-11-28 Matthias Clasen <mclasen@redhat.com>
@008-11-28 Matthias Clasen <mclasen@redhat.com>
+ * glib/tmpl/keyfile.sgml: Explain locale identifiers in
+ more detail
+
+@008-11-28 Matthias Clasen <mclasen@redhat.com>
+
Bug 562549 – g_byte_array_free should tell how free data
* glib/tmpl/arrays_byte.sgml: Improve docs, proposed by
Bug 562549 – g_byte_array_free should tell how free data
* glib/tmpl/arrays_byte.sgml: Improve docs, proposed by
# localized strings are stored in multiple key-value pairs
Welcome=Hello
Welcome[de]=Hallo
# localized strings are stored in multiple key-value pairs
Welcome=Hello
Welcome[de]=Hallo
<para>
Key-value pairs generally have the form <literal>key=value</literal>,
with the exception of localized strings, which have the form
<para>
Key-value pairs generally have the form <literal>key=value</literal>,
with the exception of localized strings, which have the form
-<literal>key[locale]=value</literal>. Space before and after the
+<literal>key[locale]=value</literal>, with a locale identifier of the form
+<literal>lang_COUNTRY@MODIFIER</literal> where <literal>COUNTRY</literal> and
+<literal>MODIFIER</literal> are optional. Space before and after the
'=' character are ignored. Newline, tab, carriage return and backslash
characters in value are escaped as \n, \t, \r, and \\, respectively.
To preserve leading spaces in values, these can also be escaped as \s.
'=' character are ignored. Newline, tab, carriage return and backslash
characters in value are escaped as \n, \t, \r, and \\, respectively.
To preserve leading spaces in values, these can also be escaped as \s.
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
+ * @locale: a locale identifier
* @string: a string
*
* Associates a string value for @key and @locale under @group_name.
* @string: a string
*
* Associates a string value for @key and @locale under @group_name.
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
- * @locale: a locale or %NULL
+ * @locale: a locale identifier or %NULL
* @error: return location for a #GError, or %NULL
*
* Returns the value associated with @key under @group_name
* @error: return location for a #GError, or %NULL
*
* Returns the value associated with @key under @group_name
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
+ * @locale: a locale identifier or %NULL
* @length: return location for the number of returned strings or %NULL
* @error: return location for a #GError or %NULL
*
* @length: return location for the number of returned strings or %NULL
* @error: return location for a #GError or %NULL
*
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
* @key_file: a #GKeyFile
* @group_name: a group name
* @key: a key
+ * @locale: a locale identifier
* @list: a %NULL-terminated array of locale string values
* @length: the length of @list
*
* @list: a %NULL-terminated array of locale string values
* @length: the length of @list
*