[gimp/gimp-2-10] Fix encoding. The world should be utf-8.



commit c176b0888e45fdd033904725e7031aa0f9a111db
Author: Salamandar <felix piedallu me>
Date:   Fri May 25 15:01:25 2018 +0200

    Fix encoding. The world should be utf-8.
    
    (cherry picked from commit 8feb51954bd0d0c0dffc3ae131ed5e48108a1e05)

 app/display/gimpdisplayshell-title.c       | 4 ++--
 build/windows/gimp-plug-ins.rc.in          | 2 +-
 build/windows/gimp.rc.in                   | 2 +-
 build/windows/installer/MessageWithURL.isi | 6 +++---
 plug-ins/common/file-xwd.c                 | 2 +-
 plug-ins/common/qbist.c                    | 4 ++--
 plug-ins/screenshot/screenshot-win32.rc    | 2 +-
 plug-ins/twain/twain.h                     | 2 +-
 8 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/app/display/gimpdisplayshell-title.c b/app/display/gimpdisplayshell-title.c
index c528ba9324..4fe5c6f136 100644
--- a/app/display/gimpdisplayshell-title.c
+++ b/app/display/gimpdisplayshell-title.c
@@ -515,8 +515,8 @@ gimp_display_shell_format_title (GimpDisplayShell *shell,
               /* Other cool things to be added:
                * %r = xresolution
                * %R = yresolution
-               * %� = image's fractal dimension
-               * %� = the answer to everything - (implemented)
+               * %ø = image's fractal dimension
+               * %þ = the answer to everything - (implemented)
                */
 
             default:
diff --git a/build/windows/gimp-plug-ins.rc.in b/build/windows/gimp-plug-ins.rc.in
index db132da56b..d6fbe8dc70 100644
--- a/build/windows/gimp-plug-ins.rc.in
+++ b/build/windows/gimp-plug-ins.rc.in
@@ -17,7 +17,7 @@
 #define VER_INTERNALNAME_STR        QUOTE(INTERNALNAME_STR)
 #define VER_ORIGINALFILENAME_STR    QUOTE(ORIGINALFILENAME_STR)
 
-#define VER_LEGALCOPYRIGHT_STR      "Copyright � 1995-" GIMP_GIT_LAST_COMMIT_YEAR
+#define VER_LEGALCOPYRIGHT_STR      "Copyright © 1995-" GIMP_GIT_LAST_COMMIT_YEAR
 
 #ifndef DEBUG
 #define VER_DEBUG                   0
diff --git a/build/windows/gimp.rc.in b/build/windows/gimp.rc.in
index 4fc44e8687..5fc6005e1d 100644
--- a/build/windows/gimp.rc.in
+++ b/build/windows/gimp.rc.in
@@ -18,7 +18,7 @@
 #define VER_INTERNALNAME_STR        QUOTE(INTERNALNAME_STR)
 #define VER_ORIGINALFILENAME_STR    QUOTE(ORIGINALFILENAME_STR)
 
-#define VER_LEGALCOPYRIGHT_STR      "Copyright � 1995-" GIMP_GIT_LAST_COMMIT_YEAR
+#define VER_LEGALCOPYRIGHT_STR      "Copyright © 1995-" GIMP_GIT_LAST_COMMIT_YEAR
 
 #ifndef DEBUG
 #define VER_DEBUG                   0                 
diff --git a/build/windows/installer/MessageWithURL.isi b/build/windows/installer/MessageWithURL.isi
index 3763da8a65..154e0acb4a 100644
--- a/build/windows/installer/MessageWithURL.isi
+++ b/build/windows/installer/MessageWithURL.isi
@@ -1,7 +1,7 @@
 [Code]
 (* MessageWithURL
  *
- * Copyright (c) 2010-2011 Jernej Simon�i�
+ * Copyright (c) 2010-2011 Jernej Simončič
  *
  * This software is provided 'as-is', without any express or implied
  * warranty. In no event will the authors be held liable for any damages
@@ -288,7 +288,7 @@ begin
                Blank.Right := Width;
                Blank.Bottom := Height;
                Bitmap.Canvas.Brush.Color := TPanel(Parent).Color;
-               Bitmap.Canvas.FillRect(Blank);          
+               Bitmap.Canvas.FillRect(Blank);
        end;
 end;
 
@@ -310,7 +310,7 @@ begin
                                Top := TypImg.Top
                        else
                                Top := TextLabel[i-1].Top + TextLabel[i-1].Height + ScaleY(MWU_VERTSPACING);
-                       
+
                        WordWrap := True;
                        AutoSize := True;
                        Width := DialogTextWidth;
diff --git a/plug-ins/common/file-xwd.c b/plug-ins/common/file-xwd.c
index 81fb7652a4..93ce7babc9 100644
--- a/plug-ins/common/file-xwd.c
+++ b/plug-ins/common/file-xwd.c
@@ -34,7 +34,7 @@
  *          2       |    1,...,32  |      32
  */
 /* Event history:
- * PK = Peter Kirchgessner, ME = Mattias Engdeg�rd
+ * PK = Peter Kirchgessner, ME = Mattias Engdegård
  * V 1.00, PK, xx-Aug-96: First try
  * V 1.01, PK, 03-Sep-96: Check for bitmap_bit_order
  * V 1.90, PK, 17-Mar-97: Upgrade to work with GIMP V0.99
diff --git a/plug-ins/common/qbist.c b/plug-ins/common/qbist.c
index a1535880f0..a7b30a1b6c 100644
--- a/plug-ins/common/qbist.c
+++ b/plug-ins/common/qbist.c
@@ -1,10 +1,10 @@
 /*
  * Written 1997 Jens Ch. Restemeier <jrestemeier currantbun com>
  * This program is based on an algorithm / article by
- * J�rn Loviscach.
+ * Jörn Loviscach.
  *
  * It appeared in c't 10/95, page 326 and is called
- * "Ausgew�rfelt - Moderne Kunst algorithmisch erzeugen"
+ * "Ausgewürfelt - Moderne Kunst algorithmisch erzeugen"
  * (~modern art created with algorithms).
  *
  * It generates one main formula (the middle button) and 8 variations of it.
diff --git a/plug-ins/screenshot/screenshot-win32.rc b/plug-ins/screenshot/screenshot-win32.rc
index beef4b0222..a663fc5da7 100644
--- a/plug-ins/screenshot/screenshot-win32.rc
+++ b/plug-ins/screenshot/screenshot-win32.rc
@@ -120,7 +120,7 @@ BEGIN
             VALUE "FileDescription", "snappy\0"
             VALUE "FileVersion", "1, 0, 0, 1\0"
             VALUE "InternalName", "snappy\0"
-            VALUE "LegalCopyright", "Copyright � 1999\0"
+            VALUE "LegalCopyright", "Copyright © 1999\0"
             VALUE "LegalTrademarks", "\0"
             VALUE "OriginalFilename", "snappy.exe\0"
             VALUE "PrivateBuild", "\0"
diff --git a/plug-ins/twain/twain.h b/plug-ins/twain/twain.h
index d22445f50e..af00295215 100644
--- a/plug-ins/twain/twain.h
+++ b/plug-ins/twain/twain.h
@@ -7,7 +7,7 @@
   Fujitsu, Genoa Technology, Hewlett-Packard, Kofax Imaging Products, and
   Ricoh Corporation.  All rights reserved.
 
-  Copyright � 1998 TWAIN Working Group: Adobe Systems Incorporated,
+  Copyright © 1998 TWAIN Working Group: Adobe Systems Incorporated,
        Canon Information Systems, Eastman Kodak Company,
        Fujitsu Computer Products of America, Genoa Technology,
        Hewlett-Packard Company, Intel Corporation, Kofax Image Products,


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]