aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitattributes4
-rw-r--r--Resources/English.lproj/Localizable.stringsbin245200 -> 245224 bytes
2 files changed, 4 insertions, 0 deletions
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 00000000..503fe51d
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,4 @@
+# To enable smart diffing of *.strings files, run the following command:
+# git config diff.localizablestrings.textconv "iconv -f utf-16 -t utf-8"
+*.strings diff=localizablestrings
+
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 5a55a427..f54e1fab 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ