removed a NSCalendarUnit warning
merged my old and new english .strings file
Updated gitignore