Merge branch 'stable-1.1'

Skipped the chinese translation files because of merge conflict, those should be re-submitted for master

Conflicts:
	data/locale/zh.qm
	data/locale/zh.ts

include/DataFile.h

@@ -77,6 +77,24 @@ public:
 		return m_type;
 	}
 
+	// small helper class for adjusting application's locale settings
+	// when loading or saving floating point values rendered to strings
+	class LocaleHelper
+	{
+	public:
+		enum Modes
+		{
+			ModeLoad,
+			ModeSave,
+			ModeCount
+		};
+		typedef Modes Mode;
+
+		LocaleHelper( Mode mode );
+		~LocaleHelper();
+
+	};
+
 
 private:
 	static Type type( const QString& typeName );