Committed changes
Mapotempo App / Mapotempo App — Portuguese
Added to glossary
Mapotempo App — Portuguese Mapotempo App
Resource update
Mapotempo App / Mapotempo App — English
Rebased repository
Mapotempo App / Mapotempo App
Mapotempo App / Mapotempo App — Hebrew
Mapotempo App / Mapotempo App — Spanish
Merged repository
Failed merge on repository
Auto-merging config/locales/es.yml CONFLICT (content): Merge conflict in config/locales/es.yml Automatic merge failed; fix conflicts and then commit the result. (1)