diff --git a/AUTHORS.txt b/AUTHORS.txt index e5227529..926c98c7 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,5 +1,5 @@ - 364 Justin Quick 72.1% - 25 Chris Beaven 5.0% + 365 Justin Quick 72.1% + 25 Chris Beaven 4.9% 6 Deepak Prakash 1.2% 6 Ben Slavin 1.2% 5 jordan 1.0% diff --git a/Makefile b/Makefile index b4d7138c..c7d98adf 100644 --- a/Makefile +++ b/Makefile @@ -10,7 +10,9 @@ docs: sphinx-build -W -b html docs/source docs/build/html sphinx-build -W -b linkcheck docs/source docs/build/html -dist: - python setup.py sdist && echo "OK?" && read +authors: + git summary | awk '{if(NR>7)print}' > AUTHORS.txt -.PHONY: clean messages docs dist +all: clean authors messages docs + +.PHONY: all diff --git a/actstream/locale/en/LC_MESSAGES/django.mo b/actstream/locale/en/LC_MESSAGES/django.mo index b9378484..de1eb793 100644 Binary files a/actstream/locale/en/LC_MESSAGES/django.mo and b/actstream/locale/en/LC_MESSAGES/django.mo differ diff --git a/actstream/locale/en/LC_MESSAGES/django.po b/actstream/locale/en/LC_MESSAGES/django.po index f20ec4ab..ac03f461 100644 --- a/actstream/locale/en/LC_MESSAGES/django.po +++ b/actstream/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: 2014-09-03 13:51-0700\n" +"POT-Creation-Date: 2015-06-15 02:56-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -25,22 +25,22 @@ msgstr "" msgid "stopped following" msgstr "" -#: models.py:112 +#: models.py:115 #, python-format msgid "%(actor)s %(verb)s %(action_object)s on %(target)s %(timesince)s ago" msgstr "" -#: models.py:113 +#: models.py:116 #, python-format msgid "%(actor)s %(verb)s %(target)s %(timesince)s ago" msgstr "" -#: models.py:115 +#: models.py:118 #, python-format msgid "%(actor)s %(verb)s %(action_object)s %(timesince)s ago" msgstr "" -#: models.py:116 +#: models.py:119 #, python-format msgid "%(actor)s %(verb)s %(timesince)s ago" msgstr "" @@ -49,19 +49,19 @@ msgstr "" msgid "ago" msgstr "" -#: templates/actstream/actor.html:25 +#: templates/actstream/actor.html:24 msgid "UNFOLLOW" msgstr "" -#: templates/actstream/actor.html:26 +#: templates/actstream/actor.html:25 msgid "FOLLOW" msgstr "" -#: templates/actstream/actor.html:33 +#: templates/actstream/actor.html:32 msgid "View my actions" msgstr "" -#: templates/actstream/actor.html:39 +#: templates/actstream/actor.html:38 msgid "No actions yet" msgstr "" @@ -80,6 +80,6 @@ msgstr "" msgid "Actors that %(user)s follows" msgstr "" -#: tests/test_activity.py:191 +#: tests/test_activity.py:202 msgid "English" msgstr ""