From 160793af9a4885b27ba678d9344d9fcdcd243e47 Mon Sep 17 00:00:00 2001 From: Benjamin Bach Date: Sun, 5 Aug 2018 14:47:57 +0200 Subject: [PATCH] Run compilemessages just before pushing to Transfix + update source django.po --- Makefile | 4 +- src/wiki/locale/en/LC_MESSAGES/django.po | 180 ++++++++++------------- 2 files changed, 79 insertions(+), 105 deletions(-) diff --git a/Makefile b/Makefile index 53d780e7..408f5558 100644 --- a/Makefile +++ b/Makefile @@ -60,7 +60,9 @@ coverage: ## Generate test coverage report coverage run --source wiki setup.py test coverage report -m -translation-push: ## Pushes translation sources +translation-push: ## Updates and pushes + cd src/wiki && django-admin makemessages -l en + cd .. tx push -s translation-pull: ## Pulls translation languages diff --git a/src/wiki/locale/en/LC_MESSAGES/django.po b/src/wiki/locale/en/LC_MESSAGES/django.po index 48f6c1d1..2902aadd 100644 --- a/src/wiki/locale/en/LC_MESSAGES/django.po +++ b/src/wiki/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-07-26 16:02+0200\n" +"POT-Creation-Date: 2018-08-05 14:47+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,8 +25,8 @@ msgstr "" msgid "Wiki" msgstr "" -#: conf/settings.py:50 -msgid "Table of Contents" +#: conf/settings.py:63 forms.py:198 forms.py:342 +msgid "Contents" msgstr "" #: core/plugins/base.py:63 @@ -115,10 +115,6 @@ msgstr "" msgid "Create a redirect page for every moved article?" msgstr "" -#: forms.py:198 forms.py:342 -msgid "Contents" -msgstr "" - #: forms.py:203 forms.py:347 msgctxt "Revision comment" msgid "Summary" @@ -330,52 +326,52 @@ msgstr "" msgid "others write access" msgstr "" -#: models/article.py:178 +#: models/article.py:179 #, python-format msgid "Article without content (%(id)d)" msgstr "" -#: models/article.py:183 +#: models/article.py:184 msgid "Can edit all articles and lock/unlock/restore" msgstr "" -#: models/article.py:184 +#: models/article.py:185 msgid "Can change ownership of any article" msgstr "" -#: models/article.py:185 +#: models/article.py:186 msgid "Can assign permissions to other users" msgstr "" -#: models/article.py:260 +#: models/article.py:261 msgid "content type" msgstr "" -#: models/article.py:262 +#: models/article.py:263 msgid "object ID" msgstr "" -#: models/article.py:271 +#: models/article.py:272 msgid "Article for object" msgstr "" -#: models/article.py:272 +#: models/article.py:273 msgid "Articles for object" msgstr "" -#: models/article.py:284 +#: models/article.py:285 msgid "revision number" msgstr "" -#: models/article.py:290 +#: models/article.py:291 msgid "IP address" msgstr "" -#: models/article.py:294 +#: models/article.py:295 msgid "user" msgstr "" -#: models/article.py:309 +#: models/article.py:310 #: plugins/attachments/templates/wiki/plugins/attachments/history.html:23 #: plugins/attachments/templates/wiki/plugins/attachments/index.html:25 #: plugins/attachments/templates/wiki/plugins/attachments/search.html:44 @@ -384,25 +380,25 @@ msgstr "" msgid "deleted" msgstr "" -#: models/article.py:313 +#: models/article.py:314 #: plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html:74 #: templates/wiki/article.html:23 templates/wiki/includes/revision_info.html:21 msgid "locked" msgstr "" -#: models/article.py:351 models/pluginbase.py:44 models/urlpath.py:56 +#: models/article.py:352 models/pluginbase.py:44 models/urlpath.py:56 msgid "article" msgstr "" -#: models/article.py:354 +#: models/article.py:355 msgid "article contents" msgstr "" -#: models/article.py:359 +#: models/article.py:360 msgid "article title" msgstr "" -#: models/article.py:362 +#: models/article.py:363 msgid "" "Each revision contains a title field that must be filled out, even if the " "title has not changed" @@ -609,10 +605,8 @@ msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/delete.html:40 msgid "" -"\n" -" You can remove a reference to a file, but it will retain its references " -"on other articles.\n" -" " +"You can remove a reference to a file, but it will retain its references on " +"other articles." msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/delete.html:55 @@ -680,12 +674,9 @@ msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/index.html:11 msgid "" -"\n" -" Complete markdown code syntax: [attachment:id title:\"text\" " -"size]
\n" -"   title: Link text replacement for the file name.\n" -" size: Show file size after the title.\n" -" " +"Complete markdown code syntax: [attachment:id title:\"text\" size]
  title: Link text replacement for the file name. size: " +"Show file size after the title." msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/index.html:32 @@ -771,33 +762,26 @@ msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/replace.html:12 #, python-format msgid "" -"\n" -" Replacing an attachment means adding a new file that will be used in its " +"Replacing an attachment means adding a new file that will be used in its " "place. All references to the file will be replaced by the one you upload and " "the file will be downloaded as %(filename)s. Please note " "that this attachment is in use on other articles, you may distort contents. " "However, do not hestitate to take advantage of this and make replacements " "for the listed articles where necessary. This way of working is more " -"efficient....\n" -" " +"efficient...." msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/replace.html:17 #, python-format -msgid "" -"\n" -" Articles using %(filename)s\n" -" " +msgid "Articles using %(filename)s" msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/replace.html:26 #, python-format msgid "" -"\n" -" Replacing an attachment means adding a new file that will be used in its " +"Replacing an attachment means adding a new file that will be used in its " "place. All references to the file will be replaced by the one you upload and " -"the file will be downloaded as %(filename)s.\n" -" " +"the file will be downloaded as %(filename)s." msgstr "" #: plugins/attachments/templates/wiki/plugins/attachments/replace.html:43 @@ -903,14 +887,8 @@ msgstr "" #: plugins/globalhistory/templates/wiki/plugins/globalhistory/globalhistory.html:14 #, python-format -msgid "" -"\n" -" List of %(cnt)s change in the wiki.\n" -" " -msgid_plural "" -"\n" -" List of %(cnt)s changes in the wiki.\n" -" " +msgid "List of %(cnt)s change in the wiki." +msgid_plural "List of %(cnt)s changes in the wiki." msgstr[0] "" msgstr[1] "" @@ -1263,31 +1241,31 @@ msgstr "" msgid "Wiki macros" msgstr "" -#: plugins/macros/mdx/macro.py:79 +#: plugins/macros/mdx/macro.py:67 msgid "Article list" msgstr "" -#: plugins/macros/mdx/macro.py:80 +#: plugins/macros/mdx/macro.py:68 msgid "Insert a list of articles in this level." msgstr "" -#: plugins/macros/mdx/macro.py:82 +#: plugins/macros/mdx/macro.py:70 msgid "Maximum depth to show levels for." msgstr "" -#: plugins/macros/mdx/macro.py:88 +#: plugins/macros/mdx/macro.py:76 msgid "Table of contents" msgstr "" -#: plugins/macros/mdx/macro.py:89 +#: plugins/macros/mdx/macro.py:77 msgid "Insert a table of contents matching the headings." msgstr "" -#: plugins/macros/mdx/macro.py:97 +#: plugins/macros/mdx/macro.py:85 msgid "WikiLinks" msgstr "" -#: plugins/macros/mdx/macro.py:99 +#: plugins/macros/mdx/macro.py:87 msgid "Insert a link to another wiki page with a short notation." msgstr "" @@ -1299,7 +1277,7 @@ msgstr "" msgid "Nothing below this level" msgstr "" -#: plugins/macros/wiki_plugin.py:14 +#: plugins/macros/wiki_plugin.py:11 msgid "Macros" msgstr "" @@ -1430,6 +1408,10 @@ msgstr "" msgid "You will receive notifications %(interval)s for %(articles)d articles" msgstr "" +#: plugins/redlinks/apps.py:7 +msgid "Wiki red links" +msgstr "" + #: templates/wiki/accounts/account_settings.html:4 #: templates/wiki/accounts/account_settings.html:7 #: templates/wiki/base_site.html:79 @@ -1638,11 +1620,9 @@ msgstr "" #: templates/wiki/dir.html:40 #, python-format msgid "" -"\n" -" Browsing /%(path)s. " -"There %(articles_plur_verb)s %(cnt)s %(articles_plur)s in " -"this level.\n" -" " +"Browsing /%(path)s. There " +"%(articles_plur_verb)s %(cnt)s %(articles_plur)s in this " +"level." msgstr "" #: templates/wiki/dir.html:50 templates/wiki/search.html:36 @@ -1760,10 +1740,8 @@ msgstr "" #: templates/wiki/includes/anonymous_blocked.html:7 #, python-format msgid "" -"\n" -" You need to log in or sign up to use this function.\n" -" " +"You need to log in or sign up to use this function." msgstr "" #: templates/wiki/includes/anonymous_blocked.html:11 @@ -1820,17 +1798,11 @@ msgstr "" #: templates/wiki/move.html:23 #, python-format msgid "" -"\n" -" %(cnt)s nested article will also be moved.
\n" -" Be careful, links to this article and %(cnt)s article nested\n" -" in this hierarchy will not be updated.\n" -" " +"%(cnt)s nested article will also be moved.
Be careful, links to this " +"article and %(cnt)s article nested in this hierarchy will not be updated." msgid_plural "" -"\n" -" %(cnt)s nested articles will also be moved.
\n" -" Be careful, links to this article and %(cnt)s articles nested\n" -" in this hierarchy will not be updated.\n" -" " +"%(cnt)s nested articles will also be moved.
Be careful, links to this " +"article and %(cnt)s articles nested in this hierarchy will not be updated." msgstr[0] "" msgstr[1] "" @@ -1862,7 +1834,7 @@ msgstr "" msgid "and" msgstr "" -#: templates/wiki/preview_inline.html:22 views/article.py:922 +#: templates/wiki/preview_inline.html:22 views/article.py:924 msgid "You cannot merge with a deleted revision" msgstr "" @@ -1948,107 +1920,107 @@ msgstr "" msgid "Account info saved!" msgstr "" -#: views/article.py:89 +#: views/article.py:90 #, python-format msgid "New article '%s' created." msgstr "" -#: views/article.py:97 +#: views/article.py:98 #, python-format msgid "There was an error creating this article: %s" msgstr "" -#: views/article.py:100 +#: views/article.py:101 msgid "There was an error creating this article." msgstr "" -#: views/article.py:190 +#: views/article.py:191 msgid "" "This article cannot be deleted because it has children or is a root article." msgstr "" -#: views/article.py:200 +#: views/article.py:201 msgid "" "This article together with all its contents are now completely gone! Thanks!" msgstr "" -#: views/article.py:209 +#: views/article.py:210 #, python-format msgid "" "The article \"%s\" is now marked as deleted! Thanks for keeping the site " "free from unwanted material!" msgstr "" -#: views/article.py:321 +#: views/article.py:322 msgid "Your changes were saved." msgstr "" -#: views/article.py:335 +#: views/article.py:336 msgid "Please note that your article text has not yet been saved!" msgstr "" -#: views/article.py:366 +#: views/article.py:367 msgid "A new revision of the article was successfully added." msgstr "" -#: views/article.py:415 +#: views/article.py:416 msgid "This article cannot be moved because it is a root article." msgstr "" -#: views/article.py:429 +#: views/article.py:430 msgid "This article cannot be moved to a child of itself." msgstr "" -#: views/article.py:482 +#: views/article.py:483 #, python-brace-format msgid "Moved: {title}" msgstr "" -#: views/article.py:483 +#: views/article.py:484 #, python-brace-format msgid "Article moved to {link}" msgstr "" -#: views/article.py:484 +#: views/article.py:485 msgid "Created redirect (auto)" msgstr "" -#: views/article.py:492 +#: views/article.py:493 #, python-brace-format msgid "Article successfully moved! Created {n} redirect." msgid_plural "Article successfully moved! Created {n} redirects." msgstr[0] "" msgstr[1] "" -#: views/article.py:501 +#: views/article.py:502 msgid "Article successfully moved!" msgstr "" -#: views/article.py:543 +#: views/article.py:544 msgid "Restoring article" msgstr "" -#: views/article.py:547 +#: views/article.py:548 #, python-format msgid "The article \"%s\" and its children are now restored." msgstr "" -#: views/article.py:815 +#: views/article.py:816 #, python-format msgid "" "The article %(title)s is now set to display revision #%(revision_number)d" msgstr "" -#: views/article.py:888 +#: views/article.py:890 msgid "New title" msgstr "" -#: views/article.py:935 +#: views/article.py:937 #, python-format msgid "Merge between revision #%(r1)d and revision #%(r2)d" msgstr "" -#: views/article.py:946 +#: views/article.py:948 #, python-format msgid "" "A new revision was created: Merge between revision #%(r1)d and revision #" -- 2.45.2