[Sugar-devel] [PATCH Browse 1/2] .po file updated

[Chris Leonard]

I can resolve the conflict, but yes, Pootle takes care of refreshing
it's local copies of POT templates nightly by cron job.  This can
occasionally lead to a little confusion because it does not
necessarily push the updated POT to Gitorious automatically, although
we do occasionally push the POT to synch them up.

cjl

On Thu, May 3, 2012 at 8:41 PM, Gonzalo Odiard <gonzalo at laptop.org> wrote:
> We don't update the files in the po directory.
> The files are updated by the pootle server.
> If the developers modify these files, we get a git conflict.
> Sorry for not tell you before.
>
> Gonzalo
>
> On Thu, May 3, 2012 at 9:38 PM, Manuel Kaufmann <humitos at gmail.com> wrote:
>>
>> New version of po/Browse.pot created by running "python setup.py
>> genpot"
>>
>> Signed-off-by: Manuel Kaufmann <humitos at gmail.com>
>> ---
>>  po/Browse.pot |  137
>> +++++++++++++++++++++++++++++++-------------------------
>>  1 files changed, 76 insertions(+), 61 deletions(-)
>>
>> diff --git a/po/Browse.pot b/po/Browse.pot
>> index 82bbcda..c12abcd 100644
>> --- a/po/Browse.pot
>> +++ b/po/Browse.pot
>> @@ -8,7 +8,7 @@ msgid ""
>>  msgstr ""
>>  "Project-Id-Version: PACKAGE VERSION\n"
>>  "Report-Msgid-Bugs-To: \n"
>> -"POT-Creation-Date: 2011-08-08 11:21-0500\n"
>> +"POT-Creation-Date: 2012-05-03 21:30-0300\n"
>>  "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
>>  "Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
>>  "Language-Team: LANGUAGE <LL at li.org>\n"
>> @@ -18,139 +18,154 @@ msgstr ""
>>  "Content-Transfer-Encoding: 8bit\n"
>>  "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
>>
>> -#: activity/activity.info:2 webactivity.py:274
>> +#: activity/activity.info:2
>>  msgid "Browse"
>>  msgstr ""
>>
>> -#: linkbutton.py:95
>> +#: browser.py:139
>> +#, python-format
>> +msgid "http://www.google.com/search?q=%s&ie=UTF-8&oe=UTF-8"
>> +msgstr ""
>> +
>> +#: browser.py:358 webactivity.py:397 webtoolbar.py:333
>> +msgid "Untitled"
>> +msgstr ""
>> +
>> +#: linkbutton.py:108
>>  msgid "Remove"
>>  msgstr ""
>>
>> -#: webactivity.py:271
>> -msgid "Edit"
>> +#: edittoolbar.py:65
>> +msgid "Previous"
>>  msgstr ""
>>
>> -#: webactivity.py:277
>> -msgid "View"
>> +#: edittoolbar.py:72
>> +msgid "Next"
>>  msgstr ""
>>
>> -#: webactivity.py:655
>> +#: webactivity.py:567
>>  msgid "Download in progress"
>>  msgid_plural "Downloads in progress"
>>  msgstr[0] ""
>>  msgstr[1] ""
>>
>> -#: webactivity.py:658
>> +#: webactivity.py:570
>>  msgid "Stopping now will erase your download"
>>  msgid_plural "Stopping now will erase your downloads"
>>  msgstr[0] ""
>>  msgstr[1] ""
>>
>> -#: webactivity.py:663
>> +#: webactivity.py:575
>>  msgid "Continue download"
>>  msgid_plural "Continue downloads"
>>  msgstr[0] ""
>>  msgstr[1] ""
>>
>> -#: webactivity.py:667 webtoolbar.py:450
>> +#: webactivity.py:580
>>  msgid "Stop"
>>  msgstr ""
>>
>> -#: webtoolbar.py:259
>> -msgid "Home page"
>> -msgstr ""
>> -
>> -#: webtoolbar.py:281
>> -msgid "Back"
>> -msgstr ""
>> -
>> -#: webtoolbar.py:288
>> -msgid "Forward"
>> +#: downloadmanager.py:102
>> +msgid "Download started"
>>  msgstr ""
>>
>> -#: webtoolbar.py:296
>> -msgid "Add a tab"
>> +#: downloadmanager.py:103 downloadmanager.py:114
>> +#, python-format
>> +msgid "%s"
>>  msgstr ""
>>
>> -#: webtoolbar.py:303
>> -msgid "Bookmark"
>> +#: downloadmanager.py:112
>> +msgid "Download completed"
>>  msgstr ""
>>
>> -#: webtoolbar.py:453
>> -msgid "Reload"
>> +#: downloadmanager.py:117
>> +msgid "Show in Journal"
>>  msgstr ""
>>
>> -#: palettes.py:143
>> -msgid "Keep link"
>> +#: downloadmanager.py:120
>> +msgid "Ok"
>>  msgstr ""
>>
>> -#: palettes.py:151
>> -msgid "Copy link"
>> +#: downloadmanager.py:128 pdfviewer.py:408
>> +#, python-format
>> +msgid "From: %s"
>>  msgstr ""
>>
>> -#: palettes.py:159
>> -msgid "Follow link"
>> +#: downloadmanager.py:203
>> +#, python-format
>> +msgid ""
>> +"Downloading %(filename)s from \n"
>> +"%(source)s."
>>  msgstr ""
>>
>> -#: palettes.py:209
>> -msgid "Keep image"
>> +#: webtoolbar.py:248
>> +msgid "Home page"
>>  msgstr ""
>>
>> -#: palettes.py:217
>> -msgid "Copy image"
>> +#: webtoolbar.py:268
>> +msgid "Back"
>>  msgstr ""
>>
>> -#: edittoolbar.py:92
>> -msgid "Previous"
>> +#: webtoolbar.py:282
>> +msgid "Forward"
>>  msgstr ""
>>
>> -#: edittoolbar.py:99
>> -msgid "Next"
>> +#: webtoolbar.py:296
>> +msgid "Bookmark"
>>  msgstr ""
>>
>> -#: viewtoolbar.py:34
>> +#: viewtoolbar.py:39 pdfviewer.py:87
>>  msgid "Zoom out"
>>  msgstr ""
>>
>> -#: viewtoolbar.py:40
>> +#: viewtoolbar.py:45 pdfviewer.py:93
>>  msgid "Zoom in"
>>  msgstr ""
>>
>> -#: viewtoolbar.py:51
>> +#: viewtoolbar.py:56
>>  msgid "Fullscreen"
>>  msgstr ""
>>
>> -#: viewtoolbar.py:89
>> +#: viewtoolbar.py:113
>>  msgid "Show Tray"
>>  msgstr ""
>>
>> -#: viewtoolbar.py:93
>> +#: viewtoolbar.py:117
>>  msgid "Hide Tray"
>>  msgstr ""
>>
>> -#: downloadmanager.py:175
>> -msgid "Download started"
>> +#: pdfviewer.py:104
>> +msgid "Previous page"
>>  msgstr ""
>>
>> -#: downloadmanager.py:190
>> -msgid "Download completed"
>> +#: pdfviewer.py:111
>> +msgid "Next page"
>>  msgstr ""
>>
>> -#: downloadmanager.py:194
>> -msgid "Show in Journal"
>> +#: pdfviewer.py:123
>> +msgid "Save PDF to Journal"
>>  msgstr ""
>>
>> -#: downloadmanager.py:197
>> -msgid "Ok"
>> +#: palettes.py:140
>> +msgid "Follow link"
>>  msgstr ""
>>
>> -#: downloadmanager.py:204
>> -#, python-format
>> -msgid "From: %s"
>> +#: palettes.py:145
>> +msgid "Follow link in new tab"
>>  msgstr ""
>>
>> -#: downloadmanager.py:346
>> -msgid ""
>> -"Downloading %2$s from \n"
>> -"%1$s."
>> +#: palettes.py:151
>> +msgid "Keep link"
>> +msgstr ""
>> +
>> +#: palettes.py:159
>> +msgid "Copy link"
>> +msgstr ""
>> +
>> +#: palettes.py:215
>> +msgid "Keep image"
>> +msgstr ""
>> +
>> +#: palettes.py:223
>> +msgid "Copy image"
>>  msgstr ""
>> --
>> 1.7.7.6
>>
>> _______________________________________________
>> Sugar-devel mailing list
>> Sugar-devel at lists.sugarlabs.org
>> http://lists.sugarlabs.org/listinfo/sugar-devel
>
>
>
> _______________________________________________
> Sugar-devel mailing list
> Sugar-devel at lists.sugarlabs.org
> http://lists.sugarlabs.org/listinfo/sugar-devel
>