diff options
| author | rowanbeentje <rowan@beent.je> | 2014-05-03 18:41:41 +0100 |
|---|---|---|
| committer | rowanbeentje <rowan@beent.je> | 2014-05-03 18:41:41 +0100 |
| commit | 6d33243e4a658d600e646a1b58afb363b9650cdc (patch) | |
| tree | 19e673da6d14ff5000bab765ac66e283b7804697 | |
| parent | 2ec55c1404fe7368a03a53beff4596577654876c (diff) | |
| download | sequelpro-6d33243e4a658d600e646a1b58afb363b9650cdc.tar.gz sequelpro-6d33243e4a658d600e646a1b58afb363b9650cdc.tar.bz2 sequelpro-6d33243e4a658d600e646a1b58afb363b9650cdc.zip | |
Add a .gitattributes file containing config and instruction on how to easily diff UTF16 .strings files (the actual .gitconfig itself can't be included in a repo), and update localizable strings file
| -rw-r--r-- | .gitattributes | 4 | ||||
| -rw-r--r-- | Resources/English.lproj/Localizable.strings | bin | 245200 -> 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 Binary files differindex 5a55a427..f54e1fab 100644 --- a/Resources/English.lproj/Localizable.strings +++ b/Resources/English.lproj/Localizable.strings |