Merge pull request #447 from lifenjoiner/utf8

change .gitattributes encoding UTF-16 to UTF-8 and set it for lang files
stefankueng · Feb 2, 2024 · a0b8ab7 · a0b8ab7
2 parents 6ab271d + 872d6ab
commit a0b8ab7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 5 deletions.
diff --git a/.gitattributes b/.gitattributes
@@ -1,3 +1,4 @@
-/src/Resources/grepWin.rc2  text working-tree-encoding=UTF-16
-/src/Resources/grepWin.rc   text working-tree-encoding=UTF-16
-/src/resource.h             text working-tree-encoding=UTF-16
+/src/Resources/grepWin.rc   text working-tree-encoding=UTF-8
+/src/Resources/grepWin.rc2  text working-tree-encoding=UTF-8
+/src/resource.h             text working-tree-encoding=UTF-8
+/translations/*.lang        text working-tree-encoding=UTF-8
diff --git a/src/Resources/grepWin.rc b/src/Resources/grepWin.rc
@@ -1,5 +1,7 @@
 // Microsoft Visual C++ generated resource script.
 //
+#pragma code_page(65001)
+
 #include "..\resource.h"
 
 #define APSTUDIO_READONLY_SYMBOLS

diff --git a/src/Resources/grepWin.rc2 b/src/Resources/grepWin.rc2
@@ -1,4 +1,4 @@
-//
+//
 // grepWin.rc2 - resources Microsoft Visual C++ does not edit directly
 //
 

diff --git a/src/resource.h b/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by D:\Development\grepWin\src\Resources\grepWin.rc
 //
-Original file line number
+Diff line change
@@ -1,4 +1,4 @@
-    //
+    //
     // grepWin.rc2 - resources Microsoft Visual C++ does not edit directly
     //
@@ Expand Down @@