<html><body><div style="color:#000; background-color:#fff; font-family:arial, helvetica, sans-serif;font-size:10pt">Thanks Otto, I did my first merge without any problem!<br><br>I haven't tried to run the pre_translation script locally as I did not installed all the stuff needed. I can give it a try tonight.<br>Here is a simple example of untranslated (not synchronized) string from http://documentation.qgis.org/html/fr/docs/user_manual/preamble/features.html#features<br>I have this string in my fr features.po [1]:<br><pre><div class="line" id="LC46"><span class="nv">msgid</span> <span class="s">"**View data**"</span></div><div class="line" id="LC47"><span class="nv">msgstr</span> <span class="s">"**Visualiser des données**"</span><br></div></pre><span>While there is this string in the en features.po [2</span>]:<br><pre><div class="line" id="LC46"><span class="nv">msgid</span> <span class="s">"View data"</span></div><div class="line" id="LC47"><span
class="nv">msgstr</span> <span class="s">""</span></div></pre><span>[1] line 46 in https://github.com/qgis/QGIS-Documentation/blob/master/i18n/fr/LC_MESSAGES/docs/user_manual/preamble/features.po<br>[2] line 40 in https://github.com/qgis/QGIS-Documentation/blob/master/i18n/en/LC_MESSAGES/docs/user_manual/preamble/features.po<br><br><br>About the 2 links, they are not exactly the same... See QGIS gui pages:<br>http://documentation.qgis.org/html/en/user_manual/introduction/qgis_gui.html<br>http://documentation.qgis.org/html/en/docs/user_manual/introduction/qgis_gui.html<br>The corresponding po file </span><span><span>[3]</span> refers to a mix of the both links : line 32 is from the first link but line 47 is from the second, etc.<br>[3] https://github.com/qgis/QGIS-Documentation/blob/master/i18n/en/LC_MESSAGES/docs/user_manual/introduction/qgis_gui.po<br><br><br>Best regards,<br>Marie<br><br></span><div style="color: rgb(0, 0, 0); font-size: 13.3333px;
font-family: arial,helvetica,sans-serif; background-color: transparent; font-style: normal;"><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"> <font face="Arial" size="2"> <hr size="1"> <b><span style="font-weight:bold;">De :</span></b> Otto Dassau <dassau@gbd-consult.de><br> <b><span style="font-weight: bold;">À :</span></b> qgis-community-team@lists.osgeo.org <br> <b><span style="font-weight: bold;">Envoyé le :</span></b> Lundi 7 janvier 2013 13h29<br> <b><span style="font-weight: bold;">Objet :</span></b> Re: [Qgis-community-team] Doc translation and related issues<br> </font> </div> <br>Hi Marie and Richard,<br><br>Am Mon, 07 Jan 2013 13:17:56 +0100<br>schrieb Richard Duivenvoorde <<a ymailto="mailto:richard@duif.net"
href="mailto:richard@duif.net">richard@duif.net</a>>:<br><br>> On 07-01-13 11:19, Marie Silvestre wrote:<br>> > I'm back with a list of questions and remarks... (sorry!)<br>> <br>> No Problem !<br>> <br>> > First, it seems I do not have the rights to merge my last pull request<br>> > (<a href="https://github.com/qgis/QGIS-Documentation/pull/32" target="_blank">https://github.com/qgis/QGIS-Documentation/pull/32</a>) or I can't see<br>> > where to click...<br>> <br>> Tim is the admin for Github, I asked (email) him to give you commit rights.<br><br>I added Marie to the Github "QGIS Documentation" team. <br><br>> > Then I was wondering if the pre_translate script is running because some<br>> > strings have obviously been updated since the first translation but do<br>> > not appear in the po files (and these parts stay in English in the<br>> > doc...).<br>> <br>> I think it is
(Otto?)<br>> <br>> Maybe I screwed up some files for you. Sorry. Because your first pull <br>> request I could not automatically merge anymore, so I have tried to <br>> merge it here locally via the pre en post scripts.<br>> Maybe I failed :-(<br>> <br>> Another option would be that there is a small change in the sentence? <br>> Maybe the po merge then fails, and falls back to the english version?<br>> <br>> Can you run the scripts locally? Is it working with you there?<br>> Or can you give me an example, so I can have a look here locally?<br><br>Can you please check, if there is some problem, Richard described above?<br>Usually it should work... if not, I will have a look<br><br>> > Do we have to fill the po files header?<br>> <br>> Not sure if it is good for something? If somebody thinks it is good, <br>> please stand up :-)<br>> Otherwise: maybe make it som general qgis header?<br>> <br>> >
There are 2 links for the doc :<br>> > <a href="http://documentation.qgis.org/html/en/user_manual/index.html" target="_blank">http://documentation.qgis.org/html/en/user_manual/index.html</a><br>> > <a href="http://documentation.qgis.org/html/en/docs/user_manual/index.html" target="_blank">http://documentation.qgis.org/html/en/docs/user_manual/index.html</a><br>> > Which one is which?<br>> > (the first link is given in the QGIS-Documentation/readme.rst file)<br>> <br>> These are exactly the same.<br>> The first one is a apache rewrite rule for <a href="http://documentation.qgis.org/" target="_blank">http://documentation.qgis.org</a><br>> <br>> Actually I think (after we filled the web site some more):<br>> <br>> <a href="http://documentation.qgis.org/" target="_blank">http://documentation.qgis.org</a> should point to a page like this:<br>> <a href="http://documentation.qgis.org/html/en/docs/index.html"
target="_blank">http://documentation.qgis.org/html/en/docs/index.html</a><br>> <br>> while<br>> <a href="http://www.qgis.org/" target="_blank">http://www.qgis.org</a> should point to<br>> <a href="http://documentation.qgis.org/html/en/index.html" target="_blank">http://documentation.qgis.org/html/en/index.html</a><br><br>yes, the URL sounds good :)<br><br>> > Finally I have found an error in the en doc (both versions!) :<br>> > <a href="http://documentation.qgis.org/html/en/docs/user_manual/introduction/qgis_gui.html#toolbar" target="_blank">http://documentation.qgis.org/html/en/docs/user_manual/introduction/qgis_gui.html#toolbar</a><br>> > "If you have accidentally hidden all your toolbars, you can get them<br>> > back by choosing menu option /Settings ‣ Toolbars ‣/."<br>> > Should be menu option "View" instead of "Settings".<br>> <br>> You could change it in the english version (that is the rst file
that is <br>> in the sources directory).<br>> BUT be carefull with this. Because the names in the menus are different <br>> for different OS'es. I think what is written is valid for Linux. If it <br>> is different for Windows, we should maybe tell both ways?<br><br>This is not an error, because you View is GNOME and Settings is KDE etc. We<br>mentioned that in the QGIS_GUI section...<br><br>Regards<br>Otto<br>_______________________________________________<br>Qgis-community-team mailing list<br><a ymailto="mailto:Qgis-community-team@lists.osgeo.org" 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><br> </div> </div> </div></body></html>