[Performous-commit] Lasse Karkkainen : Rename & from et to and, as that form is far more common .

[Lasse Kärkkäi. <tr...@us...>]

Module: performous
Branch: master
Commit: 5e0ea4076ee9431506f43c64a4415268d4b75348

Author: Lasse Karkkainen <tro...@tr...>
Date:   Tue Aug 18 06:37:59 2009 +0300

Rename & from et to and, as that form is far more common.

---

 tools/ss_extract.cpp |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/ss_extract.cpp b/tools/ss_extract.cpp
index a64d98c..338b592 100644
--- a/tools/ss_extract.cpp
+++ b/tools/ss_extract.cpp
@@ -88,7 +88,7 @@ Filename_ safename(Glib::ustring const& str) {
 		if (*it >= 0x7F && *it < 0xA0) continue; // Additional control characters
 		if (first && *it == '.') continue;
 		if (first && *it == '-') continue;
-		if (*it == '&') { ret += " et "; continue; }
+		if (*it == '&') { ret += " and "; continue; }
 		if (*it == '%') { ret += " percent "; continue; }
 		if (*it == '$') { ret += " dollar "; continue; }
 		if (forbidden.find(*it) != Glib::ustring::npos) { ret += "_"; continue; }