From ed32a052e7da6378fab37744f485563c4cba9336 Mon Sep 17 00:00:00 2001
From: "Ask H. Larsen" <asklarsen@gmail.com>
Date: Sun, 16 Sep 2012 13:12:22 +0200
Subject: [PATCH 01/15] Updated Danish translation

(cherry picked from commit bb5220dbd98517544d0ff8676061024fd8a361f3)
---
 po/da.po | 219 ++++++++++++++++++++++++++++++-------------------------
 1 file changed, 119 insertions(+), 100 deletions(-)

diff --git a/po/da.po b/po/da.po
index 3baef209c..6fb0614e0 100644
--- a/po/da.po
+++ b/po/da.po
@@ -3,15 +3,16 @@
 # This file is distributed under the same license as the cogl package.
 # Flemming Christensen <fc@stromata.dk>, 2011.
 # Kenneth Nielsen <k.nielsen81@gmail.com>, 2012.
+# Ask Hjorth Larsen <asklarsen@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2012-03-05 23:14+0000\n"
-"PO-Revision-Date: 2012-02-19 19:04+0100\n"
-"Last-Translator: Kenneth Nielsen <k.nielsen81@gmail.com>\n"
+"POT-Creation-Date: 2012-09-16 13:12+0200\n"
+"PO-Revision-Date: 2012-09-16 00:17+0200\n"
+"Last-Translator: Ask Hjorth Larsen <asklarsen@gmail.com>\n"
 "Language-Team: Danish <dansk@dansk-gruppen.dk>\n"
 "Language: da\n"
 "MIME-Version: 1.0\n"
@@ -19,212 +20,210 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
 
-#: cogl/cogl-debug.c:172
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "Understøttede fejlfindingsværdier:"
 
-#: cogl/cogl-debug.c:177
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "Specielle fejlfindingsværdier:"
 
-#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "Aktiverer alle ikke-opførsels-fejlfindingsvalgmuligheder"
 
-#: cogl/cogl-debug.c:225
-msgid "Cogl debugging flags to set"
-msgstr "Cogl fejlfindingsflag der skal angives"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "Yderligere miljøvariable:"
 
-#: cogl/cogl-debug.c:227
-msgid "Cogl debugging flags to unset"
-msgstr "Cogl fejlfindingsflag der skal fjernes"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+"Kommaadskilt liste af GL-udvidelser som vi forestiller os er deaktiveret"
 
-#: cogl/cogl-debug.c:276
-msgid "Cogl Options"
-msgstr "Cogl-tilvalg"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr "Tilsidesæt GL-versionen som Cogl vil antage at driveren understøtter"
 
-#: cogl/cogl-debug.c:277
-msgid "Show Cogl options"
-msgstr "Vis Cogl-tilvalg"
-
-#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30
-#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40
-#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50
-#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61
-#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71
-#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163
-#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
+#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
+#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50
+#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61
+#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
+#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
+#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Cogl-sporing"
 
-#: cogl/cogl-debug-options.h:27
+#: ../cogl/cogl-debug-options.h:27
 msgid "CoglObject references"
 msgstr "CoglObject-referencer"
 
-#: cogl/cogl-debug-options.h:28
+#: ../cogl/cogl-debug-options.h:28
 msgid "Debug ref counting issues for CoglObjects"
 msgstr "Fejlfind referencetællingsproblemer for CoglObjects"
 
-#: cogl/cogl-debug-options.h:32
+#: ../cogl/cogl-debug-options.h:32
 msgid "Trace Texture Slicing"
 msgstr "Spor teksturopskæring"
 
-#: cogl/cogl-debug-options.h:33
+#: ../cogl/cogl-debug-options.h:33
 msgid "debug the creation of texture slices"
 msgstr "fejlfind dannelsen af teksturskiver"
 
-#: cogl/cogl-debug-options.h:37
+#: ../cogl/cogl-debug-options.h:37
 msgid "Trace Atlas Textures"
 msgstr "Spor atlasteksturer"
 
-#: cogl/cogl-debug-options.h:38
+#: ../cogl/cogl-debug-options.h:38
 msgid "Debug texture atlas management"
 msgstr "Fejlfind tekstur-atlashåndtering"
 
-#: cogl/cogl-debug-options.h:42
+#: ../cogl/cogl-debug-options.h:42
 msgid "Trace Blend Strings"
 msgstr "Spor blanding af strenge"
 
-#: cogl/cogl-debug-options.h:43
+#: ../cogl/cogl-debug-options.h:43
 msgid "Debug CoglBlendString parsing"
 msgstr "Fejlfind tolkning af CoglBlendString"
 
-#: cogl/cogl-debug-options.h:47
+#: ../cogl/cogl-debug-options.h:47
 msgid "Trace Journal"
 msgstr "Spor journal"
 
-#: cogl/cogl-debug-options.h:48
+#: ../cogl/cogl-debug-options.h:48
 msgid "View all the geometry passing through the journal"
 msgstr "Se al geometri som passerer gennem journalen"
 
-#: cogl/cogl-debug-options.h:52
+#: ../cogl/cogl-debug-options.h:52
 msgid "Trace Batching"
 msgstr "Spor gruppering"
 
-#: cogl/cogl-debug-options.h:53
+#: ../cogl/cogl-debug-options.h:53
 msgid "Show how geometry is being batched in the journal"
 msgstr "Vis hvordan geometri som passerer gennem journalen grupperes"
 
-#: cogl/cogl-debug-options.h:57
+#: ../cogl/cogl-debug-options.h:57
 msgid "Trace matrices"
 msgstr "Spor matricer"
 
-#: cogl/cogl-debug-options.h:58
+#: ../cogl/cogl-debug-options.h:58
 msgid "Trace all matrix manipulation"
 msgstr "Spor al matrixmanipulation"
 
-#: cogl/cogl-debug-options.h:63
+#: ../cogl/cogl-debug-options.h:63
 msgid "Trace Misc Drawing"
 msgstr "Spor diverse tegneoperationer"
 
-#: cogl/cogl-debug-options.h:64
+#: ../cogl/cogl-debug-options.h:64
 msgid "Trace some misc drawing operations"
 msgstr "Spor visse generelle tegneoperationer"
 
-#: cogl/cogl-debug-options.h:68
+#: ../cogl/cogl-debug-options.h:68
 msgid "Trace Pango Renderer"
 msgstr "Spor Pango-rendering"
 
-#: cogl/cogl-debug-options.h:69
+#: ../cogl/cogl-debug-options.h:69
 msgid "Trace the Cogl Pango renderer"
 msgstr "Spor Cogls Pango-rendering"
 
-#: cogl/cogl-debug-options.h:73
+#: ../cogl/cogl-debug-options.h:73
 msgid "Trace CoglTexturePixmap backend"
 msgstr "Spor det underliggende CoglTexturePixmap-program"
 
-#: cogl/cogl-debug-options.h:74
+#: ../cogl/cogl-debug-options.h:74
 msgid "Trace the Cogl texture pixmap backend"
 msgstr "Spor Cogls underliggende teksturpixmap-program"
 
-#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81
+#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81
 msgid "Visualize"
 msgstr "Visualisér"
 
-#: cogl/cogl-debug-options.h:78
+#: ../cogl/cogl-debug-options.h:78
 msgid "Outline rectangles"
 msgstr "Omrids rektangler"
 
-#: cogl/cogl-debug-options.h:79
+#: ../cogl/cogl-debug-options.h:79
 msgid "Add wire outlines for all rectangular geometry"
 msgstr "Tilføj trådomrids for alle rektangulære geometrier"
 
-#: cogl/cogl-debug-options.h:83
+#: ../cogl/cogl-debug-options.h:83
 msgid "Show wireframes"
 msgstr "Vis trådrammer"
 
-#: cogl/cogl-debug-options.h:84
+#: ../cogl/cogl-debug-options.h:84
 msgid "Add wire outlines for all geometry"
 msgstr "Tilføj trådomrids for alle geometrier"
 
-#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91
-#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101
-#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116
-#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127
-#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137
-#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147
-#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173
-#: cogl/cogl-debug-options.h:178
+#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91
+#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101
+#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116
+#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127
+#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137
+#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147
+#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173
+#: ../cogl/cogl-debug-options.h:178
 msgid "Root Cause"
 msgstr "Underliggende årsag"
 
-#: cogl/cogl-debug-options.h:88
+#: ../cogl/cogl-debug-options.h:88
 msgid "Disable Journal batching"
 msgstr "Deaktivér journalgruppering"
 
-#: cogl/cogl-debug-options.h:89
+#: ../cogl/cogl-debug-options.h:89
 msgid "Disable batching of geometry in the Cogl Journal."
 msgstr "Deaktivér gruppering af geometri i Cogl-journalen."
 
-#: cogl/cogl-debug-options.h:93
+#: ../cogl/cogl-debug-options.h:93
 msgid "Disable GL Vertex Buffers"
 msgstr "Deaktivér GL-hjørnebuffere"
 
-#: cogl/cogl-debug-options.h:94
+#: ../cogl/cogl-debug-options.h:94
 msgid "Disable use of OpenGL vertex buffer objects"
 msgstr "Deaktivér brugen af OpenGL-hjørnebufferobjekter"
 
-#: cogl/cogl-debug-options.h:98
+#: ../cogl/cogl-debug-options.h:98
 msgid "Disable GL Pixel Buffers"
 msgstr "Deaktivér GL-pixelbuffere"
 
-#: cogl/cogl-debug-options.h:99
+#: ../cogl/cogl-debug-options.h:99
 msgid "Disable use of OpenGL pixel buffer objects"
 msgstr "Deaktivér brugen af OpenGL-pixelbufferobjekter"
 
-#: cogl/cogl-debug-options.h:103
+#: ../cogl/cogl-debug-options.h:103
 msgid "Disable software rect transform"
 msgstr "Deaktivér software-rekt.-transformation"
 
-#: cogl/cogl-debug-options.h:104
+#: ../cogl/cogl-debug-options.h:104
 msgid "Use the GPU to transform rectangular geometry"
 msgstr "Brug GPU'en til at transformere rektangulær geometri"
 
-#: cogl/cogl-debug-options.h:106
+#: ../cogl/cogl-debug-options.h:106
 msgid "Cogl Specialist"
 msgstr "Cogl-specialist"
 
-#: cogl/cogl-debug-options.h:108
+#: ../cogl/cogl-debug-options.h:108
 msgid "Dump atlas images"
 msgstr "Smid atlasbilleder"
 
-#: cogl/cogl-debug-options.h:109
+#: ../cogl/cogl-debug-options.h:109
 msgid "Dump texture atlas changes to an image file"
 msgstr "Smid teksturatlasændringer til en billedfil"
 
-#: cogl/cogl-debug-options.h:113
+#: ../cogl/cogl-debug-options.h:113
 msgid "Disable texture atlasing"
 msgstr "Deaktivér teksturatlasering"
 
-#: cogl/cogl-debug-options.h:114
+#: ../cogl/cogl-debug-options.h:114
 msgid "Disable use of texture atlasing"
 msgstr "Deaktivér brugen af teksturatlasering"
 
-#: cogl/cogl-debug-options.h:118
+#: ../cogl/cogl-debug-options.h:118
 msgid "Disable sharing the texture atlas between text and images"
 msgstr "Deaktivér deling af teksturatlasset mellem tekst og billeder"
 
-#: cogl/cogl-debug-options.h:119
+#: ../cogl/cogl-debug-options.h:119
 msgid ""
 "When this is set the glyph cache will always use a separate texture for its "
 "atlas. Otherwise it will try to share the atlas with images."
@@ -232,53 +231,53 @@ msgstr ""
 "Når dette er sat, vil glyfcachen altid bruge en separat tekstur til dens "
 "atlas, ellers vil den prøve at dele atlasset med billederne."
 
-#: cogl/cogl-debug-options.h:124
+#: ../cogl/cogl-debug-options.h:124
 msgid "Disable texturing"
 msgstr "Deaktivér teksturering"
 
-#: cogl/cogl-debug-options.h:125
+#: ../cogl/cogl-debug-options.h:125
 msgid "Disable texturing any primitives"
 msgstr "Deaktivér teksturering af alle primitive"
 
-#: cogl/cogl-debug-options.h:129
+#: ../cogl/cogl-debug-options.h:129
 msgid "Disable arbfp"
 msgstr "Deaktivér arbfp"
 
-#: cogl/cogl-debug-options.h:130
+#: ../cogl/cogl-debug-options.h:130
 msgid "Disable use of ARB fragment programs"
 msgstr "Deaktivér brugen af ARB-fragmentprogrammer"
 
-#: cogl/cogl-debug-options.h:134
+#: ../cogl/cogl-debug-options.h:134
 msgid "Disable fixed"
 msgstr "Deaktivér fastlåste"
 
-#: cogl/cogl-debug-options.h:135
+#: ../cogl/cogl-debug-options.h:135
 msgid "Disable use of the fixed function pipeline backend"
 msgstr ""
 "Deaktivér brugen af det underliggende datakanalsprogram med fastlåste "
 "funktioner"
 
-#: cogl/cogl-debug-options.h:139
+#: ../cogl/cogl-debug-options.h:139
 msgid "Disable GLSL"
 msgstr "Deaktivér GLSL"
 
-#: cogl/cogl-debug-options.h:140
+#: ../cogl/cogl-debug-options.h:140
 msgid "Disable use of GLSL"
 msgstr "Deaktivér brugen af GLSL"
 
-#: cogl/cogl-debug-options.h:144
+#: ../cogl/cogl-debug-options.h:144
 msgid "Disable blending"
 msgstr "Deaktivér blanding"
 
-#: cogl/cogl-debug-options.h:145
+#: ../cogl/cogl-debug-options.h:145
 msgid "Disable use of blending"
 msgstr "Deaktivér brugen af blanding"
 
-#: cogl/cogl-debug-options.h:149
+#: ../cogl/cogl-debug-options.h:149
 msgid "Disable non-power-of-two textures"
 msgstr "Deaktiver ikke-anden-potens-teksturer"
 
-#: cogl/cogl-debug-options.h:150
+#: ../cogl/cogl-debug-options.h:150
 msgid ""
 "Makes Cogl think that the GL driver doesn't support NPOT textures so that it "
 "will create sliced textures or textures with waste instead."
@@ -287,61 +286,81 @@ msgstr ""
 "teksturer, så den vil danne teksturer som skiver, eller teksturer med spild "
 "i stedet."
 
-#: cogl/cogl-debug-options.h:155
+#: ../cogl/cogl-debug-options.h:155
 msgid "Disable software clipping"
 msgstr "Deaktivér softwareklipning"
 
-#: cogl/cogl-debug-options.h:156
+#: ../cogl/cogl-debug-options.h:156
 msgid "Disables Cogl's attempts to clip some rectangles in software."
 msgstr "Deaktivér Cogls forsøg på at klippe visse rektangler i software."
 
-#: cogl/cogl-debug-options.h:160
+#: ../cogl/cogl-debug-options.h:160
 msgid "Show source"
 msgstr "Vis kilde"
 
-#: cogl/cogl-debug-options.h:161
+#: ../cogl/cogl-debug-options.h:161
 msgid "Show generated ARBfp/GLSL source code"
 msgstr "Vis genereret ARBfp/GLSL-kildekode"
 
-#: cogl/cogl-debug-options.h:165
+#: ../cogl/cogl-debug-options.h:165
 msgid "Trace some OpenGL"
 msgstr "Spor OpenGL delvist"
 
-#: cogl/cogl-debug-options.h:166
+#: ../cogl/cogl-debug-options.h:166
 msgid "Traces some select OpenGL calls"
 msgstr "Spor visse udvalgte OpenGL-kald"
 
-#: cogl/cogl-debug-options.h:170
+#: ../cogl/cogl-debug-options.h:170
 msgid "Trace offscreen support"
 msgstr "Spor uden-for-skærmen-understøttelse"
 
-#: cogl/cogl-debug-options.h:171
+#: ../cogl/cogl-debug-options.h:171
 msgid "Debug offscreen support"
 msgstr "Fejlfind uden-for-skærmen-understøttelse"
 
-#: cogl/cogl-debug-options.h:175
+#: ../cogl/cogl-debug-options.h:175
 msgid "Disable program caches"
 msgstr "Deaktivér programcacher"
 
-#: cogl/cogl-debug-options.h:176
+#: ../cogl/cogl-debug-options.h:176
 msgid "Disable fallback caches for arbfp and glsl programs"
 msgstr "Deaktivér reservecacher for arbfp- og glsl-programmer"
 
-#: cogl/cogl-debug-options.h:180
+#: ../cogl/cogl-debug-options.h:180
 msgid "Disable read pixel optimization"
 msgstr "Deaktivér læs-pixel-optimering"
 
-#: cogl/cogl-debug-options.h:181
+#: ../cogl/cogl-debug-options.h:181
 msgid ""
 "Disable optimization for reading 1px for simple scenes of opaque rectangles"
 msgstr ""
 "Deaktivér optimering for at læse 1px for simple scener af uigennemsigtige "
 "rektangler"
 
-#: cogl/cogl-debug-options.h:186
+#: ../cogl/cogl-debug-options.h:186
 msgid "Trace clipping"
 msgstr "Spor klipning"
 
-#: cogl/cogl-debug-options.h:187
+#: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Logger information om hvordan Cogl implementerer klipning"
+
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "Ydelsesbekymringer angående spor"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "Prøver at fremhæve ikke-optimal brug af Cogl."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Cogl fejlfindingsflag der skal angives"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr "Cogl fejlfindingsflag der skal fjernes"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Cogl-tilvalg"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Vis Cogl-tilvalg"

From 192920e351db3ff78f03831d2beb276b87f356c8 Mon Sep 17 00:00:00 2001
From: Gil Forcada <gforcada@gnome.org>
Date: Tue, 18 Sep 2012 01:43:51 +0200
Subject: [PATCH 02/15] [l10n] Updated Catalan translation

(cherry picked from commit 1a39fb66c1531ef53c8a700fc85bde1fb97bc624)
---
 po/ca.po | 60 ++++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 41 insertions(+), 19 deletions(-)

diff --git a/po/ca.po b/po/ca.po
index be62baf88..bbe1eef0d 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -10,43 +10,43 @@ msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-04-05 12:49+0000\n"
-"PO-Revision-Date: 2012-03-25 23:15+0200\n"
+"POT-Creation-Date: 2012-08-29 14:01+0000\n"
+"PO-Revision-Date: 2012-08-30 01:07+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
+"Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bits\n"
-"Language: ca\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../cogl/cogl-debug.c:173
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "Valors de depuració permesos:"
 
-#: ../cogl/cogl-debug.c:178
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "Valors de depuració especials:"
 
-#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "Habilita totes les opcions de depuració que no tinguin comportament"
 
-#: ../cogl/cogl-debug.c:226
-msgid "Cogl debugging flags to set"
-msgstr "Senyaladors de depuració de la Cogl a definir"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "Variables d'entorn addicionals:"
 
-#: ../cogl/cogl-debug.c:228
-msgid "Cogl debugging flags to unset"
-msgstr "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+"Llista separada per comes amb les extensions de GL que s'ha de fer veure que "
+"estan inhabilitades"
 
-#: ../cogl/cogl-debug.c:277
-msgid "Cogl Options"
-msgstr "Opcions de la Cogl"
-
-#: ../cogl/cogl-debug.c:278
-msgid "Show Cogl options"
-msgstr "Mostra les opcions de la Cogl"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr ""
+"Sobreescriu la versió de GL que la Cogl assumeix que implementa el "
+"controlador"
 
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
@@ -55,6 +55,7 @@ msgstr "Mostra les opcions de la Cogl"
 #: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
 #: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
 #: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Traçat de la Cogl"
 
@@ -347,3 +348,24 @@ msgstr "Traça el tallat"
 #: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Registra informació sobre com la Cogl implementa el tallat"
+
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "Traça els problemes de rendiment"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "Intenta ressaltar utilitzacions no òptimes de la Cogl."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Senyaladors de depuració de la Cogl a definir"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr ""
+#~ "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Opcions de la Cogl"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Mostra les opcions de la Cogl"

From e3e53f2c708def782578ad05834ac0fd66a5858b Mon Sep 17 00:00:00 2001
From: Carles Ferrando <carles.ferrando@gmail.com>
Date: Tue, 18 Sep 2012 01:43:53 +0200
Subject: [PATCH 03/15] [l10n]Updated Catalan (Valencian) translation

(cherry picked from commit 829e090deb5decbeb60519c26199a403ae8174b0)
---
 po/ca@valencia.po | 58 ++++++++++++++++++++++++++++++++---------------
 1 file changed, 40 insertions(+), 18 deletions(-)

diff --git a/po/ca@valencia.po b/po/ca@valencia.po
index 1c561629c..d7d9d8bb0 100644
--- a/po/ca@valencia.po
+++ b/po/ca@valencia.po
@@ -10,8 +10,8 @@ msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2012-04-10 20:57+0200\n"
-"PO-Revision-Date: 2012-03-25 23:15+0200\n"
+"POT-Creation-Date: 2012-09-18 01:43+0200\n"
+"PO-Revision-Date: 2012-08-30 01:07+0200\n"
 "Last-Translator: Gil Forcada <gilforcada@guifi.net>\n"
 "Language-Team: Catalan <tradgnome@softcatala.org>\n"
 "Language: ca-XV\n"
@@ -20,33 +20,33 @@ msgstr ""
 "Content-Transfer-Encoding: 8bits\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../cogl/cogl-debug.c:173
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "Valors de depuració permesos:"
 
-#: ../cogl/cogl-debug.c:178
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "Valors de depuració especials:"
 
-#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "Habilita totes les opcions de depuració que no tinguen comportament"
 
-#: ../cogl/cogl-debug.c:226
-msgid "Cogl debugging flags to set"
-msgstr "Senyaladors de depuració de la Cogl a definir"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "Variables d'entorn addicionals:"
 
-#: ../cogl/cogl-debug.c:228
-msgid "Cogl debugging flags to unset"
-msgstr "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+"Llista separada per comes amb les extensions de GL que s'ha de fer veure que "
+"estan inhabilitades"
 
-#: ../cogl/cogl-debug.c:277
-msgid "Cogl Options"
-msgstr "Opcions de la Cogl"
-
-#: ../cogl/cogl-debug.c:278
-msgid "Show Cogl options"
-msgstr "Mostra les opcions de la Cogl"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr ""
+"Sobreescriu la versió de GL que la Cogl assumeix que implementa el "
+"controlador"
 
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
@@ -55,6 +55,7 @@ msgstr "Mostra les opcions de la Cogl"
 #: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
 #: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
 #: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Traçat de la Cogl"
 
@@ -347,3 +348,24 @@ msgstr "Traça el tallat"
 #: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Registra informació sobre com la Cogl implementa el tallat"
+
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "Traça els problemes de rendiment"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "Intenta ressaltar utilitzacions no òptimes de la Cogl."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Senyaladors de depuració de la Cogl a definir"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr ""
+#~ "Senyaladors de depuració de la Cogl dels quals desfer-ne la definició"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Opcions de la Cogl"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Mostra les opcions de la Cogl"

From 7253c5ca297f4ae18ce1ed2c63fcf4b57f39cf7a Mon Sep 17 00:00:00 2001
From: Chun-wei Fan <fanchunwei@src.gnome.org>
Date: Fri, 17 Aug 2012 11:30:17 +0800
Subject: [PATCH 04/15] Bug 682071-cogl/cogl-sdl.h: MSVC: Link to SDL when apps
 are built

Link to SDL.lib and SDLmain.lib if Cogl was built with the SDL winsys.

Recent changes to the SDL winsys introduced a direct dependency to
SDLmain.lib (and hence SDL.lib) when programs are built, causing linker
errors to appear when any programs using cogl (with the SDL winsys built
in) are built.

Since we cannot determine whether a Cogl build is built with the SDL winsys
at build time easily, we could use #pragma comment (lib, ...) whenever
cogl-sdl.h is included by cogl.h so that SDLmain.lib and SDL.lib is linked
into the resulting binary, so that the program can link and run correctly.

This does not add any external dependencies as the Cogl DLL already depends
on SDL.dll when it is built with the SDL winsys.

https://bugzilla.gnome.org/show_bug.cgi?id=682071

(cherry picked from commit 2921d2a4d9c79f1ca7530171e0dfa8c945607bc7)
---
 cogl/cogl-sdl.h | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/cogl/cogl-sdl.h b/cogl/cogl-sdl.h
index 732beaf10..6e9c079bd 100644
--- a/cogl/cogl-sdl.h
+++ b/cogl/cogl-sdl.h
@@ -31,6 +31,15 @@
 #include <cogl/cogl-context.h>
 #include <SDL.h>
 
+#ifdef _MSC_VER
+/* We need to link to SDL.lib/SDLmain.lib
+ * if we are using Cogl
+ * that uses the SDL winsys
+ */
+#pragma comment (lib, "SDL.lib")
+#pragma comment (lib, "SDLmain.lib")
+#endif
+
 G_BEGIN_DECLS
 
 /**

From fc0c3c8be715eeec9e4895d1320e90f64c3b9892 Mon Sep 17 00:00:00 2001
From: Rajesh Ranjan <rranjan@redhat.com>
Date: Wed, 19 Sep 2012 17:47:18 +0530
Subject: [PATCH 05/15] hindi update

(cherry picked from commit 38201324e9543fa4c4b613829b6c1199778f02d5)
---
 po/hi.po | 66 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 43 insertions(+), 23 deletions(-)

diff --git a/po/hi.po b/po/hi.po
index bc531312b..0a2ba6c07 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -3,49 +3,48 @@
 # This file is distributed under the same license as the cogl package.
 #
 # chandan kumar <chandankumar.093047@gmail.com>, 2012.
+# rajesh <rajeshkajha@yahoo.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-21 16:31+0000\n"
-"PO-Revision-Date: 2012-03-22 18:15+0530\n"
-"Last-Translator: chandankumar(ciypro) <chandankumar.093047@gmail.com>\n"
+"POT-Creation-Date: 2012-08-01 10:44+0000\n"
+"PO-Revision-Date: 2012-09-19 17:46+0530\n"
+"Last-Translator: rajesh <rajeshkajha@yahoo.com>\n"
 "Language-Team: Hindi <kde-i18n-doc@kde.org>\n"
+"Language: hi\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: hi\n"
 "X-Generator: Lokalize 1.2\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../cogl/cogl-debug.c:173
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "समर्थित डीबग मान:"
 
-#: ../cogl/cogl-debug.c:178
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "विशेष डीबग मानों:"
 
-#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "सभी गैर-व्यवहारिक डिबग विकल्प सक्रीय"
 
-#: ../cogl/cogl-debug.c:226
-msgid "Cogl debugging flags to set"
-msgstr "Cogl डिबगिंग फ्लैग सेट किया जाना है"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "अतिरिक्त वातावरण चर:"
 
-#: ../cogl/cogl-debug.c:228
-msgid "Cogl debugging flags to unset"
-msgstr "Cogl डिबगिंग फ्लैग अनसेट किया जाना है"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+"GL एक्सटेंशन का कौमा से पृथक सूची जिसे प्रीटेंड किया जाना है निष्क्रिय किया "
+"गया है"
 
-#: ../cogl/cogl-debug.c:277
-msgid "Cogl Options"
-msgstr "Cogl विकल्प"
-
-#: ../cogl/cogl-debug.c:278
-msgid "Show Cogl options"
-msgstr "Cogl विकल्प दिखाएँ"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr "GL संस्करण को अधिरोहित करें जो Cogl ड्राइवर के समर्थन को लेगा"
 
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
@@ -54,6 +53,7 @@ msgstr "Cogl विकल्प दिखाएँ"
 #: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
 #: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
 #: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Cogl ट्रैस कर रहा है"
 
@@ -230,7 +230,8 @@ msgid ""
 "atlas. Otherwise it will try to share the atlas with images."
 msgstr ""
 "जब यह सेट है कि ग्लिफ़ कैश इस एटलस के लिए हमेशा एक अलग बनावट का उपयोग करेगा. "
-"अन्यथा यह छवियों के साथ एटलस को साझा करने की कोशिश करेंगे."
+"अन्यथा "
+"यह छवियों के साथ एटलस को साझा करने की कोशिश करेंगे."
 
 #: ../cogl/cogl-debug-options.h:124
 msgid "Disable texturing"
@@ -282,8 +283,8 @@ msgid ""
 "will create sliced textures or textures with waste instead."
 msgstr ""
 "Cogl को लगता है की GL  ड्राइवर NPOT बनावट का समर्थन नहीं करता है इसीलिए यह "
-"कचरे के साथ "
-"कटा हुआ बनावट या बनावट के बजाय पैदा करने के लिए बनाएगा."
+"कचरे के "
+"साथ कटा हुआ बनावट या बनावट के बजाय पैदा करने के लिए बनाएगा."
 
 #: ../cogl/cogl-debug-options.h:155
 msgid "Disable software clipping"
@@ -344,3 +345,22 @@ msgstr "क्लिपिंग ट्रेस करें"
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Cogl क्लिपिंग को कैसे लागू कर है के बारे में जानकारी लॉग्स करें"
 
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "ट्रेस प्रदर्शन मुद्दे"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "उप अनुकूलित Cogl प्रयोग को आलोकित करने की कोशिश करता है."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Cogl डिबगिंग फ्लैग सेट किया जाना है"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr "Cogl डिबगिंग फ्लैग अनसेट किया जाना है"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Cogl विकल्प"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Cogl विकल्प दिखाएँ"

From 700e7df85d93efbbaf7d14baba63ac3d028807a5 Mon Sep 17 00:00:00 2001
From: Alexander Shopov <ash@kambanaria.org>
Date: Wed, 19 Sep 2012 21:11:43 +0300
Subject: [PATCH 06/15] Updated Bulgarian translation

(cherry picked from commit 93d7defa7fbb1a9ccb56beef882699008b7b9d44)
---
 po/bg.po | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/po/bg.po b/po/bg.po
index 408137dd4..ba8ef6665 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9,8 +9,8 @@ msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=clutter\n"
-"POT-Creation-Date: 2012-06-27 07:20+0300\n"
-"PO-Revision-Date: 2012-06-27 07:20+0300\n"
+"POT-Creation-Date: 2012-09-19 21:11+0300\n"
+"PO-Revision-Date: 2012-09-19 21:11+0300\n"
 "Last-Translator: Alexander Shopov <ash@kambanaria.org>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "Language: bg\n"
@@ -32,6 +32,20 @@ msgid "Enables all non-behavioural debug options"
 msgstr ""
 "Включване на всички флагове за изчистване на грешки освен тези за поведението"
 
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "Допълнителни променливи от обвивката:"
+
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr "Списък с разширения на GL, които Cogl да приема, че липсват"
+
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr ""
+"Изрично задаване на версията на GL, която Cogl да приема, че драйверът "
+"поддържа"
+
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
 #: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50

From 19fa0efb72f101c72745bf312291d6fd5db3a74f Mon Sep 17 00:00:00 2001
From: "Dr.T.Vasudevan" <agnihot3@gmail.com>
Date: Sat, 1 Sep 2012 13:28:13 +0530
Subject: [PATCH 07/15] updated Tamil translation

(cherry picked from commit 1b7743f0c29981b4d91ca9faa16fa4543662c2a7)
---
 po/ta.po | 160 +++++++++++++++++++++++++++++++------------------------
 1 file changed, 89 insertions(+), 71 deletions(-)

diff --git a/po/ta.po b/po/ta.po
index 139ceaed9..0340817fc 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -3,33 +3,34 @@
 # This file is distributed under the same license as the cogl package.
 #
 # I Felix <ifelix@redhat.com>, 2011.
+# Shantha Kumar <shantha.thamizh@gmail.com> 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
-"product=clutter\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
+"cgi?product=clutter\n"
 "POT-Creation-Date: 2012-03-05 23:14+0000\n"
-"PO-Revision-Date: 2011-09-08 11:11+0530\n"
-"Last-Translator: I Felix <ifelix@redhat.com>\n"
+"PO-Revision-Date: 2012-08-31 09:43+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "Language: ta\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.2\n"
+"X-Generator: Lokalize 1.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: cogl/cogl-debug.c:172
 msgid "Supported debug values:"
-msgstr ""
+msgstr "ஆதரிக்கப்படும் வழுநீக்கல் மதிப்புகள்:"
 
 #: cogl/cogl-debug.c:177
 msgid "Special debug values:"
-msgstr ""
+msgstr "சிறப்பு வழுநீக்கல் மதிப்புகள்:"
 
 #: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181
 msgid "Enables all non-behavioural debug options"
-msgstr ""
+msgstr "நடத்தை - அல்லாத பிற ஏல்லா வழுநீக்கல் விருப்பங்களையும் செயல்படுத்தும்"
 
 #: cogl/cogl-debug.c:225
 msgid "Cogl debugging flags to set"
@@ -55,107 +56,107 @@ msgstr "Cogl விருப்பங்களை காட்டவும்"
 #: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163
 #: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184
 msgid "Cogl Tracing"
-msgstr ""
+msgstr "Cogl தடமறிதல்"
 
 #: cogl/cogl-debug-options.h:27
 msgid "CoglObject references"
-msgstr ""
+msgstr "CoglObject குறிப்புகள்"
 
 #: cogl/cogl-debug-options.h:28
 msgid "Debug ref counting issues for CoglObjects"
-msgstr ""
+msgstr "CoglObjects க்கான குறிப்பு எண்ணிடல் சிக்கல்களை வழுநீக்கு"
 
 #: cogl/cogl-debug-options.h:32
 msgid "Trace Texture Slicing"
-msgstr ""
+msgstr "டெக்ஸ்ச்சர் ஸ்லைசிங்கை தடமறி"
 
 #: cogl/cogl-debug-options.h:33
 msgid "debug the creation of texture slices"
-msgstr ""
+msgstr "டெக்ஸ்ச்சர் ஸ்லைசஸின் உருவாக்கத்தை வழுநீக்கு"
 
 #: cogl/cogl-debug-options.h:37
 msgid "Trace Atlas Textures"
-msgstr ""
+msgstr "அட்லாஸ் டெக்ஸ்ச்சர்களைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:38
 msgid "Debug texture atlas management"
-msgstr ""
+msgstr "டெக்ஸ்ச்சர் அட்லாஸ் நிர்வாகத்தை வழுநீக்கு"
 
 #: cogl/cogl-debug-options.h:42
 msgid "Trace Blend Strings"
-msgstr ""
+msgstr "கலப்பு சரங்களைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:43
 msgid "Debug CoglBlendString parsing"
-msgstr ""
+msgstr "CoglBlendString பாகுபடுத்தலை வழுநீக்கு"
 
 #: cogl/cogl-debug-options.h:47
 msgid "Trace Journal"
-msgstr ""
+msgstr "இதழைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:48
 msgid "View all the geometry passing through the journal"
-msgstr ""
+msgstr "இதழின் வழியே கடந்து செல்லும் எல்லா வடிவங்களையும் காண்பி"
 
 #: cogl/cogl-debug-options.h:52
 msgid "Trace Batching"
-msgstr ""
+msgstr "தொகுப்பாக்கத்தைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:53
 msgid "Show how geometry is being batched in the journal"
-msgstr ""
+msgstr "இதழில் வடிவம் எப்படி தொகுப்பாக்கம் செய்யப்படுகிறது எனக் காண்பி"
 
 #: cogl/cogl-debug-options.h:57
 msgid "Trace matrices"
-msgstr ""
+msgstr "அணிகளைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:58
 msgid "Trace all matrix manipulation"
-msgstr ""
+msgstr "எல்லா அணி கையாளுகைகளையும் தடமறி"
 
 #: cogl/cogl-debug-options.h:63
 msgid "Trace Misc Drawing"
-msgstr ""
+msgstr "மற்ற வரைபொருள்களைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:64
 msgid "Trace some misc drawing operations"
-msgstr ""
+msgstr "சில மற்ற வரைபொருள் செயல்பாடுகளைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:68
 msgid "Trace Pango Renderer"
-msgstr ""
+msgstr "பேங்கோ ரென்டரரைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:69
 msgid "Trace the Cogl Pango renderer"
-msgstr ""
+msgstr "Cogl பேங்கோ ரென்டரரைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:73
 msgid "Trace CoglTexturePixmap backend"
-msgstr ""
+msgstr "CoglTexturePixmap பின்புல முறைமையைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:74
 msgid "Trace the Cogl texture pixmap backend"
-msgstr ""
+msgstr "CoglTexturePixmap பின்புல டெக்ஸ்ச்சர் முறைமையைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81
 msgid "Visualize"
-msgstr ""
+msgstr "காட்சிப்படுத்து"
 
 #: cogl/cogl-debug-options.h:78
 msgid "Outline rectangles"
-msgstr ""
+msgstr "வெளிவரை செவ்வகங்கள்"
 
 #: cogl/cogl-debug-options.h:79
 msgid "Add wire outlines for all rectangular geometry"
-msgstr ""
+msgstr "செவ்வக வடிவங்கள் அனைத்துக்கும் வயர் வெளிவரையைச் சேர்க்கவும்"
 
 #: cogl/cogl-debug-options.h:83
 msgid "Show wireframes"
-msgstr ""
+msgstr "வயர்ஃப்ரேம்களைக் காண்பி"
 
 #: cogl/cogl-debug-options.h:84
 msgid "Add wire outlines for all geometry"
-msgstr ""
+msgstr "வடிவங்கள் அனைத்துக்கும் வயர் வெளிவரையைச் சேர்க்கவும்"
 
 #: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91
 #: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101
@@ -166,173 +167,190 @@ msgstr ""
 #: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173
 #: cogl/cogl-debug-options.h:178
 msgid "Root Cause"
-msgstr ""
+msgstr "மூலக் காரணம்"
 
 #: cogl/cogl-debug-options.h:88
 msgid "Disable Journal batching"
-msgstr ""
+msgstr "இதழ் தொகுப்பாக்கத்தை முடக்கு"
 
 #: cogl/cogl-debug-options.h:89
 msgid "Disable batching of geometry in the Cogl Journal."
-msgstr ""
+msgstr "Cogl இதழில் வடிவங்களைத் தொகுப்பாக்கம் செய்தலை முடக்கு."
 
 #: cogl/cogl-debug-options.h:93
 msgid "Disable GL Vertex Buffers"
-msgstr ""
+msgstr "GL முனை தாங்கல்களை முடக்கு"
 
 #: cogl/cogl-debug-options.h:94
 msgid "Disable use of OpenGL vertex buffer objects"
-msgstr ""
+msgstr "OpenGL முனை தாங்கல் பொருள்களைப் பயன்படுத்துவதை முடக்கு"
 
 #: cogl/cogl-debug-options.h:98
 msgid "Disable GL Pixel Buffers"
-msgstr ""
+msgstr "GL பிக்சல் தாங்கல்களை முடக்கு"
 
 #: cogl/cogl-debug-options.h:99
 msgid "Disable use of OpenGL pixel buffer objects"
-msgstr ""
+msgstr "OpenGL பிக்சல் தாங்கல் பொருள்களைப் பயன்படுத்துவதை முடக்கு"
 
 #: cogl/cogl-debug-options.h:103
 msgid "Disable software rect transform"
-msgstr ""
+msgstr "மென்பொருள் செவ்வக உருமாற்றத்தை முடக்கு"
 
 #: cogl/cogl-debug-options.h:104
 msgid "Use the GPU to transform rectangular geometry"
-msgstr ""
+msgstr "செவ்வக வடிவத்தை உருமாற்ற GPU வைப் பயன்படுத்து"
 
 #: cogl/cogl-debug-options.h:106
 msgid "Cogl Specialist"
-msgstr ""
+msgstr "Cogl வல்லுநர்"
 
 #: cogl/cogl-debug-options.h:108
+#, fuzzy
 msgid "Dump atlas images"
-msgstr ""
+msgstr "அட்லாஸ் படங்களைத் திணி"
 
 #: cogl/cogl-debug-options.h:109
+#, fuzzy
 msgid "Dump texture atlas changes to an image file"
-msgstr ""
+msgstr "டெக்ஸ்ச்சர் அட்லாஸ் மாற்றங்களை ஒரு படக் கோப்பில் திணி"
 
 #: cogl/cogl-debug-options.h:113
 msgid "Disable texture atlasing"
-msgstr ""
+msgstr "டெக்ஸ்ச்சர் அட்லாசிங்கை முடக்கு"
 
 #: cogl/cogl-debug-options.h:114
 msgid "Disable use of texture atlasing"
-msgstr ""
+msgstr "டெக்ஸ்ச்சர் அட்லாஸிங்கைப் பயன்படுத்துவதை முடக்கு"
 
 #: cogl/cogl-debug-options.h:118
 msgid "Disable sharing the texture atlas between text and images"
 msgstr ""
+"உரைக்கும் படங்களுக்கும் இடையே டெக்ஸ்ச்சர் அட்லாசைப் பகிர்ந்துகொள்ளுதலை "
+"முடக்கு"
 
 #: cogl/cogl-debug-options.h:119
 msgid ""
 "When this is set the glyph cache will always use a separate texture for its "
 "atlas. Otherwise it will try to share the atlas with images."
 msgstr ""
+"இதை அமைத்திருந்தால், கிளிஃப் தேக்ககமானது அதன் அட்லாசுக்கு எப்போதும் தனியான "
+"ஒரு "
+"டெக்ஸ்ச்சரையே பயன்படுத்தும். இல்லாவிட்டால் அட்லாஸை படங்களுடன் பகிர்ந்துகொள்ள "
+"முயற்சிக்கும்."
 
 #: cogl/cogl-debug-options.h:124
 msgid "Disable texturing"
-msgstr ""
+msgstr "டெக்ஸ்ச்சரிங் செய்தலை முடக்கு"
 
 #: cogl/cogl-debug-options.h:125
 msgid "Disable texturing any primitives"
-msgstr ""
+msgstr "பண்பற்றதை டெக்ஸ்ச்சரிங் செய்தலை முடக்கு"
 
 #: cogl/cogl-debug-options.h:129
 msgid "Disable arbfp"
-msgstr ""
+msgstr "arbfp ஐ முடக்கு"
 
 #: cogl/cogl-debug-options.h:130
 msgid "Disable use of ARB fragment programs"
-msgstr ""
+msgstr "ARB துண்டு நிரல்களைப் பயன்படுத்துவதை முடக்கு"
 
 #: cogl/cogl-debug-options.h:134
 msgid "Disable fixed"
-msgstr ""
+msgstr "நிலையானவற்றை முடக்கு"
 
 #: cogl/cogl-debug-options.h:135
 msgid "Disable use of the fixed function pipeline backend"
-msgstr ""
+msgstr "நிலையான செயல்தொகுதி பைப்லைன் பின்புல முறைமையைப் பயன்படுத்துவதை முடக்கு"
 
 #: cogl/cogl-debug-options.h:139
 msgid "Disable GLSL"
-msgstr ""
+msgstr "GLSL ஐ முடக்கு"
 
 #: cogl/cogl-debug-options.h:140
 msgid "Disable use of GLSL"
-msgstr ""
+msgstr "GLSL பயன்பாட்டை முடக்கு"
 
 #: cogl/cogl-debug-options.h:144
 msgid "Disable blending"
-msgstr ""
+msgstr "கலத்தலை முடக்கு"
 
 #: cogl/cogl-debug-options.h:145
 msgid "Disable use of blending"
-msgstr ""
+msgstr "கலத்தலைப் பயன்படுத்துவதை முடக்கு"
 
 #: cogl/cogl-debug-options.h:149
 msgid "Disable non-power-of-two textures"
-msgstr ""
+msgstr "அடுக்கு இரன்டு என அல்லாத டெக்ஸ்ச்சர்களை முடக்கு"
 
 #: cogl/cogl-debug-options.h:150
 msgid ""
 "Makes Cogl think that the GL driver doesn't support NPOT textures so that it "
 "will create sliced textures or textures with waste instead."
 msgstr ""
+"GL இயக்ககங்கள் NPOT டெக்ஸ்ச்சர்களை ஆதரிக்காது, ஆகவே அது கூறிட்ட "
+"டெக்ஸ்ச்சர்கள் அல்லது வீணான "
+"டெக்ஸ்ச்சர்களை உருவாக்கும் என Cogl ஐ நினைத்துக்கொள்ளச் செய்யும்."
 
 #: cogl/cogl-debug-options.h:155
 msgid "Disable software clipping"
-msgstr ""
+msgstr "மென்பொருள் கிளிப்பிங்கை முடக்கு"
 
 #: cogl/cogl-debug-options.h:156
 msgid "Disables Cogl's attempts to clip some rectangles in software."
 msgstr ""
+"மென்பொருளில் சில செவ்வகங்களைக் கிளிப் செய்ய Cogl எடுக்கும் முயற்சிகளை "
+"முடக்குகிறது."
 
 #: cogl/cogl-debug-options.h:160
 msgid "Show source"
-msgstr ""
+msgstr "மூலத்தைக் காண்பி"
 
 #: cogl/cogl-debug-options.h:161
 msgid "Show generated ARBfp/GLSL source code"
-msgstr ""
+msgstr "உருவாக்கப்பட்ட ARBfp/GLSL மூலக் குறியீட்டைக் காண்பி"
 
 #: cogl/cogl-debug-options.h:165
 msgid "Trace some OpenGL"
-msgstr ""
+msgstr "சில OpenGL ஐத் தடமறி"
 
 #: cogl/cogl-debug-options.h:166
 msgid "Traces some select OpenGL calls"
-msgstr ""
+msgstr "தேர்ந்தெடுக்கப்பட்ட சில OpenGL அழைப்புகளைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:170
 msgid "Trace offscreen support"
-msgstr ""
+msgstr "திரையிலல்லாத ஆதரவைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:171
 msgid "Debug offscreen support"
-msgstr ""
+msgstr "திரையிலல்லாத ஆதரவை வழுநீக்கு"
 
 #: cogl/cogl-debug-options.h:175
 msgid "Disable program caches"
-msgstr ""
+msgstr "நிரல் தேக்ககங்களை முடக்கு"
 
 #: cogl/cogl-debug-options.h:176
 msgid "Disable fallback caches for arbfp and glsl programs"
-msgstr ""
+msgstr "arbfp மற்றும் glsl நிரல்களுக்கு ஃபால்பேக் தேக்ககங்களை முடக்கு"
 
 #: cogl/cogl-debug-options.h:180
 msgid "Disable read pixel optimization"
-msgstr ""
+msgstr "பிக்சல் உகப்பாக்குதலைப் படித்தலை முடக்கு"
 
 #: cogl/cogl-debug-options.h:181
 msgid ""
 "Disable optimization for reading 1px for simple scenes of opaque rectangles"
 msgstr ""
+"ஒளி  ஊடுருவக்கூடிய செவ்வகங்களின் எளிய காட்சிகளுக்கு 1px ஐ வாசிப்பதற்கான "
+"உகப்பாக்கலை "
+"முடக்கு"
 
 #: cogl/cogl-debug-options.h:186
 msgid "Trace clipping"
-msgstr ""
+msgstr "கிளிப்பிங்கைத் தடமறி"
 
 #: cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
-msgstr ""
+msgstr "Cogl எப்படி கிளிப்பிங்கை செயல்படுத்துகிறது என்ற தகவலைப் பதிவு செய்யும்"
+

From 59e60784548de1dbbe8eef6cfcbe29b6d7dd3ac3 Mon Sep 17 00:00:00 2001
From: "Dr.T.Vasudevan" <agnihot3@gmail.com>
Date: Thu, 20 Sep 2012 10:51:21 +0530
Subject: [PATCH 08/15] updated Tamil translation

(cherry picked from commit af265ab5d2e2f2dab8294c549e872ef3b2fdf1d3)
---
 po/ta.po | 247 ++++++++++++++++++++++++++++---------------------------
 1 file changed, 127 insertions(+), 120 deletions(-)

diff --git a/po/ta.po b/po/ta.po
index 0340817fc..f36656987 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -2,15 +2,15 @@
 # Copyright (C) 2011 cogl's COPYRIGHT HOLDER
 # This file is distributed under the same license as the cogl package.
 #
-# I Felix <ifelix@redhat.com>, 2011.
 # Shantha Kumar <shantha.thamizh@gmail.com> 2012.
+# I Felix <ifelix@redhat.com>, 2011.
+# Dr.T.Vasudevan <agnihot3@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
-"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug."
-"cgi?product=clutter\n"
-"POT-Creation-Date: 2012-03-05 23:14+0000\n"
-"PO-Revision-Date: 2012-08-31 09:43+0530\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=clutter\n"
+"POT-Creation-Date: 2012-09-20 10:47+0530\n"
+"PO-Revision-Date: 2012-09-20 10:51+0530\n"
 "Last-Translator: Dr.T.Vasudevan <agnihot3@gmail.com>\n"
 "Language-Team: Tamil <ta@li.org>\n"
 "Language: ta\n"
@@ -20,337 +20,344 @@ msgstr ""
 "X-Generator: Lokalize 1.1\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: cogl/cogl-debug.c:172
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "ஆதரிக்கப்படும் வழுநீக்கல் மதிப்புகள்:"
 
-#: cogl/cogl-debug.c:177
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "சிறப்பு வழுநீக்கல் மதிப்புகள்:"
 
-#: cogl/cogl-debug.c:179 cogl/cogl-debug.c:181
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "நடத்தை - அல்லாத பிற ஏல்லா வழுநீக்கல் விருப்பங்களையும் செயல்படுத்தும்"
 
-#: cogl/cogl-debug.c:225
-msgid "Cogl debugging flags to set"
-msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைக்கிறது"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "கூடுதல் சூழல் மாறிகள்:"
 
-#: cogl/cogl-debug.c:227
-msgid "Cogl debugging flags to unset"
-msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைத்தல்நீக்குகிறது"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr "காண்பித்துக்கொள்ள வேண்டிய GL நீட்சிகளின் கமாவால் பிரித்த பட்டியல் முடக்கப்பட்டுள்ளது"
 
-#: cogl/cogl-debug.c:276
-msgid "Cogl Options"
-msgstr "Cogl விருப்பங்கள்"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr ""
+"இயக்ககம் ஆதரிக்கும் என Cogl அனுமானித்துக்கொள்ளும் GL பதிப்பை மீறி "
+"செயல்படுத்து"
 
-#: cogl/cogl-debug.c:277
-msgid "Show Cogl options"
-msgstr "Cogl விருப்பங்களை காட்டவும்"
-
-#: cogl/cogl-debug-options.h:25 cogl/cogl-debug-options.h:30
-#: cogl/cogl-debug-options.h:35 cogl/cogl-debug-options.h:40
-#: cogl/cogl-debug-options.h:45 cogl/cogl-debug-options.h:50
-#: cogl/cogl-debug-options.h:55 cogl/cogl-debug-options.h:61
-#: cogl/cogl-debug-options.h:66 cogl/cogl-debug-options.h:71
-#: cogl/cogl-debug-options.h:158 cogl/cogl-debug-options.h:163
-#: cogl/cogl-debug-options.h:168 cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
+#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
+#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50
+#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61
+#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
+#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
+#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Cogl தடமறிதல்"
 
-#: cogl/cogl-debug-options.h:27
+#: ../cogl/cogl-debug-options.h:27
 msgid "CoglObject references"
 msgstr "CoglObject குறிப்புகள்"
 
-#: cogl/cogl-debug-options.h:28
+#: ../cogl/cogl-debug-options.h:28
 msgid "Debug ref counting issues for CoglObjects"
 msgstr "CoglObjects க்கான குறிப்பு எண்ணிடல் சிக்கல்களை வழுநீக்கு"
 
-#: cogl/cogl-debug-options.h:32
+#: ../cogl/cogl-debug-options.h:32
 msgid "Trace Texture Slicing"
 msgstr "டெக்ஸ்ச்சர் ஸ்லைசிங்கை தடமறி"
 
-#: cogl/cogl-debug-options.h:33
+#: ../cogl/cogl-debug-options.h:33
 msgid "debug the creation of texture slices"
 msgstr "டெக்ஸ்ச்சர் ஸ்லைசஸின் உருவாக்கத்தை வழுநீக்கு"
 
-#: cogl/cogl-debug-options.h:37
+#: ../cogl/cogl-debug-options.h:37
 msgid "Trace Atlas Textures"
 msgstr "அட்லாஸ் டெக்ஸ்ச்சர்களைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:38
+#: ../cogl/cogl-debug-options.h:38
 msgid "Debug texture atlas management"
 msgstr "டெக்ஸ்ச்சர் அட்லாஸ் நிர்வாகத்தை வழுநீக்கு"
 
-#: cogl/cogl-debug-options.h:42
+#: ../cogl/cogl-debug-options.h:42
 msgid "Trace Blend Strings"
 msgstr "கலப்பு சரங்களைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:43
+#: ../cogl/cogl-debug-options.h:43
 msgid "Debug CoglBlendString parsing"
 msgstr "CoglBlendString பாகுபடுத்தலை வழுநீக்கு"
 
-#: cogl/cogl-debug-options.h:47
+#: ../cogl/cogl-debug-options.h:47
 msgid "Trace Journal"
 msgstr "இதழைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:48
+#: ../cogl/cogl-debug-options.h:48
 msgid "View all the geometry passing through the journal"
 msgstr "இதழின் வழியே கடந்து செல்லும் எல்லா வடிவங்களையும் காண்பி"
 
-#: cogl/cogl-debug-options.h:52
+#: ../cogl/cogl-debug-options.h:52
 msgid "Trace Batching"
 msgstr "தொகுப்பாக்கத்தைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:53
+#: ../cogl/cogl-debug-options.h:53
 msgid "Show how geometry is being batched in the journal"
 msgstr "இதழில் வடிவம் எப்படி தொகுப்பாக்கம் செய்யப்படுகிறது எனக் காண்பி"
 
-#: cogl/cogl-debug-options.h:57
+#: ../cogl/cogl-debug-options.h:57
 msgid "Trace matrices"
 msgstr "அணிகளைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:58
+#: ../cogl/cogl-debug-options.h:58
 msgid "Trace all matrix manipulation"
 msgstr "எல்லா அணி கையாளுகைகளையும் தடமறி"
 
-#: cogl/cogl-debug-options.h:63
+#: ../cogl/cogl-debug-options.h:63
 msgid "Trace Misc Drawing"
 msgstr "மற்ற வரைபொருள்களைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:64
+#: ../cogl/cogl-debug-options.h:64
 msgid "Trace some misc drawing operations"
 msgstr "சில மற்ற வரைபொருள் செயல்பாடுகளைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:68
+#: ../cogl/cogl-debug-options.h:68
 msgid "Trace Pango Renderer"
 msgstr "பேங்கோ ரென்டரரைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:69
+#: ../cogl/cogl-debug-options.h:69
 msgid "Trace the Cogl Pango renderer"
 msgstr "Cogl பேங்கோ ரென்டரரைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:73
+#: ../cogl/cogl-debug-options.h:73
 msgid "Trace CoglTexturePixmap backend"
 msgstr "CoglTexturePixmap பின்புல முறைமையைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:74
+#: ../cogl/cogl-debug-options.h:74
 msgid "Trace the Cogl texture pixmap backend"
 msgstr "CoglTexturePixmap பின்புல டெக்ஸ்ச்சர் முறைமையைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:76 cogl/cogl-debug-options.h:81
+#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81
 msgid "Visualize"
 msgstr "காட்சிப்படுத்து"
 
-#: cogl/cogl-debug-options.h:78
+#: ../cogl/cogl-debug-options.h:78
 msgid "Outline rectangles"
 msgstr "வெளிவரை செவ்வகங்கள்"
 
-#: cogl/cogl-debug-options.h:79
+#: ../cogl/cogl-debug-options.h:79
 msgid "Add wire outlines for all rectangular geometry"
 msgstr "செவ்வக வடிவங்கள் அனைத்துக்கும் வயர் வெளிவரையைச் சேர்க்கவும்"
 
-#: cogl/cogl-debug-options.h:83
+#: ../cogl/cogl-debug-options.h:83
 msgid "Show wireframes"
 msgstr "வயர்ஃப்ரேம்களைக் காண்பி"
 
-#: cogl/cogl-debug-options.h:84
+#: ../cogl/cogl-debug-options.h:84
 msgid "Add wire outlines for all geometry"
 msgstr "வடிவங்கள் அனைத்துக்கும் வயர் வெளிவரையைச் சேர்க்கவும்"
 
-#: cogl/cogl-debug-options.h:86 cogl/cogl-debug-options.h:91
-#: cogl/cogl-debug-options.h:96 cogl/cogl-debug-options.h:101
-#: cogl/cogl-debug-options.h:111 cogl/cogl-debug-options.h:116
-#: cogl/cogl-debug-options.h:122 cogl/cogl-debug-options.h:127
-#: cogl/cogl-debug-options.h:132 cogl/cogl-debug-options.h:137
-#: cogl/cogl-debug-options.h:142 cogl/cogl-debug-options.h:147
-#: cogl/cogl-debug-options.h:153 cogl/cogl-debug-options.h:173
-#: cogl/cogl-debug-options.h:178
+#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91
+#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101
+#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116
+#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127
+#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137
+#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147
+#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173
+#: ../cogl/cogl-debug-options.h:178
 msgid "Root Cause"
 msgstr "மூலக் காரணம்"
 
-#: cogl/cogl-debug-options.h:88
+#: ../cogl/cogl-debug-options.h:88
 msgid "Disable Journal batching"
 msgstr "இதழ் தொகுப்பாக்கத்தை முடக்கு"
 
-#: cogl/cogl-debug-options.h:89
+#: ../cogl/cogl-debug-options.h:89
 msgid "Disable batching of geometry in the Cogl Journal."
 msgstr "Cogl இதழில் வடிவங்களைத் தொகுப்பாக்கம் செய்தலை முடக்கு."
 
-#: cogl/cogl-debug-options.h:93
+#: ../cogl/cogl-debug-options.h:93
 msgid "Disable GL Vertex Buffers"
 msgstr "GL முனை தாங்கல்களை முடக்கு"
 
-#: cogl/cogl-debug-options.h:94
+#: ../cogl/cogl-debug-options.h:94
 msgid "Disable use of OpenGL vertex buffer objects"
 msgstr "OpenGL முனை தாங்கல் பொருள்களைப் பயன்படுத்துவதை முடக்கு"
 
-#: cogl/cogl-debug-options.h:98
+#: ../cogl/cogl-debug-options.h:98
 msgid "Disable GL Pixel Buffers"
 msgstr "GL பிக்சல் தாங்கல்களை முடக்கு"
 
-#: cogl/cogl-debug-options.h:99
+#: ../cogl/cogl-debug-options.h:99
 msgid "Disable use of OpenGL pixel buffer objects"
 msgstr "OpenGL பிக்சல் தாங்கல் பொருள்களைப் பயன்படுத்துவதை முடக்கு"
 
-#: cogl/cogl-debug-options.h:103
+#: ../cogl/cogl-debug-options.h:103
 msgid "Disable software rect transform"
 msgstr "மென்பொருள் செவ்வக உருமாற்றத்தை முடக்கு"
 
-#: cogl/cogl-debug-options.h:104
+#: ../cogl/cogl-debug-options.h:104
 msgid "Use the GPU to transform rectangular geometry"
 msgstr "செவ்வக வடிவத்தை உருமாற்ற GPU வைப் பயன்படுத்து"
 
-#: cogl/cogl-debug-options.h:106
+#: ../cogl/cogl-debug-options.h:106
 msgid "Cogl Specialist"
 msgstr "Cogl வல்லுநர்"
 
-#: cogl/cogl-debug-options.h:108
-#, fuzzy
+#: ../cogl/cogl-debug-options.h:108
 msgid "Dump atlas images"
 msgstr "அட்லாஸ் படங்களைத் திணி"
 
-#: cogl/cogl-debug-options.h:109
-#, fuzzy
+#: ../cogl/cogl-debug-options.h:109
 msgid "Dump texture atlas changes to an image file"
 msgstr "டெக்ஸ்ச்சர் அட்லாஸ் மாற்றங்களை ஒரு படக் கோப்பில் திணி"
 
-#: cogl/cogl-debug-options.h:113
+#: ../cogl/cogl-debug-options.h:113
 msgid "Disable texture atlasing"
 msgstr "டெக்ஸ்ச்சர் அட்லாசிங்கை முடக்கு"
 
-#: cogl/cogl-debug-options.h:114
+#: ../cogl/cogl-debug-options.h:114
 msgid "Disable use of texture atlasing"
 msgstr "டெக்ஸ்ச்சர் அட்லாஸிங்கைப் பயன்படுத்துவதை முடக்கு"
 
-#: cogl/cogl-debug-options.h:118
+#: ../cogl/cogl-debug-options.h:118
 msgid "Disable sharing the texture atlas between text and images"
-msgstr ""
-"உரைக்கும் படங்களுக்கும் இடையே டெக்ஸ்ச்சர் அட்லாசைப் பகிர்ந்துகொள்ளுதலை "
-"முடக்கு"
+msgstr "உரைக்கும் படங்களுக்கும் இடையே டெக்ஸ்ச்சர் அட்லாசைப் பகிர்ந்துகொள்ளுதலை முடக்கு"
 
-#: cogl/cogl-debug-options.h:119
+#: ../cogl/cogl-debug-options.h:119
 msgid ""
 "When this is set the glyph cache will always use a separate texture for its "
 "atlas. Otherwise it will try to share the atlas with images."
 msgstr ""
-"இதை அமைத்திருந்தால், கிளிஃப் தேக்ககமானது அதன் அட்லாசுக்கு எப்போதும் தனியான "
-"ஒரு "
-"டெக்ஸ்ச்சரையே பயன்படுத்தும். இல்லாவிட்டால் அட்லாஸை படங்களுடன் பகிர்ந்துகொள்ள "
-"முயற்சிக்கும்."
+"இதை அமைத்திருந்தால், கிளிஃப் தேக்ககமானது அதன் அட்லாசுக்கு எப்போதும் தனியான ஒரு "
+"டெக்ஸ்ச்சரையே பயன்படுத்தும். இல்லாவிட்டால் அட்லாஸை படங்களுடன் பகிர்ந்துகொள்ள முயற்சிக்கும்."
 
-#: cogl/cogl-debug-options.h:124
+#: ../cogl/cogl-debug-options.h:124
 msgid "Disable texturing"
 msgstr "டெக்ஸ்ச்சரிங் செய்தலை முடக்கு"
 
-#: cogl/cogl-debug-options.h:125
+#: ../cogl/cogl-debug-options.h:125
 msgid "Disable texturing any primitives"
 msgstr "பண்பற்றதை டெக்ஸ்ச்சரிங் செய்தலை முடக்கு"
 
-#: cogl/cogl-debug-options.h:129
+#: ../cogl/cogl-debug-options.h:129
 msgid "Disable arbfp"
 msgstr "arbfp ஐ முடக்கு"
 
-#: cogl/cogl-debug-options.h:130
+#: ../cogl/cogl-debug-options.h:130
 msgid "Disable use of ARB fragment programs"
 msgstr "ARB துண்டு நிரல்களைப் பயன்படுத்துவதை முடக்கு"
 
-#: cogl/cogl-debug-options.h:134
+#: ../cogl/cogl-debug-options.h:134
 msgid "Disable fixed"
 msgstr "நிலையானவற்றை முடக்கு"
 
-#: cogl/cogl-debug-options.h:135
+#: ../cogl/cogl-debug-options.h:135
 msgid "Disable use of the fixed function pipeline backend"
 msgstr "நிலையான செயல்தொகுதி பைப்லைன் பின்புல முறைமையைப் பயன்படுத்துவதை முடக்கு"
 
-#: cogl/cogl-debug-options.h:139
+#: ../cogl/cogl-debug-options.h:139
 msgid "Disable GLSL"
 msgstr "GLSL ஐ முடக்கு"
 
-#: cogl/cogl-debug-options.h:140
+#: ../cogl/cogl-debug-options.h:140
 msgid "Disable use of GLSL"
 msgstr "GLSL பயன்பாட்டை முடக்கு"
 
-#: cogl/cogl-debug-options.h:144
+#: ../cogl/cogl-debug-options.h:144
 msgid "Disable blending"
 msgstr "கலத்தலை முடக்கு"
 
-#: cogl/cogl-debug-options.h:145
+#: ../cogl/cogl-debug-options.h:145
 msgid "Disable use of blending"
 msgstr "கலத்தலைப் பயன்படுத்துவதை முடக்கு"
 
-#: cogl/cogl-debug-options.h:149
+#: ../cogl/cogl-debug-options.h:149
 msgid "Disable non-power-of-two textures"
 msgstr "அடுக்கு இரன்டு என அல்லாத டெக்ஸ்ச்சர்களை முடக்கு"
 
-#: cogl/cogl-debug-options.h:150
+#: ../cogl/cogl-debug-options.h:150
 msgid ""
 "Makes Cogl think that the GL driver doesn't support NPOT textures so that it "
 "will create sliced textures or textures with waste instead."
 msgstr ""
-"GL இயக்ககங்கள் NPOT டெக்ஸ்ச்சர்களை ஆதரிக்காது, ஆகவே அது கூறிட்ட "
-"டெக்ஸ்ச்சர்கள் அல்லது வீணான "
+"GL இயக்ககங்கள் NPOT டெக்ஸ்ச்சர்களை ஆதரிக்காது, ஆகவே அது கூறிட்ட டெக்ஸ்ச்சர்கள் அல்லது வீணான "
 "டெக்ஸ்ச்சர்களை உருவாக்கும் என Cogl ஐ நினைத்துக்கொள்ளச் செய்யும்."
 
-#: cogl/cogl-debug-options.h:155
+#: ../cogl/cogl-debug-options.h:155
 msgid "Disable software clipping"
 msgstr "மென்பொருள் கிளிப்பிங்கை முடக்கு"
 
-#: cogl/cogl-debug-options.h:156
+#: ../cogl/cogl-debug-options.h:156
 msgid "Disables Cogl's attempts to clip some rectangles in software."
-msgstr ""
-"மென்பொருளில் சில செவ்வகங்களைக் கிளிப் செய்ய Cogl எடுக்கும் முயற்சிகளை "
-"முடக்குகிறது."
+msgstr "மென்பொருளில் சில செவ்வகங்களைக் கிளிப் செய்ய Cogl எடுக்கும் முயற்சிகளை முடக்குகிறது."
 
-#: cogl/cogl-debug-options.h:160
+#: ../cogl/cogl-debug-options.h:160
 msgid "Show source"
 msgstr "மூலத்தைக் காண்பி"
 
-#: cogl/cogl-debug-options.h:161
+#: ../cogl/cogl-debug-options.h:161
 msgid "Show generated ARBfp/GLSL source code"
 msgstr "உருவாக்கப்பட்ட ARBfp/GLSL மூலக் குறியீட்டைக் காண்பி"
 
-#: cogl/cogl-debug-options.h:165
+#: ../cogl/cogl-debug-options.h:165
 msgid "Trace some OpenGL"
 msgstr "சில OpenGL ஐத் தடமறி"
 
-#: cogl/cogl-debug-options.h:166
+#: ../cogl/cogl-debug-options.h:166
 msgid "Traces some select OpenGL calls"
 msgstr "தேர்ந்தெடுக்கப்பட்ட சில OpenGL அழைப்புகளைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:170
+#: ../cogl/cogl-debug-options.h:170
 msgid "Trace offscreen support"
 msgstr "திரையிலல்லாத ஆதரவைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:171
+#: ../cogl/cogl-debug-options.h:171
 msgid "Debug offscreen support"
 msgstr "திரையிலல்லாத ஆதரவை வழுநீக்கு"
 
-#: cogl/cogl-debug-options.h:175
+#: ../cogl/cogl-debug-options.h:175
 msgid "Disable program caches"
 msgstr "நிரல் தேக்ககங்களை முடக்கு"
 
-#: cogl/cogl-debug-options.h:176
+#: ../cogl/cogl-debug-options.h:176
 msgid "Disable fallback caches for arbfp and glsl programs"
 msgstr "arbfp மற்றும் glsl நிரல்களுக்கு ஃபால்பேக் தேக்ககங்களை முடக்கு"
 
-#: cogl/cogl-debug-options.h:180
+#: ../cogl/cogl-debug-options.h:180
 msgid "Disable read pixel optimization"
 msgstr "பிக்சல் உகப்பாக்குதலைப் படித்தலை முடக்கு"
 
-#: cogl/cogl-debug-options.h:181
-msgid ""
-"Disable optimization for reading 1px for simple scenes of opaque rectangles"
+#: ../cogl/cogl-debug-options.h:181
+msgid "Disable optimization for reading 1px for simple scenes of opaque rectangles"
 msgstr ""
-"ஒளி  ஊடுருவக்கூடிய செவ்வகங்களின் எளிய காட்சிகளுக்கு 1px ஐ வாசிப்பதற்கான "
-"உகப்பாக்கலை "
+"ஒளி  ஊடுருவக்கூடிய செவ்வகங்களின் எளிய காட்சிகளுக்கு 1px ஐ வாசிப்பதற்கான உகப்பாக்கலை "
 "முடக்கு"
 
-#: cogl/cogl-debug-options.h:186
+#: ../cogl/cogl-debug-options.h:186
 msgid "Trace clipping"
 msgstr "கிளிப்பிங்கைத் தடமறி"
 
-#: cogl/cogl-debug-options.h:187
+#: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Cogl எப்படி கிளிப்பிங்கை செயல்படுத்துகிறது என்ற தகவலைப் பதிவு செய்யும்"
 
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "செயல்திறன் விவகாரங்களைத் தடமறி"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "உப-உகப்பாக்கல் Cogl பயன்பாட்டைத் தனிப்படுத்திக் காண்பிக்க முயற்சிக்கிறது."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைக்கிறது"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr "Cogl பிழைதிருத்துதல் கொடிகளை அமைத்தல்நீக்குகிறது"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Cogl விருப்பங்கள்"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Cogl விருப்பங்களை காட்டவும்"

From 6e9ae288e151766cf34e12f3f611474fa0554f51 Mon Sep 17 00:00:00 2001
From: Nishio Futoshi <fut_nis@d3.dion.ne.jp>
Date: Sat, 22 Sep 2012 08:10:06 +0900
Subject: [PATCH 09/15] [l10n] Update Japanese translation

(cherry picked from commit 857f9d336ba1940211becfdd637dcfe08b52e079)
---
 po/ja.po | 60 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 40 insertions(+), 20 deletions(-)

diff --git a/po/ja.po b/po/ja.po
index d32af1ec5..e692669b7 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -3,47 +3,45 @@
 # This file is distributed under the same license as the cogl package.
 # Takeshi AIHANA <takeshi.aihana@gmail.com>, 2011.
 # Hajime Taira <htaira@redhat.com>, 2012.
+# Nishio Futoshi <fut_nis@d3.dion.ne.jp>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-05-06 13:24+0000\n"
-"PO-Revision-Date: 2012-05-07 08:16+0900\n"
-"Last-Translator: Hajime Taira <htaira@redhat.com>\n"
-"Language-Team: Japanese <takeshi.aihana@gmail.com>\n"
+"POT-Creation-Date: 2012-09-20 05:21+0000\n"
+"PO-Revision-Date: 2012-09-22 07:50+0900\n"
+"Last-Translator: Nishio Futoshi <fut_nis@d3.dion.ne.jp>\n"
+"Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
 
-#: ../cogl/cogl-debug.c:173
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "サポートするデバッグ変数:"
 
-#: ../cogl/cogl-debug.c:178
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "特別なデバッグ変数:"
 
-#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "すべての非ビヘイビアのデバッグオプションを有効にします。"
 
-#: ../cogl/cogl-debug.c:226
-msgid "Cogl debugging flags to set"
-msgstr "Cogl のデバッグフラグを指定する"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "追加の環境変数:"
 
-#: ../cogl/cogl-debug.c:228
-msgid "Cogl debugging flags to unset"
-msgstr "Cogl のデバッグフラグを解除する"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr "GL 拡張にみえるが利用不可能なものをカンマで分離したリスト"
 
-#: ../cogl/cogl-debug.c:277
-msgid "Cogl Options"
-msgstr "Cogl のオプション"
-
-#: ../cogl/cogl-debug.c:278
-msgid "Show Cogl options"
-msgstr "Cogl のオプションを表示する"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr "ドライバーがサポートしていると Cogl が仮定する GL のバージョンをオーバーライドする"
 
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
@@ -52,6 +50,7 @@ msgstr "Cogl のオプションを表示する"
 #: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
 #: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
 #: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Cogl のトレーシング"
 
@@ -329,3 +328,24 @@ msgstr "クリッピングのトレース"
 #: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Cogl に実装されているクリッピング機能のログ情報を記録します。"
+
+# ROIとは違うのかな？
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "トレース実行の関心領域"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "Cogl の使用時の最適下限の強調表示を試みる"
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Cogl のデバッグフラグを指定する"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr "Cogl のデバッグフラグを解除する"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Cogl のオプション"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Cogl のオプションを表示する"

From eb18e471efa1f2d43de1167cb82348d7f52a8d6d Mon Sep 17 00:00:00 2001
From: Ani Peter <apeter@redhat.com>
Date: Sat, 22 Sep 2012 12:22:55 +0530
Subject: [PATCH 10/15] Updated Malayalam file

(cherry picked from commit 9cdaf2e8e13c9b255343357e95038e1881578bf7)
---
 po/ml.po | 342 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 342 insertions(+)
 create mode 100644 po/ml.po

diff --git a/po/ml.po b/po/ml.po
new file mode 100644
index 000000000..f2b7d00e4
--- /dev/null
+++ b/po/ml.po
@@ -0,0 +1,342 @@
+# Malayalam translation for cogl.
+# Copyright (C) 2012 cogl's COPYRIGHT HOLDER
+# This file is distributed under the same license as the cogl package.
+# Anish A <aneesh.nl@gmail.com>, 2012.
+msgid ""
+msgstr ""
+"Project-Id-Version: cogl master\n"
+"Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
+"product=cogl&keywords=I18N+L10N&component=general\n"
+"POT-Creation-Date: 2012-09-20 05:21+0000\n"
+"PO-Revision-Date: 2012-09-20 19:26+0530\n"
+"Last-Translator: Anish A <aneesh.nl@gmail.com>\n"
+"Language-Team: Swatantra Malayalam Computing\n"
+"Language: ml\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.6.1\n"
+
+#: ../cogl/cogl-debug.c:174
+msgid "Supported debug values:"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:179
+msgid "Special debug values:"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
+msgid "Enables all non-behavioural debug options"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
+#: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
+#: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50
+#: ../cogl/cogl-debug-options.h:55 ../cogl/cogl-debug-options.h:61
+#: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
+#: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
+#: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
+msgid "Cogl Tracing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:27
+msgid "CoglObject references"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:28
+msgid "Debug ref counting issues for CoglObjects"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:32
+msgid "Trace Texture Slicing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:33
+msgid "debug the creation of texture slices"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:37
+msgid "Trace Atlas Textures"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:38
+msgid "Debug texture atlas management"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:42
+msgid "Trace Blend Strings"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:43
+msgid "Debug CoglBlendString parsing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:47
+msgid "Trace Journal"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:48
+msgid "View all the geometry passing through the journal"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:52
+msgid "Trace Batching"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:53
+msgid "Show how geometry is being batched in the journal"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:57
+msgid "Trace matrices"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:58
+msgid "Trace all matrix manipulation"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:63
+msgid "Trace Misc Drawing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:64
+msgid "Trace some misc drawing operations"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:68
+msgid "Trace Pango Renderer"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:69
+msgid "Trace the Cogl Pango renderer"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:73
+msgid "Trace CoglTexturePixmap backend"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:74
+msgid "Trace the Cogl texture pixmap backend"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:76 ../cogl/cogl-debug-options.h:81
+msgid "Visualize"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:78
+msgid "Outline rectangles"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:79
+msgid "Add wire outlines for all rectangular geometry"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:83
+msgid "Show wireframes"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:84
+msgid "Add wire outlines for all geometry"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:86 ../cogl/cogl-debug-options.h:91
+#: ../cogl/cogl-debug-options.h:96 ../cogl/cogl-debug-options.h:101
+#: ../cogl/cogl-debug-options.h:111 ../cogl/cogl-debug-options.h:116
+#: ../cogl/cogl-debug-options.h:122 ../cogl/cogl-debug-options.h:127
+#: ../cogl/cogl-debug-options.h:132 ../cogl/cogl-debug-options.h:137
+#: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147
+#: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173
+#: ../cogl/cogl-debug-options.h:178
+msgid "Root Cause"
+msgstr "മൂലകാരണം"
+
+#: ../cogl/cogl-debug-options.h:88
+msgid "Disable Journal batching"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:89
+msgid "Disable batching of geometry in the Cogl Journal."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:93
+msgid "Disable GL Vertex Buffers"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:94
+msgid "Disable use of OpenGL vertex buffer objects"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:98
+msgid "Disable GL Pixel Buffers"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:99
+msgid "Disable use of OpenGL pixel buffer objects"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:103
+msgid "Disable software rect transform"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:104
+msgid "Use the GPU to transform rectangular geometry"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:106
+msgid "Cogl Specialist"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:108
+msgid "Dump atlas images"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:109
+msgid "Dump texture atlas changes to an image file"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:113
+msgid "Disable texture atlasing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:114
+msgid "Disable use of texture atlasing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:118
+msgid "Disable sharing the texture atlas between text and images"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:119
+msgid ""
+"When this is set the glyph cache will always use a separate texture for its "
+"atlas. Otherwise it will try to share the atlas with images."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:124
+msgid "Disable texturing"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:125
+msgid "Disable texturing any primitives"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:129
+msgid "Disable arbfp"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:130
+msgid "Disable use of ARB fragment programs"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:134
+msgid "Disable fixed"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:135
+msgid "Disable use of the fixed function pipeline backend"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:139
+msgid "Disable GLSL"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:140
+msgid "Disable use of GLSL"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:144
+msgid "Disable blending"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:145
+msgid "Disable use of blending"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:149
+msgid "Disable non-power-of-two textures"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:150
+msgid ""
+"Makes Cogl think that the GL driver doesn't support NPOT textures so that it "
+"will create sliced textures or textures with waste instead."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:155
+msgid "Disable software clipping"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:156
+msgid "Disables Cogl's attempts to clip some rectangles in software."
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:160
+msgid "Show source"
+msgstr "സോഴ്സ് കോഡ് കാണിക്കുക"
+
+#: ../cogl/cogl-debug-options.h:161
+msgid "Show generated ARBfp/GLSL source code"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:165
+msgid "Trace some OpenGL"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:166
+msgid "Traces some select OpenGL calls"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:170
+msgid "Trace offscreen support"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:171
+msgid "Debug offscreen support"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:175
+msgid "Disable program caches"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:176
+msgid "Disable fallback caches for arbfp and glsl programs"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:180
+msgid "Disable read pixel optimization"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:181
+msgid ""
+"Disable optimization for reading 1px for simple scenes of opaque rectangles"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:186
+msgid "Trace clipping"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:187
+msgid "Logs information about how Cogl is implementing clipping"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr ""
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr ""

From b6ffa02d2f4b289794622fd01c54a8b10681d803 Mon Sep 17 00:00:00 2001
From: YunQiang Su <yqsu@src.gnome.org>
Date: Sun, 23 Sep 2012 12:50:20 +0800
Subject: [PATCH 11/15] Update zh_CN translation

(cherry picked from commit 7003bd0bf092ea38eab4491ecb56cb8db155190a)
---
 po/zh_CN.po | 59 +++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 31 deletions(-)

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 587d2ba0a..847918179 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -4,20 +4,23 @@
 # Wylmer Wang <wantinghard@gmail.com>, 2011.
 # 甘霖 <thlgood@yucoat.com>, 2012.
 # fenghelong <fenghelongnjit@gmail.com>, 2012.
+# YunQiang Su <wzssyqa@gmail.com>, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-07-07 17:06+0000\n"
-"PO-Revision-Date: 2012-06-29 11:11+0800\n"
-"Last-Translator: fenghelong <fenghelongnjit@gmail.com>\n"
-"Language-Team: Chinese (China) <i18n-zh@googlegroups.com>\n"
+"POT-Creation-Date: 2012-09-07 13:16+0000\n"
+"PO-Revision-Date: 2012-09-23 12:50+0800\n"
+"Last-Translator: YunQiang Su <wzssyqa@gmail.com>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
+"Content-Transfer-Encoding: 8bits\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
@@ -31,6 +34,18 @@ msgstr "特殊的调试值："
 msgid "Enables all non-behavioural debug options"
 msgstr "启用所有非行为调式选项"
 
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "附加环境变量："
+
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr "覆盖 Cogl 将假设驱动支持的 GL 版本"
+
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
 #: ../cogl/cogl-debug-options.h:45 ../cogl/cogl-debug-options.h:50
@@ -59,12 +74,10 @@ msgid "debug the creation of texture slices"
 msgstr "调试纹理切片的创建"
 
 #: ../cogl/cogl-debug-options.h:37
-#, fuzzy
 msgid "Trace Atlas Textures"
 msgstr "跟踪 Atlas 纹理"
 
 #: ../cogl/cogl-debug-options.h:38
-#, fuzzy
 msgid "Debug texture atlas management"
 msgstr "调试纹理 atlas 管理"
 
@@ -77,12 +90,10 @@ msgid "Debug CoglBlendString parsing"
 msgstr "调试 CoglBlendString 解析"
 
 #: ../cogl/cogl-debug-options.h:47
-#, fuzzy
 msgid "Trace Journal"
 msgstr "跟踪日志"
 
 #: ../cogl/cogl-debug-options.h:48
-#, fuzzy
 msgid "View all the geometry passing through the journal"
 msgstr "查看所有通过日志传递的几何体"
 
@@ -91,9 +102,8 @@ msgid "Trace Batching"
 msgstr "跟踪批处理"
 
 #: ../cogl/cogl-debug-options.h:53
-#, fuzzy
 msgid "Show how geometry is being batched in the journal"
-msgstr "显示几何体在日志中被分批处理的情况"
+msgstr "显示几何体在日志中批处理的情况"
 
 #: ../cogl/cogl-debug-options.h:57
 msgid "Trace matrices"
@@ -104,12 +114,10 @@ msgid "Trace all matrix manipulation"
 msgstr "跟踪所有矩阵操作"
 
 #: ../cogl/cogl-debug-options.h:63
-#, fuzzy
 msgid "Trace Misc Drawing"
 msgstr "跟踪混杂绘制"
 
 #: ../cogl/cogl-debug-options.h:64
-#, fuzzy
 msgid "Trace some misc drawing operations"
 msgstr "跟踪一些混杂的绘制操作"
 
@@ -138,7 +146,6 @@ msgid "Outline rectangles"
 msgstr "突显矩形"
 
 #: ../cogl/cogl-debug-options.h:79
-#, fuzzy
 msgid "Add wire outlines for all rectangular geometry"
 msgstr "对所有矩形形状添加实线外框"
 
@@ -158,7 +165,6 @@ msgstr "对所有形状添加线框"
 #: ../cogl/cogl-debug-options.h:142 ../cogl/cogl-debug-options.h:147
 #: ../cogl/cogl-debug-options.h:153 ../cogl/cogl-debug-options.h:173
 #: ../cogl/cogl-debug-options.h:178
-#, fuzzy
 msgid "Root Cause"
 msgstr "根目标"
 
@@ -167,7 +173,6 @@ msgid "Disable Journal batching"
 msgstr "禁用日志批处理"
 
 #: ../cogl/cogl-debug-options.h:89
-#, fuzzy
 msgid "Disable batching of geometry in the Cogl Journal."
 msgstr "在 Cogl 日志中禁用几何体批处理"
 
@@ -196,7 +201,6 @@ msgid "Use the GPU to transform rectangular geometry"
 msgstr "使用 GPU 来变换矩形"
 
 #: ../cogl/cogl-debug-options.h:106
-#, fuzzy
 msgid "Cogl Specialist"
 msgstr "Cogl 专家"
 
@@ -217,12 +221,10 @@ msgid "Disable use of texture atlasing"
 msgstr "禁止使用纹理平滑"
 
 #: ../cogl/cogl-debug-options.h:118
-#, fuzzy
 msgid "Disable sharing the texture atlas between text and images"
-msgstr "禁用文档和图形间的纹理 Atlas 共享"
+msgstr "禁用文本和图形间的纹理 Atlas 共享"
 
 #: ../cogl/cogl-debug-options.h:119
-#, fuzzy
 msgid ""
 "When this is set the glyph cache will always use a separate texture for its "
 "atlas. Otherwise it will try to share the atlas with images."
@@ -249,12 +251,12 @@ msgstr "禁用 ARB 分割程序"
 #: ../cogl/cogl-debug-options.h:134
 #, fuzzy
 msgid "Disable fixed"
-msgstr "禁止固定"
+msgstr "禁止定点"
 
 #: ../cogl/cogl-debug-options.h:135
 #, fuzzy
 msgid "Disable use of the fixed function pipeline backend"
-msgstr "禁用固定的函数管道后端"
+msgstr "禁用定点函数管道后端"
 
 #: ../cogl/cogl-debug-options.h:139
 msgid "Disable GLSL"
@@ -286,14 +288,12 @@ msgstr ""
 "使 Cogl 认为 GL 驱动不支持 NPOT 纹理，以便使它创建切片纹理或用无效纹理代替。"
 
 #: ../cogl/cogl-debug-options.h:155
-#, fuzzy
 msgid "Disable software clipping"
-msgstr "禁用软件剪切"
+msgstr "禁用软件裁剪"
 
 #: ../cogl/cogl-debug-options.h:156
-#, fuzzy
 msgid "Disables Cogl's attempts to clip some rectangles in software."
-msgstr "在软件中禁止 Cogl 尝试剪切某些矩形。"
+msgstr "禁止 Cogl 在软件中尝试裁剪某些矩形。"
 
 #: ../cogl/cogl-debug-options.h:160
 msgid "Show source"
@@ -334,20 +334,17 @@ msgid "Disable read pixel optimization"
 msgstr "禁用读取像素优化"
 
 #: ../cogl/cogl-debug-options.h:181
-#, fuzzy
 msgid ""
 "Disable optimization for reading 1px for simple scenes of opaque rectangles"
 msgstr "禁止对在透明矩形场景中读取单个像素操作的优化"
 
 #: ../cogl/cogl-debug-options.h:186
-#, fuzzy
 msgid "Trace clipping"
-msgstr "跟踪剪切"
+msgstr "跟踪裁剪"
 
 #: ../cogl/cogl-debug-options.h:187
-#, fuzzy
 msgid "Logs information about how Cogl is implementing clipping"
-msgstr "记录有关 Cogl 如何实施剪切的信息"
+msgstr "记录有关 Cogl 如何实施裁剪的信息"
 
 #: ../cogl/cogl-debug-options.h:191
 msgid "Trace performance concerns"

From 8a533157b79accc8abb365bae4ef3108859f3c68 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mario=20Bl=C3=A4ttermann?= <mario.blaettermann@gmail.com>
Date: Sun, 23 Sep 2012 14:18:36 +0200
Subject: [PATCH 12/15] [l10n] Updated German translation

(cherry picked from commit b9afd31baabf1e139f51e6042104ab0904e77488)
---
 po/de.po | 61 +++++++++++++++++++++++++++++++++++++-------------------
 1 file changed, 41 insertions(+), 20 deletions(-)

diff --git a/po/de.po b/po/de.po
index e0bc21b38..67817e538 100644
--- a/po/de.po
+++ b/po/de.po
@@ -12,47 +12,47 @@ msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-06-10 17:39+0000\n"
-"PO-Revision-Date: 2012-06-10 18:18+0200\n"
-"Last-Translator: Wolfgang Stoeggl <c72578@yahoo.de>\n"
+"POT-Creation-Date: 2012-09-07 13:16+0000\n"
+"PO-Revision-Date: 2012-09-23 14:16+0100\n"
+"Last-Translator: Mario Blättermann <mario.blaettermann@gmail.com>\n"
 "Language-Team: Deutsch <gnome-de@gnome.org>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: de\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Poedit-Language: German\n"
 "X-Poedit-Country: GERMANY\n"
 "X-Generator: Gtranslator 2.91.5\n"
 
-#: ../cogl/cogl-debug.c:173
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "Unterstützte Werte zur Fehlerdiagnose:"
 
-#: ../cogl/cogl-debug.c:178
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "Spezielle Werte zur Fehlerdiagnose:"
 
-#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr ""
 "Alle nicht-verhaltensmäßigen Einstellungen zur Fehlerdiagnose aktivieren"
 
-#: ../cogl/cogl-debug.c:226
-msgid "Cogl debugging flags to set"
-msgstr "Zu setzende Cogl-Fehlerdiagnose-Flags"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "Zusätzliche Umgebungsvariablen:"
 
-#: ../cogl/cogl-debug.c:228
-msgid "Cogl debugging flags to unset"
-msgstr "Zurückzusetzende Cogl-Fehlerdiagnose-Flags"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr ""
+"Durch Kommata getrennte Liste der GL-Erweiterungen, die als deaktiviert "
+"vorgegeben sind"
 
-#: ../cogl/cogl-debug.c:277
-msgid "Cogl Options"
-msgstr "Cogl-Einstellungen"
-
-#: ../cogl/cogl-debug.c:278
-msgid "Show Cogl options"
-msgstr "Cogl-Einstellungen anzeigen"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr ""
+"Die GL-Version überschreiben, von welcher Cogl annimmt, dass der Treiber sie "
+"unterstützt"
 
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
@@ -61,6 +61,7 @@ msgstr "Cogl-Einstellungen anzeigen"
 #: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
 #: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
 #: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Cogl-Tracing"
 
@@ -358,3 +359,23 @@ msgstr "Clipping verfolgen"
 #: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Protokolliert Informationen, wie Cogl Clipping implementiert"
+
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "Leistungsbelange verfolgen"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "Versucht suboptimale Nutzung von Cogl aufzuzeigen."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Zu setzende Cogl-Fehlerdiagnose-Flags"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr "Zurückzusetzende Cogl-Fehlerdiagnose-Flags"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Cogl-Einstellungen"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Cogl-Einstellungen anzeigen"

From 95ad4ce2efb5c5720dfb60eafcf0eaab065e1cd1 Mon Sep 17 00:00:00 2001
From: Yuri Myasoedov <omerta13@yandex.ru>
Date: Sun, 23 Sep 2012 20:09:27 +0400
Subject: [PATCH 13/15] Updated Russian translation

(cherry picked from commit c34e8bb0ca44c90d05753e6790727a462d7fd732)
---
 po/ru.po | 65 ++++++++++++++++++++++++++++++++++++--------------------
 1 file changed, 42 insertions(+), 23 deletions(-)

diff --git a/po/ru.po b/po/ru.po
index 74bc4d3a5..99df783ad 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1,52 +1,50 @@
 # Russian translation for cogl.
 # Copyright (C) 2011 cogl's COPYRIGHT HOLDER
 # This file is distributed under the same license as the cogl package.
-# Yuri Myasoedov <omerta13@yandex.ru>, 2011.
 # Vitteran <vitteran@gmail.com>, 2011.
 # Yuri Kozlov <yuray@komyakino.ru>, 2012.
+# Yuri Myasoedov <omerta13@yandex.ru>, 2011, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: cogl master\n"
 "Report-Msgid-Bugs-To: http://bugzilla.gnome.org/enter_bug.cgi?"
 "product=cogl&keywords=I18N+L10N&component=general\n"
-"POT-Creation-Date: 2012-03-16 18:37+0000\n"
-"PO-Revision-Date: 2012-03-17 14:00+0400\n"
-"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
-"Language-Team: Russian <gnome-cyr@gnome.org>\n"
+"POT-Creation-Date: 2012-08-01 10:44+0000\n"
+"PO-Revision-Date: 2012-09-23 20:09+0400\n"
+"Last-Translator: Yuri Myasoedov <omerta13@yandex.ru>\n"
+"Language-Team: русский <gnome-cyr@gnome.org>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)\n"
 "X-Generator: Lokalize 1.0\n"
 
-#: ../cogl/cogl-debug.c:173
+#: ../cogl/cogl-debug.c:174
 msgid "Supported debug values:"
 msgstr "Поддерживаемые значения отладки:"
 
-#: ../cogl/cogl-debug.c:178
+#: ../cogl/cogl-debug.c:179
 msgid "Special debug values:"
 msgstr "Специальные значения отладки:"
 
-#: ../cogl/cogl-debug.c:180 ../cogl/cogl-debug.c:182
+#: ../cogl/cogl-debug.c:181 ../cogl/cogl-debug.c:183
 msgid "Enables all non-behavioural debug options"
 msgstr "Включить все внеповеденческие параметры отладки"
 
-#: ../cogl/cogl-debug.c:226
-msgid "Cogl debugging flags to set"
-msgstr "Отладочные флаги Cogl для установки"
+#: ../cogl/cogl-debug.c:190
+msgid "Additional environment variables:"
+msgstr "Дополнительные переменные окружения:"
 
-#: ../cogl/cogl-debug.c:228
-msgid "Cogl debugging flags to unset"
-msgstr "Отладочные флаги Cogl для сброса"
+#: ../cogl/cogl-debug.c:191
+msgid "Comma-separated list of GL extensions to pretend are disabled"
+msgstr "Список отключённых расширений GL, разделённый запятыми"
 
-#: ../cogl/cogl-debug.c:277
-msgid "Cogl Options"
-msgstr "Параметры Cogl"
-
-#: ../cogl/cogl-debug.c:278
-msgid "Show Cogl options"
-msgstr "Показать параметры Cogl"
+#: ../cogl/cogl-debug.c:193
+msgid "Override the GL version that Cogl will assume the driver supports"
+msgstr "Переопределить версию GL, для которой Cogl имеет поддержку драйвера"
 
 #: ../cogl/cogl-debug-options.h:25 ../cogl/cogl-debug-options.h:30
 #: ../cogl/cogl-debug-options.h:35 ../cogl/cogl-debug-options.h:40
@@ -55,6 +53,7 @@ msgstr "Показать параметры Cogl"
 #: ../cogl/cogl-debug-options.h:66 ../cogl/cogl-debug-options.h:71
 #: ../cogl/cogl-debug-options.h:158 ../cogl/cogl-debug-options.h:163
 #: ../cogl/cogl-debug-options.h:168 ../cogl/cogl-debug-options.h:184
+#: ../cogl/cogl-debug-options.h:189
 msgid "Cogl Tracing"
 msgstr "Трассировка Cogl"
 
@@ -343,3 +342,23 @@ msgstr "Трассировка усечения"
 #: ../cogl/cogl-debug-options.h:187
 msgid "Logs information about how Cogl is implementing clipping"
 msgstr "Протоколировать информацию о том, как Cogl реализует усечение"
+
+#: ../cogl/cogl-debug-options.h:191
+msgid "Trace performance concerns"
+msgstr "Трассировка проблем с производительностью"
+
+#: ../cogl/cogl-debug-options.h:192
+msgid "Tries to highlight sub-optimal Cogl usage."
+msgstr "Пытается выделить неоптимальное использование Cogl."
+
+#~ msgid "Cogl debugging flags to set"
+#~ msgstr "Отладочные флаги Cogl для установки"
+
+#~ msgid "Cogl debugging flags to unset"
+#~ msgstr "Отладочные флаги Cogl для сброса"
+
+#~ msgid "Cogl Options"
+#~ msgstr "Параметры Cogl"
+
+#~ msgid "Show Cogl options"
+#~ msgstr "Показать параметры Cogl"

From d32bbaf0e030167b0d4d83786d42ffa0a18184ef Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Mon, 24 Sep 2012 13:46:01 +0100
Subject: [PATCH 14/15] Updates NEWS for the 1.12.0 release

---
 NEWS | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/NEWS b/NEWS
index 8930a764e..b230d5d91 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+Cogl 1.12.0                                                        2012-09-24
+
+  • List of changes since Cogl 1.11.4
+
+  » MSVC build updates to fix building with SDL support
+  » Lots of translation updates
+  
+  • List of bugs fixed since Cogl 1.11.6
+
+    #682071 - Fix Visual C++ build when using the SDL winsys
+
+Many thanks to:
+
+  Dr.T.Vasudevan
+  Alexander Shopov
+  Ani Peter
+  Ask H. Larsen
+  Carles Ferrando
+  Chun-wei Fan
+  Gil Forcada
+  Mario Blättermann
+  Nishio Futoshi
+  Rajesh Ranjan
+  Robert Bragg
+  YunQiang Su
+  Yuri Myasoedov
+
 Cogl 1.11.6                                                        2012-09-17
 
   • List of changes since Cogl 1.11.4

From b1aafcc15f6d4b4dcfe536d5b683f80aa87e1dc5 Mon Sep 17 00:00:00 2001
From: Robert Bragg <robert@linux.intel.com>
Date: Mon, 24 Sep 2012 13:46:40 +0100
Subject: [PATCH 15/15] Release 1.12.0 (release)

---
 configure.ac | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 69bd1956b..c109c1891 100644
--- a/configure.ac
+++ b/configure.ac
@@ -24,8 +24,8 @@ m4_define([cogl_version],
 
 dnl Since the core Cogl library has to also maintain support for the
 dnl Cogl 1.x API for Clutter then we track the 1.x version separately.
-m4_define([cogl_1_minor_version], [11])
-m4_define([cogl_1_micro_version], [7])
+m4_define([cogl_1_minor_version], [12])
+m4_define([cogl_1_micro_version], [0])
 m4_define([cogl_1_version], [1.cogl_1_minor_version.cogl_1_micro_version])
 
 dnl ================================================================
@@ -70,7 +70,7 @@ dnl ================================================================
 # libtool version info we don't automatically derive this from the
 # pretty version number because we want to test the results of
 # updating the version number in advance of a release.
-m4_define([cogl_release_status], [git])
+m4_define([cogl_release_status], [release])
 
 AC_INIT(cogl, [cogl_1_version])
 AC_CONFIG_SRCDIR(cogl/cogl.h)