Fix some merge conflicts with locales/fr.yml
Fix some merge conflicts with locales/fr.yml

Lysette/Markus,SoftwareDev/Markus,benjaminvialle/Markus,WilsonChiang/Markus,ealonas/Markus,ealonas/Markus,wkwan/Markus,david-yz-liu/Markus,MarkUsProject/Markus,david-yz-liu/Markus,reidka/Markus,binuri/Markus,finnergizer/Markus,kmccoan/Markus,arkon/Markus,finnergizer/Markus,MarkUsProject/Markus,Lysette/Markus,wkwan/Markus,wkwan/Markus,WilsonChiang/Markus,ealonas/Markus,ealonas/Markus,jeremygoh/Markus,kmccoan/Markus,reidka/Markus,melneubert/Markus,ealonas/Markus,binuri/Markus,ealonas/Markus,WilsonChiang/Markus,MarkUsProject/Markus,selyanhb/Markus,kmccoan/Markus,binuri/Markus,Lysette/Markus,benjaminvialle/Markus,arkon/Markus,jeremygoh/Markus,SoftwareDev/Markus,reidka/Markus,jeremygoh/Markus,david-yz-liu/Markus,wkwan/Markus,david-yz-liu/Markus,wkwan/Markus,melneubert/Markus,kmccoan/Markus,ealonas/Markus,jeremygoh/Markus,selyanhb/Markus,selyanhb/Markus,SoftwareDev/Markus,arkon/Markus,selyanhb/Markus,finnergizer/Markus,selyanhb/Markus,benjaminvialle/Markus,melneubert/Markus,MarkUsProject/Markus,david-yz-liu/Markus,kmccoan/Markus,wkwan/Markus,arkon/Markus,WilsonChiang/Markus,reidka/Markus,finnergizer/Markus,benjaminvialle/Markus,jeremygoh/Markus,binuri/Markus,MarkUsProject/Markus,melneubert/Markus,binuri/Markus,SoftwareDev/Markus,MarkUsProject/Markus,benjaminvialle/Markus,SoftwareDev/Markus,Lysette/Markus,melneubert/Markus,SoftwareDev/Markus,melneubert/Markus,melneubert/Markus,david-yz-liu/Markus,binuri/Markus,finnergizer/Markus,david-yz-liu/Markus,jeremygoh/Markus,binuri/Markus,ealonas/Markus,Lysette/Markus,Lysette/Markus,reidka/Markus,wkwan/Markus,arkon/Markus,finnergizer/Markus,arkon/Markus,jeremygoh/Markus,WilsonChiang/Markus,WilsonChiang/Markus,WilsonChiang/Markus,selyanhb/Markus,benjaminvialle/Markus,ealonas/Markus,wkwan/Markus,MarkUsProject/Markus,david-yz-liu/Markus,selyanhb/Markus,SoftwareDev/Markus,arkon/Markus,reidka/Markus,arkon/Markus,jeremygoh/Markus,jeremygoh/Markus,wkwan/Markus,WilsonChiang/Markus,reidka/Markus,arkon/Markus,finnergizer/Markus,melneubert/Markus,finnergizer/Markus,kmccoan/Markus,reidka/Markus,MarkUsProject/Markus,benjaminvialle/Markus,finnergizer/Markus,kmccoan/Markus,binuri/Markus,david-yz-liu/Markus,melneubert/Markus,binuri/Markus,WilsonChiang/Markus,Lysette/Markus,reidka/Markus,selyanhb/Markus