Merge branch 'master' into msvc-support-master

2011-09-19 14:24:04 +08:00 · 2011-09-19 14:24:04 +08:00 · ad7bb392c5
commit ad7bb392c5
parent 65e498e3f9 f315e760de
3 changed files with 2775 additions and 560 deletions
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/sl.po
+++ b/po/sl.po
@ -2193,5 +2193,4 @@ msgstr "Preusmeritev prepisa okna"

 #: ../clutter/x11/clutter-x11-texture-pixmap.c:647
 msgid "If this is an override-redirect window"
-msgstr "Ali je to okno preusmeritve prepisa"
-
+msgstr "Ali je to okno preusmeritve prepisa"
--- a/po/ta.po
+++ b/po/ta.po