[GPGME PATCH 2/3] move some file encodings to UTF-8

Daniel Kahn Gillmor dkg at fifthhorseman.net
Fri Sep 23 01:06:21 CEST 2016


* THANKS, doc/ChangeLog-2011, tests/ChangeLog-2011,
  tests/gpg/geheim.txt: convert from iso 8859-1 to utf-8
* lang/qt/src/dataprovider.cpp, lang/qt/src/qgpgmerefreshkeysjob.cpp,
  lang/qt/src/qgpgmesecretkeyexportjob.cpp: replace U+FFFD REPLACEMENT
  CHARACTER with proper U+00E4 LATIN SMALL LETTER A WITH DIAERESIS

Note that src/versioninfo.rc.in is still ISO-8859-1.  I don't know
whether Windows will properly handle UTF-8 in this file or not, so i
have not touched it.

Signed-off-by: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
---
 THANKS                                   | 6 +++---
 doc/ChangeLog-2011                       | 2 +-
 lang/qt/src/dataprovider.cpp             | 2 +-
 lang/qt/src/qgpgmerefreshkeysjob.cpp     | 2 +-
 lang/qt/src/qgpgmesecretkeyexportjob.cpp | 2 +-
 tests/ChangeLog-2011                     | 8 ++++----
 tests/gpg/geheim.txt                     | 2 +-
 7 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/THANKS b/THANKS
index 9d79004..e312775 100644
--- a/THANKS
+++ b/THANKS
@@ -5,7 +5,7 @@ want to thank them for their help.  If we forgot you, please let us
 know.
 
 Adriaan de Groot        adridg at cs.kun.nl
-Albrecht Dreß		albrecht.dress at arcor.de
+Albrecht Dreß		albrecht.dress at arcor.de
 Alfons Hoogervorst      alfons at proteus.demon.nl
 Daniel Mueller		daniel at danm.de
 Enno Cramer             uebergeek at web.de
@@ -13,13 +13,13 @@ Frank Heckenbach        frank at g-n-u.de
 Igor Belyi		gpgme at katehok.ac93.org
 Jan-Oliver Wagner       jan at intevation.de
 Johannes Poehlmann      jhp at caldera.de
-Jose C. García Sogo     jose at jaimedelamo.eu.org
+Jose C. García Sogo     jose at jaimedelamo.eu.org
 Leo Gaspard             ekleog at gmail.com
 Mark Mutz               mutz at kde.org
 Miguel Coca		mcoca at gnu.org
 Noel Torres		envite at rolamasao.org
 Patrick Spendrin        patrick.spendrin at kdab.com
-Stéphane Corthésy       stephane at sente.ch
+Stéphane Corthésy       stephane at sente.ch
 Timo Schulz             twoaday at freakmail.de
 Tommy Reynolds          reynolds at redhat.com
 W. Trevor King          wking at tremily.us
diff --git a/doc/ChangeLog-2011 b/doc/ChangeLog-2011
index d6ecca7..e270fae 100644
--- a/doc/ChangeLog-2011
+++ b/doc/ChangeLog-2011
@@ -397,7 +397,7 @@
 	(Listing Keys): Update examples.
 	(Decrypt): Result might also be available when operation failed.
 	(Verify): Result might also be available when operation failed.
-	All spotted by Stéphane Corthésy.
+	All spotted by Stéphane Corthésy.
 
 2003-07-22  Marcus Brinkmann  <marcus at g10code.de>
 
diff --git a/lang/qt/src/dataprovider.cpp b/lang/qt/src/dataprovider.cpp
index 533b67d..8a487a5 100644
--- a/lang/qt/src/dataprovider.cpp
+++ b/lang/qt/src/dataprovider.cpp
@@ -1,5 +1,5 @@
 /* dataprovider.cpp
-   Copyright (C) 2004 Klar�vdalens Datakonsult AB
+   Copyright (C) 2004 Klarävdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
    This file is part of QGPGME.
diff --git a/lang/qt/src/qgpgmerefreshkeysjob.cpp b/lang/qt/src/qgpgmerefreshkeysjob.cpp
index 3d221f6..0fe724b 100644
--- a/lang/qt/src/qgpgmerefreshkeysjob.cpp
+++ b/lang/qt/src/qgpgmerefreshkeysjob.cpp
@@ -2,7 +2,7 @@
     qgpgmerefreshkeysjob.cpp
 
     This file is part of qgpgme, the Qt API binding for gpgme
-    Copyright (c) 2004 Klar�vdalens Datakonsult AB
+    Copyright (c) 2004 Klarävdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
     QGpgME is free software; you can redistribute it and/or
diff --git a/lang/qt/src/qgpgmesecretkeyexportjob.cpp b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
index f4ec698..ab7f1e6 100644
--- a/lang/qt/src/qgpgmesecretkeyexportjob.cpp
+++ b/lang/qt/src/qgpgmesecretkeyexportjob.cpp
@@ -2,7 +2,7 @@
     qgpgmesecretexportjob.cpp
 
     This file is part of qgpgme, the Qt API binding for gpgme
-    Copyright (c) 2004 Klar�vdalens Datakonsult AB
+    Copyright (c) 2004 Klarävdalens Datakonsult AB
     Copyright (c) 2016 Intevation GmbH
 
     QGpgME is free software; you can redistribute it and/or
diff --git a/tests/ChangeLog-2011 b/tests/ChangeLog-2011
index 596c2df..3ec0fb7 100644
--- a/tests/ChangeLog-2011
+++ b/tests/ChangeLog-2011
@@ -603,7 +603,7 @@
 
 2002-09-28  Marcus Brinkmann  <marcus at g10code.de>
 
-	* t-version.c: Include <string.h>.  Reported by Stéphane Corthésy.
+	* t-version.c: Include <string.h>.  Reported by Stéphane Corthésy.
 
 2002-09-02  Marcus Brinkmann  <marcus at g10code.de>
 
@@ -624,8 +624,8 @@
 
 	* gpg/t-encrypt-sym.c (main): Change type of I to size_t and
 	rename to LEN.
-	* gpg/t-verify.c (main): Likewise.  Submitted by Stéphane
-	Corthésy.
+	* gpg/t-verify.c (main): Likewise.  Submitted by Stéphane
+	Corthésy.
 
 2002-07-03  Marcus Brinkmann  <marcus at g10code.de>
 
@@ -772,7 +772,7 @@
 2001-12-19  Marcus Brinkmann  <marcus at g10code.de>
 
 	* gpg/t-decrypt-verify.c: Don't include `mcheck.h'.  Reported by
-	Stéphane Corthésy.
+	Stéphane Corthésy.
 
 2001-12-19  Marcus Brinkmann  <marcus at g10code.de>
 
diff --git a/tests/gpg/geheim.txt b/tests/gpg/geheim.txt
index 99a5478..49d78a7 100644
--- a/tests/gpg/geheim.txt
+++ b/tests/gpg/geheim.txt
@@ -1,2 +1,2 @@
-Wenn Sie dies lesen können, ist es wohl nicht
+Wenn Sie dies lesen können, ist es wohl nicht
 geheim genug.
-- 
2.9.3




More information about the Gnupg-devel mailing list