f960834 fix conflicting i18n files

Authored and Committed by spot 3 years ago
    fix conflicting i18n files
    
        
file modified
+20 -5