2.12.5GTK_2_12_5

svn path=/branches/gtk-2-12/; revision=19328

11 files changed, 38 insertions, 10 deletions

diff --git a/ChangeLog b/ChangeLog
index aadbe4228..b00771317 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* configure.in: Bump version
 
 	* === Released 2.12.4 ===
diff --git a/INSTALL b/INSTALL
index 517090084..04fc85c3d 100644
--- a/INSTALL
+++ b/INSTALL
@@ -4,7 +4,7 @@ Prerequisites
 GTK+ requires the following packages:
 
  - The GLib, Pango, ATK and cairo libraries, available at the same 
-   location as GTK+. GTK+ 2.12.4 requires at least GLib 2.12, 
+   location as GTK+. GTK+ 2.12.5 requires at least GLib 2.12, 
    Pango 1.13, ATK 1.9 and cairo 1.2.
 
  - The TIFF, PNG, and JPEG image loading libraries. You most
@@ -20,8 +20,8 @@ GTK+ requires the following packages:
 Simple install procedure
 ========================
 
-  % gzip -cd gtk+-2.12.4.tar.gz | tar xvf - # unpack the sources
-  % cd gtk+-2.12.4			   # change to the toplevel directory
+  % gzip -cd gtk+-2.12.5.tar.gz | tar xvf - # unpack the sources
+  % cd gtk+-2.12.5			   # change to the toplevel directory
   % ./configure				   # run the `configure' script
   % make				   # build GTK+
   [ Become root if necessary ]
diff --git a/NEWS b/NEWS
index 21385b1e2..f3d6e2db6 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,4 @@
-Overview of Changes from GTK+ 2.12.3 to 2.12.4
+Overview of Changes from GTK+ 2.12.3 to 2.12.5
 ==============================================
 
  * Bugs fixed:
diff --git a/README b/README
index 632665758..13fd659f1 100644
--- a/README
+++ b/README
@@ -1,7 +1,7 @@
 General Information
 ===================
 
-This is GTK+ version 2.12.4. GTK+ is a multi-platform toolkit for
+This is GTK+ version 2.12.5. GTK+ is a multi-platform toolkit for
 creating graphical user interfaces. Offering a complete set of widgets,
 GTK+ is suitable for projects ranging from small one-off projects to
 complete application suites.
diff --git a/contrib/gdk-pixbuf-xlib/ChangeLog b/contrib/gdk-pixbuf-xlib/ChangeLog
index a7ac9aa9a..3b2398ace 100644
--- a/contrib/gdk-pixbuf-xlib/ChangeLog
+++ b/contrib/gdk-pixbuf-xlib/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* === Released 2.12.4 ===
 
 2007-12-04  Matthias Clasen  <mclasen@redhat.com>
diff --git a/docs/reference/ChangeLog b/docs/reference/ChangeLog
index 2fec2e2f3..f676ebd57 100644
--- a/docs/reference/ChangeLog
+++ b/docs/reference/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* === Released 2.12.4 ===
 
 2007-12-30  Johannes Schmid <jhs@gnome.org>
diff --git a/gdk-pixbuf/ChangeLog b/gdk-pixbuf/ChangeLog
index 4f62a1756..ece3ff08a 100644
--- a/gdk-pixbuf/ChangeLog
+++ b/gdk-pixbuf/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* === Released 2.12.4 ===
 
 2007-12-09  Matthias Clasen  <mclasen@redhat.com>
diff --git a/gtk/xdgmime/ChangeLog b/gtk/xdgmime/ChangeLog
index 0dda771c6..fd29b99b8 100644
--- a/gtk/xdgmime/ChangeLog
+++ b/gtk/xdgmime/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* === Released 2.12.4 ===
 
 2007-12-04  Matthias Clasen  <mclasen@redhat.com>
diff --git a/po-properties/ChangeLog b/po-properties/ChangeLog
index 690f803d3..53067a48c 100644
--- a/po-properties/ChangeLog
+++ b/po-properties/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* === Released 2.12.4 ===
 
 2008-01-03  Tor Lillqvist  <tml@novell.com>
diff --git a/po/ChangeLog b/po/ChangeLog
index 1d82db858..a4f15a065 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,5 +1,9 @@
 2008-01-08  Matthias Clasen  <mclasen@redhat.com>
 
+	* === Released 2.12.5 ===
+
+2008-01-08  Matthias Clasen  <mclasen@redhat.com>
+
 	* === Released 2.12.4 ===
 
 2008-01-02  Priit Laes  <plaes at svn dot gnome dot org>
diff --git a/po/nn.po b/po/nn.po
index f4b805eed..465a5bf80 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -1481,8 +1481,8 @@ msgstr "_Uklarleik:"
 msgid "Transparency of the color."
 msgstr "Kor klar den valde fargen er."
 
-#: gtk/gtkcolorsel.c:1992
 #
+#: gtk/gtkcolorsel.c:1992
 msgid "Color _name:"
 msgstr "Farge_namn:"
 
@@ -1494,13 +1494,13 @@ msgstr ""
 "Du kan skriva inn ein heksadesimal fargeverdi i HTML-stil, eller eit "
 "fargenamn som t.d. «oransje»."
 
-#: gtk/gtkcolorsel.c:2036
 #
+#: gtk/gtkcolorsel.c:2036
 msgid "_Palette:"
 msgstr "_Palett:"
 
-#: gtk/gtkcolorsel.c:2065
 #
+#: gtk/gtkcolorsel.c:2065
 msgid "Color Wheel"
 msgstr "Fargehjul"
 
@@ -1516,8 +1516,8 @@ msgstr "Inndata _metoder"
 msgid "_Insert Unicode Control Character"
 msgstr "Set _inn Unicode-kontrollteikn"
 
-#: gtk/gtkfilechooserbutton.c:68
 #
+#: gtk/gtkfilechooserbutton.c:68
 msgid "Select A File"
 msgstr "Vel ei fil"
 
@@ -1525,8 +1525,8 @@ msgstr "Vel ei fil"
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: gtk/gtkfilechooserbutton.c:70
 #
+#: gtk/gtkfilechooserbutton.c:70
 msgid "(None)"
 msgstr "(Ingen)"