Commit 282805b1 authored by Matthias Clasen's avatar Matthias Clasen

2.17.4

svn path=/trunk/; revision=7234
parent e8516ee9
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
* configure.in: Bump version
* NEWS: Updates
2008-07-21 Emmanuele Bassi <ebassi@gnome.org>
......
Simple install procedure
========================
% gzip -cd glib-2.17.3.tar.gz | tar xvf - # unpack the sources
% cd glib-2.17.3 # change to the toplevel directory
% gzip -cd glib-2.17.4.tar.gz | tar xvf - # unpack the sources
% cd glib-2.17.4 # change to the toplevel directory
% ./configure # run the `configure' script
% make # build GLIB
......
General Information
===================
This is GLib version 2.17.3. GLib is the low-level core
This is GLib version 2.17.4. GLib is the low-level core
library that forms the basis for projects such as GTK+ and GNOME. It
provides data structure handling for C, portability wrappers, and
interfaces for such runtime functionality as an event loop, threads,
......
......@@ -23,7 +23,7 @@ m4_define(glib_configure_in)
#
m4_define([glib_major_version], [2])
m4_define([glib_minor_version], [17])
m4_define([glib_micro_version], [3])
m4_define([glib_micro_version], [4])
m4_define([glib_interface_age], [0])
m4_define([glib_binary_age],
[m4_eval(100 * glib_minor_version + glib_micro_version)])
......
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
2008-07-18 Matthias Clasen <mclasen@redhat.com>
* gobject/gobject-sections.txt: Add new signal api.
......
......@@ -115,6 +115,40 @@ To get the translated string, call gettext() at runtime.
@Since: 2.4
<!-- ##### MACRO NC_ ##### -->
<para>
Only marks a string for translation, with context.
This is useful in situations where the translated strings can't
be directly used, e.g. in string array initializers.
To get the translated string, you should call g_dpgettext2() at runtime.
</para>
|[
{
static const char *messages[] = {
NC_("some context", "some very meaningful message"),
NC_("some context", "and another one")
};
const char *string;
...
string
= index &gt; 1 ? g_dpgettext2 (NULL, "some context", "a default message") : g_dpgettext2 (NULL, "some context", messages[index]);
<!-- -->
fputs (string);
...
}
]|
<note><para>
If you are using the NC_() macro, you need to make sure that you
pass <option>--keyword=NC_:1c,2</option> to xgettext when extracting
messages. Note that this only works with GNU gettext >= 0.15.
</para></note>
@Context: a message context, must be a string literal
@String: a message id, must be a string literal
@Since: 2.18
<!-- ##### FUNCTION g_dgettext ##### -->
<para>
......@@ -148,39 +182,15 @@ To get the translated string, call gettext() at runtime.
@Returns:
<!-- ##### MACRO NC_ ##### -->
<!-- ##### FUNCTION g_dpgettext2 ##### -->
<para>
Only marks a string for translation, with context.
This is useful in situations where the translated strings can't
be directly used, e.g. in string array initializers.
To get the translated string, you should call g_dpgettext2() at runtime.
</para>
|[
{
static const char *messages[] = {
NC_("some context", "some very meaningful message"),
NC_("some context", "and another one")
};
const char *string;
...
string
= index &gt; 1 ? g_dpgettext2 (NULL, "some context", "a default message") : g_dpgettext2 (NULL, "some context", messages[index]);
<!-- -->
fputs (string);
...
}
]|
<note><para>
If you are using the NC_() macro, you need to make sure that you
pass <option>--keyword=NC_:1c,2</option> to xgettext when extracting
messages. Note that this only works with GNU gettext >= 0.15.
</para></note>
</para>
@Context: a message context, must be a string literal
@String: a message id, must be a string literal
@Since: 2.18
@domain:
@context:
@msgid:
@Returns:
<!-- ##### FUNCTION g_strip_context ##### -->
......
......@@ -267,6 +267,25 @@ g_markup_parse_context_parse() will report that error back to its caller.
@Returns:
<!-- ##### FUNCTION g_markup_parse_context_push ##### -->
<para>
</para>
@context:
@parser:
@user_data:
<!-- ##### FUNCTION g_markup_parse_context_pop ##### -->
<para>
</para>
@context:
@Returns:
<!-- ##### ENUM GMarkupCollectType ##### -->
<para>
......
......@@ -141,6 +141,16 @@ The returned string should be freed when no longer needed.
@Returns:
<!-- ##### FUNCTION g_strcmp0 ##### -->
<para>
</para>
@str1:
@str2:
@Returns:
<!-- ##### FUNCTION g_strlcpy ##### -->
<para>
Portability wrapper that calls strlcpy() on systems which have it, and emulates
......
......@@ -515,16 +515,6 @@ and @n2.
@Since: 2.16
<!-- ##### FUNCTION g_strcmp0 ##### -->
<para>
</para>
@str1:
@str2:
@Returns:
<!-- ##### TYPEDEF GTestCase ##### -->
<para>
An opaque structure representing a test case.
......
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
2008-07-20 Matthias Clasen <mclasen@redhat.com>
* gvolumemonitor.[hc]:
......
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
2008-07-02 Matthias Clasen <mclasen@redhat.com>
* === Released 2.17.3 ===
......
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
2008-07-21 Michael Natterer <mitch@imendio.com>
Reviewed by Tim Janik:
......
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
2008-07-02 Matthias Clasen <mclasen@redhat.com>
* === Released 2.17.3 ===
......
2008-07-21 Matthias Clasen <mclasen2redhat.com>
* === Released 2.17.4 ===
2008-07-20 Leonardo Ferreira Fontenelle <leonardof@gnome.org>
* pt_BR.po: Brazilian Portuguese translation improvements.
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: glib VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-07-02 20:10-0400\n"
"POT-Creation-Date: 2008-07-21 13:36-0400\n"
"PO-Revision-Date: 2003-01-16 08:39+EDT\n"
"Last-Translator: Ge'ez Frontier Foundation <locales@geez.org>\n"
"Language-Team: Amharic <locales@geez.org>\n"
......@@ -16,73 +16,73 @@ msgstr ""
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
#: glib/gbookmarkfile.c:728 glib/gbookmarkfile.c:805 glib/gbookmarkfile.c:884
#: glib/gbookmarkfile.c:931
#: glib/gbookmarkfile.c:733 glib/gbookmarkfile.c:812 glib/gbookmarkfile.c:899
#: glib/gbookmarkfile.c:946
#, c-format
msgid "Unexpected attribute '%s' for element '%s'"
msgstr ""
#: glib/gbookmarkfile.c:739 glib/gbookmarkfile.c:816 glib/gbookmarkfile.c:826
#: glib/gbookmarkfile.c:942
#: glib/gbookmarkfile.c:744 glib/gbookmarkfile.c:823 glib/gbookmarkfile.c:833
#: glib/gbookmarkfile.c:957
#, c-format
msgid "Attribute '%s' of element '%s' not found"
msgstr ""
#: glib/gbookmarkfile.c:1112 glib/gbookmarkfile.c:1177
#: glib/gbookmarkfile.c:1241 glib/gbookmarkfile.c:1251
#: glib/gbookmarkfile.c:1127 glib/gbookmarkfile.c:1192
#: glib/gbookmarkfile.c:1256 glib/gbookmarkfile.c:1266
#, c-format
msgid "Unexpected tag '%s', tag '%s' expected"
msgstr ""
#: glib/gbookmarkfile.c:1137 glib/gbookmarkfile.c:1151
#: glib/gbookmarkfile.c:1219 glib/gbookmarkfile.c:1271
#: glib/gbookmarkfile.c:1152 glib/gbookmarkfile.c:1166
#: glib/gbookmarkfile.c:1234 glib/gbookmarkfile.c:1286
#, c-format
msgid "Unexpected tag '%s' inside '%s'"
msgstr ""
#: glib/gbookmarkfile.c:1798
#: glib/gbookmarkfile.c:1814
msgid "No valid bookmark file found in data dirs"
msgstr ""
#: glib/gbookmarkfile.c:1999
#: glib/gbookmarkfile.c:2015
#, c-format
msgid "A bookmark for URI '%s' already exists"
msgstr ""
#: glib/gbookmarkfile.c:2045 glib/gbookmarkfile.c:2202
#: glib/gbookmarkfile.c:2287 glib/gbookmarkfile.c:2367
#: glib/gbookmarkfile.c:2452 glib/gbookmarkfile.c:2535
#: glib/gbookmarkfile.c:2613 glib/gbookmarkfile.c:2692
#: glib/gbookmarkfile.c:2734 glib/gbookmarkfile.c:2831
#: glib/gbookmarkfile.c:2957 glib/gbookmarkfile.c:3147
#: glib/gbookmarkfile.c:3223 glib/gbookmarkfile.c:3388
#: glib/gbookmarkfile.c:3477 glib/gbookmarkfile.c:3567
#: glib/gbookmarkfile.c:3694
#: glib/gbookmarkfile.c:2061 glib/gbookmarkfile.c:2219
#: glib/gbookmarkfile.c:2304 glib/gbookmarkfile.c:2384
#: glib/gbookmarkfile.c:2469 glib/gbookmarkfile.c:2552
#: glib/gbookmarkfile.c:2630 glib/gbookmarkfile.c:2709
#: glib/gbookmarkfile.c:2751 glib/gbookmarkfile.c:2848
#: glib/gbookmarkfile.c:2974 glib/gbookmarkfile.c:3164
#: glib/gbookmarkfile.c:3240 glib/gbookmarkfile.c:3405
#: glib/gbookmarkfile.c:3494 glib/gbookmarkfile.c:3584
#: glib/gbookmarkfile.c:3712
#, c-format
msgid "No bookmark found for URI '%s'"
msgstr ""
#: glib/gbookmarkfile.c:2376
#: glib/gbookmarkfile.c:2393
#, c-format
msgid "No MIME type defined in the bookmark for URI '%s'"
msgstr ""
#: glib/gbookmarkfile.c:2461
#: glib/gbookmarkfile.c:2478
#, c-format
msgid "No private flag has been defined in bookmark for URI '%s'"
msgstr ""
#: glib/gbookmarkfile.c:2840
#: glib/gbookmarkfile.c:2857
#, c-format
msgid "No groups set in bookmark for URI '%s'"
msgstr ""
#: glib/gbookmarkfile.c:3241 glib/gbookmarkfile.c:3398
#: glib/gbookmarkfile.c:3258 glib/gbookmarkfile.c:3415
#, c-format
msgid "No application with name '%s' registered a bookmark for '%s'"
msgstr ""
#: glib/gbookmarkfile.c:3421
#: glib/gbookmarkfile.c:3438
#, c-format
msgid "Failed to expand exec line '%s' with URI '%s'"
msgstr ""
......@@ -158,7 +158,7 @@ msgstr "የእንግዳ ተቀባይ ስም ተቀብሏል"
msgid "Error opening directory '%s': %s"
msgstr ""
#: glib/gfileutils.c:557 glib/gfileutils.c:630
#: glib/gfileutils.c:557 glib/gfileutils.c:645
#, c-format
msgid "Could not allocate %lu bytes to read file \"%s\""
msgstr ""
......@@ -168,87 +168,92 @@ msgstr ""
msgid "Error reading file '%s': %s"
msgstr "ፋይል '%s'ን ለማንበብ ስህተት አለ፦ %s"
#: glib/gfileutils.c:654
#: glib/gfileutils.c:586
#, c-format
msgid "File \"%s\" is too large"
msgstr ""
#: glib/gfileutils.c:669
#, c-format
msgid "Failed to read from file '%s': %s"
msgstr ""
#: glib/gfileutils.c:705 glib/gfileutils.c:792
#: glib/gfileutils.c:720 glib/gfileutils.c:807
#, c-format
msgid "Failed to open file '%s': %s"
msgstr ""
#: glib/gfileutils.c:722 glib/gmappedfile.c:133
#: glib/gfileutils.c:737 glib/gmappedfile.c:133
#, c-format
msgid "Failed to get attributes of file '%s': fstat() failed: %s"
msgstr ""
#: glib/gfileutils.c:756
#: glib/gfileutils.c:771
#, c-format
msgid "Failed to open file '%s': fdopen() failed: %s"
msgstr ""
#: glib/gfileutils.c:890
#: glib/gfileutils.c:905
#, c-format
msgid "Failed to rename file '%s' to '%s': g_rename() failed: %s"
msgstr ""
#: glib/gfileutils.c:932 glib/gfileutils.c:1390
#: glib/gfileutils.c:947 glib/gfileutils.c:1405
#, c-format
msgid "Failed to create file '%s': %s"
msgstr ""
#: glib/gfileutils.c:946
#: glib/gfileutils.c:961
#, c-format
msgid "Failed to open file '%s' for writing: fdopen() failed: %s"
msgstr ""
#: glib/gfileutils.c:971
#: glib/gfileutils.c:986
#, c-format
msgid "Failed to write file '%s': fwrite() failed: %s"
msgstr ""
#: glib/gfileutils.c:990
#: glib/gfileutils.c:1005
#, c-format
msgid "Failed to close file '%s': fclose() failed: %s"
msgstr ""
#: glib/gfileutils.c:1108
#: glib/gfileutils.c:1123
#, c-format
msgid "Existing file '%s' could not be removed: g_unlink() failed: %s"
msgstr ""
#: glib/gfileutils.c:1352
#: glib/gfileutils.c:1367
#, c-format
msgid "Template '%s' invalid, should not contain a '%s'"
msgstr ""
#: glib/gfileutils.c:1365
#: glib/gfileutils.c:1380
#, c-format
msgid "Template '%s' doesn't contain XXXXXX"
msgstr ""
#: glib/gfileutils.c:1834
#: glib/gfileutils.c:1849
#, c-format
msgid "%.1f KB"
msgstr ""
#: glib/gfileutils.c:1839
#: glib/gfileutils.c:1854
#, c-format
msgid "%.1f MB"
msgstr ""
#: glib/gfileutils.c:1844
#: glib/gfileutils.c:1859
#, c-format
msgid "%.1f GB"
msgstr ""
#: glib/gfileutils.c:1887
#: glib/gfileutils.c:1902
#, c-format
msgid "Failed to read the symbolic link '%s': %s"
msgstr ""
#: glib/gfileutils.c:1908
#: glib/gfileutils.c:1923
msgid "Symbolic links not supported"
msgstr ""
......@@ -283,22 +288,22 @@ msgstr ""
msgid "Failed to map file '%s': mmap() failed: %s"
msgstr ""
#: glib/gmarkup.c:234 glib/gmarkup.c:250
#: glib/gmarkup.c:269 glib/gmarkup.c:285
#, c-format
msgid "Error on line %d char %d: "
msgstr ""
#: glib/gmarkup.c:344
#: glib/gmarkup.c:379
#, c-format
msgid "Error on line %d: %s"
msgstr ""
#: glib/gmarkup.c:448
#: glib/gmarkup.c:483
msgid ""
"Empty entity '&;' seen; valid entities are: &amp; &quot; &lt; &gt; &apos;"
msgstr ""
#: glib/gmarkup.c:458
#: glib/gmarkup.c:493
#, c-format
msgid ""
"Character '%s' is not valid at the start of an entity name; the & character "
......@@ -306,93 +311,93 @@ msgid ""
"it as &amp;"
msgstr ""
#: glib/gmarkup.c:492
#: glib/gmarkup.c:527
#, c-format
msgid "Character '%s' is not valid inside an entity name"
msgstr ""
#: glib/gmarkup.c:529
#: glib/gmarkup.c:564
#, c-format
msgid "Entity name '%s' is not known"
msgstr ""
#: glib/gmarkup.c:540
#: glib/gmarkup.c:575
msgid ""
"Entity did not end with a semicolon; most likely you used an ampersand "
"character without intending to start an entity - escape ampersand as &amp;"
msgstr ""
#: glib/gmarkup.c:593
#: glib/gmarkup.c:628
#, c-format
msgid ""
"Failed to parse '%-.*s', which should have been a digit inside a character "
"reference (&#234; for example) - perhaps the digit is too large"
msgstr ""
#: glib/gmarkup.c:618
#: glib/gmarkup.c:653
#, c-format
msgid "Character reference '%-.*s' does not encode a permitted character"
msgstr ""
#: glib/gmarkup.c:633
#: glib/gmarkup.c:668
msgid "Empty character reference; should include a digit such as &#454;"
msgstr ""
#: glib/gmarkup.c:643
#: glib/gmarkup.c:678
msgid ""
"Character reference did not end with a semicolon; most likely you used an "
"ampersand character without intending to start an entity - escape ampersand "
"as &amp;"
msgstr ""
#: glib/gmarkup.c:729
#: glib/gmarkup.c:764
msgid "Unfinished entity reference"
msgstr ""
#: glib/gmarkup.c:735
#: glib/gmarkup.c:770
msgid "Unfinished character reference"
msgstr ""
#: glib/gmarkup.c:978
#: glib/gmarkup.c:1056
#, fuzzy
msgid "Invalid UTF-8 encoded text - overlong sequence"
msgstr "የማይሰራ የUTF-8 ጽሑፍ"
#: glib/gmarkup.c:1006
#: glib/gmarkup.c:1084
#, fuzzy
msgid "Invalid UTF-8 encoded text - not a start char"
msgstr "የማይሰራ የUTF-8 ጽሑፍ"
#: glib/gmarkup.c:1042
#: glib/gmarkup.c:1120
#, fuzzy, c-format
msgid "Invalid UTF-8 encoded text - not valid '%s'"
msgstr "የማይሰራ የUTF-8 ጽሑፍ"
#: glib/gmarkup.c:1080
#: glib/gmarkup.c:1158
msgid "Document must begin with an element (e.g. <book>)"
msgstr ""
#: glib/gmarkup.c:1120
#: glib/gmarkup.c:1198
#, c-format
msgid ""
"'%s' is not a valid character following a '<' character; it may not begin an "
"element name"
msgstr ""
#: glib/gmarkup.c:1184
#: glib/gmarkup.c:1266
#, c-format
msgid ""
"Odd character '%s', expected a '>' character to end the start tag of element "
"'%s'"
"Odd character '%s', expected a '>' character to end the empty-element tag '%"
"s'"
msgstr ""
#: glib/gmarkup.c:1273
#: glib/gmarkup.c:1355
#, c-format
msgid ""
"Odd character '%s', expected a '=' after attribute name '%s' of element '%s'"
msgstr ""
#: glib/gmarkup.c:1315
#: glib/gmarkup.c:1397
#, c-format
msgid ""
"Odd character '%s', expected a '>' or '/' character to end the start tag of "
......@@ -400,87 +405,87 @@ msgid ""
"character in an attribute name"
msgstr ""
#: glib/gmarkup.c:1401
#: glib/gmarkup.c:1483
#, c-format
msgid ""
"Odd character '%s', expected an open quote mark after the equals sign when "
"giving value for attribute '%s' of element '%s'"
msgstr ""
#: glib/gmarkup.c:1543
#: glib/gmarkup.c:1625
#, c-format
msgid ""
"'%s' is not a valid character following the characters '</'; '%s' may not "
"begin an element name"
msgstr ""
#: glib/gmarkup.c:1583
#: glib/gmarkup.c:1665
#, c-format
msgid ""
"'%s' is not a valid character following the close element name '%s'; the "
"allowed character is '>'"
msgstr ""
#: glib/gmarkup.c:1594
#: glib/gmarkup.c:1676
#, c-format
msgid "Element '%s' was closed, no element is currently open"
msgstr ""
#: glib/gmarkup.c:1603
#: glib/gmarkup.c:1685
#, c-format
msgid "Element '%s' was closed, but the currently open element is '%s'"
msgstr ""
#: glib/gmarkup.c:1763
#: glib/gmarkup.c:1848
msgid "Document was empty or contained only whitespace"
msgstr ""
#: glib/gmarkup.c:1777
#: glib/gmarkup.c:1862
msgid "Document ended unexpectedly just after an open angle bracket '<'"
msgstr ""
#: glib/gmarkup.c:1785 glib/gmarkup.c:1830
#: glib/gmarkup.c:1870 glib/gmarkup.c:1915
#, c-format
msgid ""
"Document ended unexpectedly with elements still open - '%s' was the last "
"element opened"
msgstr ""
#: glib/gmarkup.c:1793
#: glib/gmarkup.c:1878
#, c-format
msgid ""
"Document ended unexpectedly, expected to see a close angle bracket ending "
"the tag <%s/>"
msgstr ""
#: glib/gmarkup.c:1799
#: glib/gmarkup.c:1884
msgid "Document ended unexpectedly inside an element name"
msgstr ""
#: glib/gmarkup.c:1805
#: glib/gmarkup.c:1890
msgid "Document ended unexpectedly inside an attribute name"
msgstr ""
#: glib/gmarkup.c:1810
#: glib/gmarkup.c:1895
msgid "Document ended unexpectedly inside an element-opening tag."
msgstr ""
#: glib/gmarkup.c:1816
#: glib/gmarkup.c:1901
msgid ""
"Document ended unexpectedly after the equals sign following an attribute "
"name; no attribute value"
msgstr ""
#: glib/gmarkup.c:1823
#: glib/gmarkup.c:1908
msgid "Document ended unexpectedly while inside an attribute value"
msgstr ""
#: glib/gmarkup.c:1839
#: glib/gmarkup.c:1924
#, c-format
msgid "Document ended unexpectedly inside the close tag for element '%s'"
msgstr ""
#: glib/gmarkup.c:1845
#: glib/gmarkup.c:1930
msgid "Document ended unexpectedly inside a comment or processing instruction"
msgstr ""
......@@ -1092,16 +1097,16 @@ msgstr ""
msgid "Operation was cancelled"
msgstr ""
#: gio/gcontenttype.c:176
#: gio/gcontenttype.c:180
msgid "Unknown type"
msgstr ""
#: gio/gcontenttype.c:177
#: gio/gcontenttype.c:181
#, c-format
msgid "%s filetype"
msgstr ""
#: gio/gcontenttype.c:667
#: gio/gcontenttype.c:678
#, c-format
msgid "%s type"
msgstr ""
......@@ -1110,50 +1115,51 @@ msgstr ""
msgid "Unexpected early end-of-stream"
msgstr ""
#: gio/gdesktopappinfo.c:430 gio/gwin32appinfo.c:222
#: gio/gdesktopappinfo.c:429 gio/gwin32appinfo.c:222
msgid "Unnamed"
msgstr ""
#: gio/gdesktopappinfo.c:607
#: gio/gdesktopappinfo.c:606
msgid "Desktop file didn't specify Exec field"
msgstr ""
#: gio/gdesktopappinfo.c:901
#: gio/gdesktopappinfo.c:900
msgid "Unable to find terminal required for application"
msgstr ""
#: gio/gdesktopappinfo.c:1133
#: gio/gdesktopappinfo.c:1132
#, c-format
msgid "Can't create user application configuration folder %s: %s"
msgstr ""
#: gio/gdesktopappinfo.c:1137
#: gio/gdesktopappinfo.c:1136
#, c-format
msgid "Can't create user MIME configuration folder %s: %s"
msgstr ""
#: gio/gdesktopappinfo.c:1476
#: gio/gdesktopappinfo.c:1475
#, c-format