From 2fd37feef699b3059ba929a8f63b5e9d22fec763 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 28 Apr 2011 23:24:11 +0200
Subject: Disable building of EchoBot example on non-Windows platforms.


diff --git a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
index 036b29d..1960609 100644
--- a/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
+++ b/Documentation/SwiftenDevelopersGuide/Examples/EchoBot/SConscript
@@ -15,9 +15,11 @@ if env["PLATFORM"] == "win32" :
 	if int(env["MSVS_VERSION"].split(".")[0]) >= 10 :
 		cpp0x = True
 else :
-	if env["CCVERSION"].split(".") >= ["4", "5", "0"] :
-		cpp0x = True
-		cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"])
-		cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"])
+	pass
+# Disabling C++0x compilation, because older boosts are not compliant yet
+#	if env["CCVERSION"].split(".") >= ["4", "5", "0"] :
+#		cpp0x = True
+#		cpp0x_env.Replace(CXXFLAGS = [flag for flag in env["CXXFLAGS"] if flag != "-Werror"])
+#		cpp0x_env.Append(CXXFLAGS = ["-std=c++0x"])
 if cpp0x :
 	cpp0x_env.Program("EchoBot0x", "EchoBot0x.cpp")
-- 
cgit v0.10.2-6-g49f6


From ba6974c89fdbc18e3baedda1c002563ae5dbaf34 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Remko=20Tron=C3=A7on?= <git@el-tramo.be>
Date: Thu, 28 Apr 2011 23:25:56 +0200
Subject: Added Galician Swift desktop entry.


diff --git a/Swift/resources/swift.desktop b/Swift/resources/swift.desktop
index 0756649..ba0e341 100644
--- a/Swift/resources/swift.desktop
+++ b/Swift/resources/swift.desktop
@@ -24,6 +24,9 @@ Comment[es]=Comunícate por la red Jabber/XMPP
 GenericName[fr]=Client de messagerie instantanée Jabber/XMPP
 Comment[fr]=Communiquer sur le réseau Jabber/XMPP
 
+GenericName[gl]=Cliente de mensaxería Jabber/XMPP
+Comment[gl]=Comunícate empregando a rede Jabber/XMPP
+
 GenericName[hu]=Jabber/XMPP Azonnali üzenetküldő
 Comment[hu]=Beszélgetés Jabber/XMPP protokollon keresztül
 
-- 
cgit v0.10.2-6-g49f6