updating rst files, restructuring accodring to #3 and #4 and fixing a bug in the english index template
updating translation files
updating rst files, restructuring accodring to #3 and #4 and fixing a bug in the english index template
Resolved merge conflcts
Resolved merge conflcts