Resource update
Mapotempo Doc / manual/06d-plans_export — Spanish
New strings to translate
Mapotempo Doc / mtlive_manual/index — Portuguese
Mapotempo Doc / mtlive_manual/index — Spanish
Mapotempo Doc / manual/08-advanced_options — Portuguese
Mapotempo Doc / manual/08-advanced_options — Spanish
New string to translate
Mapotempo Doc / manual/05-zonings — Portuguese
Mapotempo Doc / manual/05-zonings — Spanish
Mapotempo Doc / manual/04-destinations — Portuguese
Mapotempo Doc / manual/04-destinations — Spanish
Mapotempo Doc / manual/06a-plans — Portuguese
Mapotempo Doc / manual/06a-plans — Spanish
Mapotempo Doc / glossary/index — English
Mapotempo Doc / glossary/index — Portuguese
Mapotempo Doc / glossary/index — Spanish
Failed merge on repository
Mapotempo Doc / index
Auto-merging source/locale/en/LC_MESSAGES/manual/04-destinations.po CONFLICT (content): Merge conflict in source/locale/en/LC_MESSAGES/manual/04-destinations.po Automatic merge failed; fix conflicts and then commit the result. (1)
alahouze