From afaf7eaffa2b7e18675eb5d5a9fdd00fd31c5685 Mon Sep 17 00:00:00 2001
From: Chris Cormack <chrisc@catalyst.net.nz>
Date: Wed, 5 Oct 2011 16:39:08 +1300
Subject: [PATCH] Bug 6895 : First attempt at fixing the diacritics bug

This is a fairly hacky solution, a counter patch would be more than
welcome

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Updated, translated and installed German po files after applying this patch.
No problems found.

Signed-off-by: Paul Poulain <paul.poulain@biblibre.com>
---
 koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt                 | 2 +-
 .../prog/en/modules/cataloguing/value_builder/macles.tt         | 2 +-
 koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt       | 2 +-
 misc/translator/xgettext.pl                                     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
index cb00ccfef8..9289f46064 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/auth.tt
@@ -62,7 +62,7 @@
 
 <!-- <p><label><input name="rememberme" type="checkbox" id="rememberme" value="forever" tabindex="3" />Remember me</label></p> -->
 
-<p class="submit"><input id="submit" type="submit" value="Login &raquo;" tabindex="4" /></p>
+<p class="submit"><input id="submit" type="submit" value="Login" tabindex="4" /></p>
 </form>
 <!--<ul> -->
 <!--	<li><a href="/cgi-bin/koha/lostpassword.pl" title="Password Lost and Found">Lost your password?</a></li> -->
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt
index 9a3fe810dd..3055445f0b 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/macles.tt
@@ -37,7 +37,7 @@
             <!-- <input type="submit" class="button" value="Envoyer" /> -->
             <a class="button" href="" onclick="load_macles(630);">R&eacute;initialiser</a>
             <a class="button" href="javascript:uncheck_tab([% BIGLOO.number %])">d&eacute;selectionner onglet</a>
-            <input type="reset" class="button" value="d&eacute;selectionner tout" />
+            <input type="reset" class="button" value="déselectionner tout" />
             [% IF ( BIGLOO.Table ) %]
             <table>
                 <tr>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
index 9736188b6d..909398e746 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/installer/auth.tt
@@ -43,7 +43,7 @@ with the username and password given to you by your systems administrator and lo
 <p><label>Password:<br />
 <input type="password" name="password" id="password" class="input" value="" size="20" tabindex="2" /></label>
 </p>
-<p class="submit"><input id="submit" type="submit" value="Login &raquo;" tabindex="4" /></p>
+<p class="submit"><input id="submit" type="submit" value="Login" tabindex="4" /></p>
 </form>
 
 [% END %]
diff --git a/misc/translator/xgettext.pl b/misc/translator/xgettext.pl
index 99e96122ac..21e3fc5bab 100755
--- a/misc/translator/xgettext.pl
+++ b/misc/translator/xgettext.pl
@@ -351,7 +351,7 @@ if (defined $output && $output ne '-') {
     print STDERR "$0: Outputting to STDOUT...\n" if $verbose_p;
     open(OUTPUT, ">&STDOUT");
 }
-binmode( OUTPUT, ":utf8" );
+#binmode( OUTPUT, ":utf8" );
 
 if (defined $files_from) {
     print STDERR "$0: Opening input file list \"$files_from\"\n" if $verbose_p;
-- 
2.39.5