AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Bump version

Browse Source
This commit is contained in:
Matthias Clasen 2010-02-23 15:53:03 -05:00 committed by Tristan Van Berkom
parent b51edbe745
commit 83518ec77c
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.in
View File

@ -12,7 +12,7 @@ AC_PREREQ(2.62)
m4_define([gtk_major_version], [2]) m4_define([gtk_major_version], [2])
m4_define([gtk_minor_version], [19]) m4_define([gtk_minor_version], [19])
m4_define([gtk_micro_version], [6]) m4_define([gtk_micro_version], [7])
m4_define([gtk_interface_age], [0]) m4_define([gtk_interface_age], [0])
m4_define([gtk_binary_age], m4_define([gtk_binary_age],
[m4_eval(100 * gtk_minor_version + gtk_micro_version)]) [m4_eval(100 * gtk_minor_version + gtk_micro_version)])

8
po/es.po
View File

@ -918,11 +918,7 @@ msgstr "Error de archivo al leer el QTIF atom: %s"
msgid "Failed to skip the next %d bytes with seek()." msgid "Failed to skip the next %d bytes with seek()."
msgstr "Falló al saltar a los siguientes %d bytes con la búsqueda." msgstr "Falló al saltar a los siguientes %d bytes con la búsqueda."
<<<<<<< HEAD
#: ../gdk-pixbuf/io-qtif.c:257
=======
#: gdk-pixbuf/io-qtif.c:257 #: gdk-pixbuf/io-qtif.c:257
>>>>>>> 2.19.6
msgid "Failed to allocate QTIF context structure." msgid "Failed to allocate QTIF context structure."
msgstr "Falló al reservar la estructura de contexto de QTIF." msgstr "Falló al reservar la estructura de contexto de QTIF."
@ -978,11 +974,7 @@ msgstr "No se pueden asignar los datos temporales de IOBuffer"
msgid "Cannot allocate new pixbuf" msgid "Cannot allocate new pixbuf"
msgstr "No se puede asignar un nuevo pixbuf" msgstr "No se puede asignar un nuevo pixbuf"
<<<<<<< HEAD
#: ../gdk-pixbuf/io-tga.c:686
=======
#: gdk-pixbuf/io-tga.c:686 #: gdk-pixbuf/io-tga.c:686
>>>>>>> 2.19.6
msgid "Image is corrupted or truncated" msgid "Image is corrupted or truncated"
msgstr "La imagen está corrupta o truncada" msgstr "La imagen está corrupta o truncada"