# HG changeset patch
# User Christophe Lincoln
# Date 1331780208 -3600
# Node ID e6c3f31996fc5e5f58b9e0e6a10d6f3d83e2def3
# Parent 03acf3081c6d5cd1c113e757d834120a3d83003b# Parent 3fe07e675ad7364113c53441ef5cc2393f6a1b39
merge
diff -r 03acf3081c6d -r e6c3f31996fc pro/en/index.php
--- a/pro/en/index.php Thu Mar 15 03:56:20 2012 +0100
+++ b/pro/en/index.php Thu Mar 15 03:56:48 2012 +0100
@@ -56,7 +56,7 @@
SliTaz is free and open source system with a large and growing
community. Our business model is software as a service, partnership
and sponsoring. We can provide services all over the world
- and in languages such English, French and Portuguese.
+ and in languages such as English, French and Portuguese.
This professional platform allows you to have contact with the SliTaz
diff -r 03acf3081c6d -r e6c3f31996fc tank/web/graphs.php
--- a/tank/web/graphs.php Thu Mar 15 03:56:20 2012 +0100
+++ b/tank/web/graphs.php Thu Mar 15 03:56:48 2012 +0100
@@ -25,7 +25,7 @@
Shop
Bugs
Hg
- Bb
+ BB
diff -r 03acf3081c6d -r e6c3f31996fc tank/web/index.php
--- a/tank/web/index.php Thu Mar 15 03:56:20 2012 +0100
+++ b/tank/web/index.php Thu Mar 15 03:56:48 2012 +0100
@@ -25,7 +25,7 @@
Shop
Bugs
Hg
- Bb
+ BB