Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2014-11-27 16:04:09 +01:00
commit 2877bbf9d8

View file

@ -38,14 +38,14 @@
</target> </target>
<target name="fix_apostrophe_issues"> <target name="fix_apostrophe_issues">
<replace token="version='1.0'" value="version=&quot;1.0&quot;"> <replace token="version='1.0'" value="version=&quot;1.0&quot;" encoding="UTF-8">
<fileset dir="res" includes="**/strings.xml" /> <fileset dir="res" includes="**/strings.xml" />
</replace> </replace>
<replace token="encoding='utf-8'" value="encoding=&quot;utf-8&quot;"> <replace token="encoding='utf-8'" value="encoding=&quot;utf-8&quot;" encoding="UTF-8">
<fileset dir="res" includes="**/strings.xml" /> <fileset dir="res" includes="**/strings.xml" />
</replace> </replace>
<replaceregexp match="([^\\])'" replace="\1\\\\'" flags="-g" byline="off"> <replaceregexp match="([^\\])'" replace="\1\\\\'" flags="-g" byline="off" encoding="UTF-8">
<fileset dir="res" includes="**/strings.xml" /> <fileset dir="res" includes="**/strings.xml" />
</replaceregexp> </replaceregexp>
</target> </target>