<div dir="ltr">It was good to recover.<br><div>I apologize that it has delayed the work of everyone by my mistake.<br></div><div>Thank you for advice of Mr Akagi.<br></div></div><div class="gmail_extra"><br><br><div class="gmail_quote">
2013/6/23 Marie Silvestre <span dir="ltr"><<a href="mailto:marie_silvestre@yahoo.fr" target="_blank">marie_silvestre@yahoo.fr</a>></span><br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<div><div style="font-size:10pt;font-family:arial,helvetica,sans-serif">Thanks Yoichi and Minoru, everything is back to normal!<br><br>Marie<br><div><span><br></span></div><div><br></div> <div style="font-family:arial,helvetica,sans-serif;font-size:10pt">
<div style="font-family:times new roman,new york,times,serif;font-size:12pt"> <div dir="ltr"> <hr size="1"> <font face="Arial"> <b><span style="font-weight:bold">De :</span></b> Minoru Akagi <<a href="mailto:akaginch@gmail.com" target="_blank">akaginch@gmail.com</a>><br>
<b><span style="font-weight:bold">À :</span></b> <a href="mailto:qgis-community-team@lists.osgeo.org" target="_blank">qgis-community-team@lists.osgeo.org</a> <br> <b><span style="font-weight:bold">Envoyé le :</span></b> Dimanche 23 juin 2013 5h01<br>
<b><span style="font-weight:bold">Objet :</span></b> Re: [Qgis-community-team] Problem on 1.8 branch<br> </font> </div><div><div class="h5"> <div><br>Hi Yoichi, <br><br>You have to revert the problematic commit that
affected other languages. You<br>can do it as belows. <br><br>git revert f517e89 <br>git checkout HEAD i18n/ja/* <br>git commit -m "revert f517e89 partially (except for ja files)" <br><br><br>Minoru<br><br><br>
Yoichi Kayama wrote<br>> Hi Marie<br>> <br>> I'm sorry. I had mistake.<br>> I canceled the pull of the last.<br>> <br>> Yoichi<br>> <br>> <br>> 2013/6/23 Marie Silvestre <<br><br>> marie_silvestre@<br>
<br>> ><br>> <br>>> Hi all!<br>>> I think something "terrible" happened with one of Kayama Yoichi's last<br>>> pull request [1]. It appears that translation files from transifex have<br>
>> replaced files on github for all languages registered in transifex... It<br>>> may be a good thing for Japanese files but certainly not for French,<br>>> German, Dutch, etc. Could someone revert this?<br>
>><br>>> Marie<br>>><br>>> [1]<br>>> <a href="https://github.com/qgis/QGIS-Documentation/commit/f517e896f362191af80877b610ed48584269d238" target="_blank">https://github.com/qgis/QGIS-Documentation/commit/f517e896f362191af80877b610ed48584269d238</a><br>
>><br>> <br>> _______________________________________________<br>> Qgis-community-team mailing list<br><br>> <a href="mailto:Qgis-community-team@.osgeo" target="_blank">Qgis-community-team@.osgeo</a><br>
<br>> <a href="http://lists.osgeo.org/mailman/listinfo/qgis-community-team" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-community-team</a><br><br><br><br><br><br>--<br>View this message in context: <a href="http://osgeo-org.1560.x6.nabble.com/Qgis-community-team-Problem-on-1-8-branch-tp5061759p5061766.html" target="_blank">http://osgeo-org.1560.x6.nabble.com/Qgis-community-team-Problem-on-1-8-branch-tp5061759p5061766.html</a><br>
Sent from the Quantum GIS - Community Team mailing
list archive at Nabble.com.<br>_______________________________________________<br>Qgis-community-team mailing list<br><a href="mailto:Qgis-community-team@lists.osgeo.org" target="_blank">Qgis-community-team@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-community-team" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-community-team</a><br><br><br></div> </div></div></div> </div> </div></div><br>_______________________________________________<br>
Qgis-community-team mailing list<br>
<a href="mailto:Qgis-community-team@lists.osgeo.org">Qgis-community-team@lists.osgeo.org</a><br>
<a href="http://lists.osgeo.org/mailman/listinfo/qgis-community-team" target="_blank">http://lists.osgeo.org/mailman/listinfo/qgis-community-team</a><br>
<br></blockquote></div><br></div>