diff --git a/src/apps/core/forms.py b/src/apps/core/forms.py index 0f5a1ea..49eb817 100644 --- a/src/apps/core/forms.py +++ b/src/apps/core/forms.py @@ -67,6 +67,16 @@ def __init__(self, *args, **kwargs): ]) ) self.helper.layout.append(Submit('save', _('Create'))) + self.fields['name'] = forms.CharField() + self.fields['content'] = forms.CharField(widget=MarkdownWidget()) + self.fields['summary'] = forms.CharField() + self.fields['description'] = forms.CharField(widget=MarkdownWidget()) + self.fields['reason'] = forms.CharField(widget=MarkdownWidget()) + self.fields['objective'] = forms.CharField(widget=MarkdownWidget()) + self.fields['situation'] = forms.CharField(widget=MarkdownWidget()) + self.fields['deliverable'] = forms.CharField(widget=MarkdownWidget()) + self.fields['investables'] = forms.CharField() + self.fields['deliverables'] = forms.CharField() class Meta: model = Translation @@ -81,7 +91,7 @@ def __init__(self, *args, **kwargs): self.helper.layout.append(Submit('save', _('Update'))) self.fields['name'] = forms.CharField() self.fields['content'] = forms.CharField(widget=MarkdownWidget()) - self.fields['summary'] = forms.CharField(widget=MarkdownWidget()) + self.fields['summary'] = forms.CharField() self.fields['description'] = forms.CharField(widget=MarkdownWidget()) self.fields['reason'] = forms.CharField(widget=MarkdownWidget()) self.fields['objective'] = forms.CharField(widget=MarkdownWidget()) @@ -243,6 +253,7 @@ def __init__(self, *args, **kwargs): self.helper.layout.append(Submit('save', _('Update'))) self.fields['name'].label = 'Description' + self.fields['name'].widget.attrs['readonly'] = True self.fields['language'] = forms.ModelChoiceField( widget=ModelSelect2Widget( @@ -260,6 +271,7 @@ def __init__(self, *args, **kwargs): queryset=User.objects.all(), required=False) self.fields['language'].label = _('Input Language (the language you used to compose this post) ') + self.fields['content'].widget.attrs['readonly'] = True class Meta: model = Need @@ -350,6 +362,10 @@ def __init__(self, *args, **kwargs): self.fields['is_historical'].label = _('This is a history (check if you are documenting a problem of the past)') self.initial['personal'] = True + if need_instance: + self.initial['sharewith'] = need_instance.sharewith.all + self.initial['personal'] = need_instance.personal + try: language = Language.objects.get(language_code=request.LANGUAGE_CODE) self.initial['language'] = language @@ -388,6 +404,7 @@ def __init__(self, *args, **kwargs): self.helper.layout.append(Submit('save', _('Update'))) self.fields['name'].label = 'Description' + self.fields['name'].widget.attrs['readonly'] = True self.fields['need'] = forms.ModelChoiceField(queryset=Need.objects.all()) self.fields['type'] = forms.ModelChoiceField( @@ -428,6 +445,7 @@ def __init__(self, *args, **kwargs): self.fields['url'].label = _('Origin: (of the source)') self.fields['url'].widget.attrs.update({'placeholder': _('http://')}) self.fields['is_historical'].label = _('This is a history (check if you are documenting a problem of the past)') + self.fields['reason'].widget.attrs['readonly'] = True class Meta: model = Goal @@ -487,6 +505,8 @@ def __init__(self, *args, **kwargs): self.fields['url'].label = _('Origin: (of the source)') self.fields['url'].widget.attrs.update({'placeholder': _('http://')}) self.fields['is_historical'].label = _('This is a history (check if you are documenting a historical work)') + self.fields['name'].widget.attrs['readonly'] = True + self.fields['description'].widget.attrs['readonly'] = True class Meta: model = Work @@ -515,6 +535,7 @@ class Meta: class WorkCreateForm(forms.ModelForm): def __init__(self, *args, **kwargs): + task_instance = kwargs.pop('task_instance') request = kwargs.pop('request') super(WorkCreateForm, self).__init__(*args, **kwargs) @@ -554,6 +575,10 @@ def __init__(self, *args, **kwargs): self.fields['is_historical'].label = _('This is a history (check if you are documenting a historical work)') self.initial['personal'] = True + if task_instance: + self.initial['sharewith'] = task_instance.sharewith.all + self.initial['personal'] = task_instance.personal + try: language = Language.objects.get(language_code=request.LANGUAGE_CODE) self.initial['language'] = language @@ -622,6 +647,9 @@ def __init__(self, *args, **kwargs): self.fields['url'].label = _('Origin: (of the source)') self.fields['url'].widget.attrs.update({'placeholder': _('http://')}) self.fields['is_historical'].label = _('This is a history (check if you are documenting an idea of the past)') + self.fields['name'].widget.attrs['readonly'] = True + self.fields['summary'].widget.attrs['readonly'] = True + self.fields['description'].widget.attrs['readonly'] = True class Meta: model = Idea @@ -701,6 +729,10 @@ def __init__(self, *args, **kwargs): self.fields['is_historical'].label = _('This is a history (check if you are documenting an idea of the past)') self.initial['personal'] = True + if goal_instance: + self.initial['sharewith'] = goal_instance.sharewith.all + self.initial['personal'] = goal_instance.personal + try: language = Language.objects.get(language_code=request.LANGUAGE_CODE) self.initial['language'] = language @@ -763,6 +795,8 @@ def __init__(self, *args, **kwargs): self.fields['url'].label = _('Origin: (of the source)') self.fields['url'].widget.attrs.update({'placeholder': _('http://')}) self.fields['is_historical'].label = _('This is a history (check if you are documenting a milestone of the past)') + self.fields['name'].widget.attrs['readonly'] = True + self.fields['objective'].widget.attrs['readonly'] = True class Meta: model = Step @@ -793,6 +827,7 @@ class Meta: class StepCreateForm(forms.ModelForm): def __init__(self, *args, **kwargs): + plan_instance = kwargs.pop('plan_instance') request = kwargs.pop('request') super(StepCreateForm, self).__init__(*args, **kwargs) @@ -830,6 +865,10 @@ def __init__(self, *args, **kwargs): self.fields['is_historical'].label = _('This is a history (check if you are documenting a milestone of the past)') self.initial['personal'] = True + if plan_instance: + self.initial['sharewith'] = plan_instance.sharewith.all + self.initial['personal'] = plan_instance.personal + try: language = Language.objects.get(language_code=request.LANGUAGE_CODE) self.initial['language'] = language @@ -896,6 +935,8 @@ def __init__(self, *args, **kwargs): self.fields['url'].label = _('Origin: (of the source)') self.fields['url'].widget.attrs.update({'placeholder': _('http://')}) self.fields['is_historical'].label = _('This is a history (check if you are documenting a historical task)') + self.fields['name'].widget.attrs['readonly'] = True + self.fields['description'].widget.attrs['readonly'] = True class Meta: model = Task @@ -921,6 +962,7 @@ class Meta: class TaskCreateForm(forms.ModelForm): def __init__(self, *args, **kwargs): + step_instance = kwargs.pop('step_instance') request = kwargs.pop('request') super(TaskCreateForm, self).__init__(*args, **kwargs) @@ -952,6 +994,10 @@ def __init__(self, *args, **kwargs): self.fields['is_historical'].label = _('This is a history (check if you are documenting a historical task)') self.initial['personal'] = True + if step_instance: + self.initial['sharewith'] = step_instance.sharewith.all + self.initial['personal'] = step_instance.personal + try: language = Language.objects.get(language_code=request.LANGUAGE_CODE) self.initial['language'] = language @@ -1130,6 +1176,9 @@ def __init__(self, *args, **kwargs): self.fields['url'].label = _('Origin: (of the source)') self.fields['url'].widget.attrs.update({'placeholder': _('http://')}) self.fields['is_historical'].label = _('This is a history (check if you are documenting a project of the past)') + self.fields['name'].widget.attrs['readonly'] = True + self.fields['situation'].widget.attrs['readonly'] = True + self.fields['deliverable'].widget.attrs['readonly'] = True class Meta: @@ -1238,6 +1287,10 @@ def __init__(self, *args, **kwargs): #self.fields['plain_equity'].label = _('Plain equity') self.initial['personal'] = True + if idea_instance: + self.initial['sharewith'] = idea_instance.sharewith.all + self.initial['personal'] = idea_instance.personal + try: language = Language.objects.get(language_code=request.LANGUAGE_CODE) self.initial['language'] = language diff --git a/src/apps/core/management/commands/update_content_lang_m2m.py b/src/apps/core/management/commands/update_content_lang_m2m.py new file mode 100644 index 0000000..b0a28a4 --- /dev/null +++ b/src/apps/core/management/commands/update_content_lang_m2m.py @@ -0,0 +1,36 @@ +from django.core.management import BaseCommand +from django.contrib.contenttypes.models import ContentType + +from core.models import Translation +from core.models import Need, Goal, Idea, Plan, Step, Task, Work +from core.models import Language + +class Command(BaseCommand): + help = 'update BaseContentModel.lang based on existing translations for each of content item' + + + def handle(self, *args, **options): + content_types = ContentType.objects.get_for_models(Need, Goal, Idea, Plan, Step, Task, Work) + + for model, content_type in content_types.items(): + for instance in model.objects.all(): + + translations = Translation.objects.filter( + content_type=content_type, + object_id=instance.pk + ) + + tr_languages = [translation.language + for translation in translations] + + # add translations + if translations: + for translation in translations: + instance.lang.add(translation.language) + + # remove translations + for language in instance.lang.all(): + if language not in tr_languages: + instance.lang.remove(language) + + instance.save() diff --git a/src/apps/core/migrations/0023_auto_20160115_1150.py b/src/apps/core/migrations/0023_auto_20160115_1150.py new file mode 100644 index 0000000..1ecb26c --- /dev/null +++ b/src/apps/core/migrations/0023_auto_20160115_1150.py @@ -0,0 +1,50 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-01-15 19:50 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0022_auto_20160102_0830'), + ] + + operations = [ + migrations.AddField( + model_name='goal', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_goal_lang_+', to='core.Language'), + ), + migrations.AddField( + model_name='idea', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_idea_lang_+', to='core.Language'), + ), + migrations.AddField( + model_name='need', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_need_lang_+', to='core.Language'), + ), + migrations.AddField( + model_name='plan', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_plan_lang_+', to='core.Language'), + ), + migrations.AddField( + model_name='step', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_step_lang_+', to='core.Language'), + ), + migrations.AddField( + model_name='task', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_task_lang_+', to='core.Language'), + ), + migrations.AddField( + model_name='work', + name='lang', + field=models.ManyToManyField(blank=True, related_name='_work_lang_+', to='core.Language'), + ), + ] diff --git a/src/apps/core/migrations/0024_auto_20160117_0139.py b/src/apps/core/migrations/0024_auto_20160117_0139.py new file mode 100644 index 0000000..d95d4fe --- /dev/null +++ b/src/apps/core/migrations/0024_auto_20160117_0139.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.1 on 2016-01-17 09:39 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('core', '0023_auto_20160115_1150'), + ] + + operations = [ + migrations.AlterField( + model_name='language', + name='language_code', + field=models.CharField(max_length=8), + ), + ] diff --git a/src/apps/core/models/core.py b/src/apps/core/models/core.py index 8aeb234..7cda8c2 100644 --- a/src/apps/core/models/core.py +++ b/src/apps/core/models/core.py @@ -7,8 +7,11 @@ from django.conf import settings from django_markdown.models import MarkdownField from django.db.models.signals import post_save +from django.db.models.signals import post_delete from hours.models import HourValue from ..signals import _content_type_post_save +from ..signals import _translation_post_save +from ..signals import _translation_post_delete class BaseContentModel(models.Model): @@ -85,6 +88,12 @@ class BaseContentModel(models.Model): null=True, ) + lang = models.ManyToManyField( + 'Language', + blank=True, + related_name='+', + ) + total_donated = models.DecimalField( default=0., decimal_places=8, @@ -731,7 +740,7 @@ class Language(models.Model): http_accept_language = models.CharField(max_length=255, blank=True, null=True) omegawiki_language_id = models.PositiveIntegerField(null=True, blank=True) - language_code = models.CharField(max_length=5) + language_code = models.CharField(max_length=8) def __unicode__(self): try: @@ -746,3 +755,5 @@ def __unicode__(self): post_save.connect(_content_type_post_save, sender=Step) post_save.connect(_content_type_post_save, sender=Task) post_save.connect(_content_type_post_save, sender=Work) +post_save.connect(_translation_post_save, sender=Translation) +post_delete.connect(_translation_post_delete, sender=Translation) diff --git a/src/apps/core/signals.py b/src/apps/core/signals.py index c8aa5ae..6352550 100644 --- a/src/apps/core/signals.py +++ b/src/apps/core/signals.py @@ -1,3 +1,26 @@ +def _translation_post_save(sender, instance, created, *args, **kwargs): + """ + Do after translation save + """ + # Copy fields to parent content object, if language match + if instance.language == instance.content_object.language: + ignored_fields = ['language', 'language_id', 'id'] + for field in instance._meta.get_all_field_names(): + if field in instance.content_object._meta.get_all_field_names(): + if field in ignored_fields: + continue + if getattr(instance.content_object, field) != getattr(instance, field): + setattr(instance.content_object, field, getattr(instance, field)) + + # Save the translation language to object itself for faster filtering + instance.content_object.lang.add(instance.language) + instance.content_object.save() + +def _translation_post_delete(sender, instance, *args, **kwargs): + # Remove the translation language upon deletion of translation + instance.content_object.lang.remove(instance.language) + instance.content_object.save() + def _content_type_post_save(sender, instance, created, *args, **kwargs): """ Create default translation @@ -26,12 +49,3 @@ def _content_type_post_save(sender, instance, created, *args, **kwargs): setattr(translation, field, getattr(instance, field)) translation.save() - else: - translations = Translation.objects.filter( - content_type=content_type, object_id=instance.id - ) - - if translations.count == 1: - for field in fields: - setattr(translations[0], field, getattr(instance, field)) - translations[0].save() diff --git a/src/apps/core/templates/definition/detail.html b/src/apps/core/templates/definition/detail.html index 0479f28..35191dd 100644 --- a/src/apps/core/templates/definition/detail.html +++ b/src/apps/core/templates/definition/detail.html @@ -2,6 +2,7 @@ {% load i18n %} {% load crispy_forms_tags %} +{% load django_markdown %} {% block title %}n: {{object.name}}{% endblock title %} @@ -51,11 +52,27 @@

Definition: {{object.definition}}

{% for object in need_list %} {% endfor %} diff --git a/src/apps/core/templates/goal/detail.html b/src/apps/core/templates/goal/detail.html index 9f758f1..85fa18d 100644 --- a/src/apps/core/templates/goal/detail.html +++ b/src/apps/core/templates/goal/detail.html @@ -66,7 +66,17 @@ --> - {% trans "category:" %} {{ object.type }}{% if object.need %}, {% trans "related need:" %} {{object.need }}{% endif %}
+ {% trans "category:" %} {{ object.type }}{% if object.need %}, {% trans "related need:" %} + {% if object.need.personal %} + {% if request.user in object.need.sharewith or request.user == object.need.user %} + {{ object.need }} + {% else %} + {% trans "private" %} {% trans "need" %} (by {{ object.need.user.username }}) + {% endif %} + {% else %} + {{ object.need }} + {% endif %} + {% endif %}
{% trans "translations:" %} {% for translation in translations %} @@ -110,11 +120,26 @@

{% if not translation %}{{object.name}}{% else %} {{ translation.name }} {% {% for object in idea_list %} {% endfor %} diff --git a/src/apps/core/templates/idea/detail.html b/src/apps/core/templates/idea/detail.html index 4ad5e0a..05b6e93 100644 --- a/src/apps/core/templates/idea/detail.html +++ b/src/apps/core/templates/idea/detail.html @@ -69,7 +69,19 @@ {% for goal in object.goal.all %} -{% trans "want:" %} {{ goal }} +{% trans "want:" %} + + {% if goal.personal %} + {% if request.user in goal.sharewith or request.user == goal.user %} + {{goal}} + {% else %} + {% trans "private" %} {% trans "goal" %} (by {{ goal.user.username }}) + {% endif %} + {% else %} + {{goal}} + {% endif %} + + {% endfor %}
{% trans "translations:" %} @@ -115,11 +127,26 @@

{% if not translation %}{{ object.summary }}{% else {% for object in plan_list %} {% endfor %} diff --git a/src/apps/core/templates/need/detail.html b/src/apps/core/templates/need/detail.html index 6d3c54a..97501c9 100644 --- a/src/apps/core/templates/need/detail.html +++ b/src/apps/core/templates/need/detail.html @@ -109,11 +109,27 @@

{% if not translation %}{{object.name}}{% else %} {{ translation.name }} {% {% for object in goal_list %} {% endfor %} diff --git a/src/apps/core/templates/plan/detail.html b/src/apps/core/templates/plan/detail.html index 973f047..43637a7 100644 --- a/src/apps/core/templates/plan/detail.html +++ b/src/apps/core/templates/plan/detail.html @@ -83,7 +83,19 @@ - {% trans "approach to realizing idea" %} {{object.idea }}
+ {% trans "approach to realizing idea" %} + + {% if object.idea.personal %} + {% if request.user in object.idea.sharewith or request.user == object.idea.user %} + {{ object.idea }} + {% else %} + {% trans "private" %} {% trans "idea" %} (by {{ object.idea.user.username }}) + {% endif %} + {% else %} + {{ object.idea }} + {% endif %} + +
{% trans "translations:" %} {% for translation in translations %} @@ -135,8 +147,24 @@

{% if not translation %}{{ object.name }}{% else %}{{ translation.name}}{% e {% if step.is_link %} {% trans "link" %} {% endif %} - [{{step.not_funded_hours|floatformat:1}} h] {{step.name}} -

{{step.objective|markdown|truncatewords_html:35}}

+ {% if step.personal %} + {% if user.is_anonymous %} + + {% else %} + + {% endif %} + {% if request.user in object.sharewith or request.user == step.user %} + [{{step.not_funded_hours|floatformat:1}} h] {{step.name}} +

{{step.objective|markdown|truncatewords_html:35}}

+ {% else %} + {% trans "Private" %} {% trans "step" %}. +

{% trans "Request access:" %} [{{step.user.username}}]

+ {% endif %} + {% else %} + [{{step.not_funded_hours|floatformat:1}} h] {{step.name}} +

{{step.objective|markdown|truncatewords_html:35}}

+ {% endif %} + {% endfor %} diff --git a/src/apps/core/templates/step/detail.html b/src/apps/core/templates/step/detail.html index 7312777..aedb8ed 100644 --- a/src/apps/core/templates/step/detail.html +++ b/src/apps/core/templates/step/detail.html @@ -35,7 +35,19 @@
[needs ${{ object.get_remain_usd|floatformat:2 }} for funding {{ object.not_funded_hours|floatformat:2}} hours]
- step of plan {{object.plan}}
+ step of plan + + {% if object.plan.personal %} + {% if request.user in object.plan.sharewith or request.user == object.plan.user %} + {{ object.plan }} + {% else %} + {% trans "private" %} {% trans "plan" %} (by {{ object.plan.user.username }}) + {% endif %} + {% else %} + {{ object.plan }} + {% endif %} + +
translations: {% for translation in translations %} @@ -90,11 +102,28 @@

{% if not translation %}{{object.name}}{% else %}{{ translation.name}}{% end {% for object in task_list reversed %} {% endfor %} diff --git a/src/apps/core/templates/task/detail.html b/src/apps/core/templates/task/detail.html index a660c86..1506132 100644 --- a/src/apps/core/templates/task/detail.html +++ b/src/apps/core/templates/task/detail.html @@ -35,7 +35,19 @@
[needs ${{ object.get_remain_usd|floatformat:2 }} for funding {{ object.not_funded_hours|floatformat:2}} hours]
- todo for milestone {{object.step}}
+ todo for milestone + + {% if object.step.personal %} + {% if request.user in object.step.sharewith or request.user == object.step.user %} + {{ object.step }} + {% else %} + {% trans "private" %} {% trans "step" %} (by {{ object.step.user.username }}) + {% endif %} + {% else %} + {{ object.step }} + {% endif %} + +
translations: {% for translation in translations %} @@ -78,11 +90,28 @@

{% if not translation %}{{ object.name }}{% else %}{{ translation.name}}{% e {% for object in work_list %} {% endfor %} diff --git a/src/apps/core/templates/work/detail.html b/src/apps/core/templates/work/detail.html index 7be5b52..7cf5f1c 100644 --- a/src/apps/core/templates/work/detail.html +++ b/src/apps/core/templates/work/detail.html @@ -35,7 +35,19 @@
[needs ${{ object.get_remain_usd|floatformat:2 }} for funding {{ object.not_funded_hours|floatformat:2}} hours]
- attempt on task {{object.task}}
+ attempt on task + + {% if object.task.personal %} + {% if request.user in object.task.sharewith or request.user == object.task.user %} + {{ object.task }} + {% else %} + {% trans "private" %} {% trans "task" %} (by {{ object.task.user.username }}) + {% endif %} + {% else %} + {{ object.task }} + {% endif %} + +
translations: {% for translation in translations %} @@ -98,11 +110,28 @@

{% if not translation %}{{ object.name }}{% else %}{{ translation.name}}{% e {% for object in work_list %} {% endfor %} diff --git a/src/apps/core/views/step.py b/src/apps/core/views/step.py index d830ac9..572faea 100644 --- a/src/apps/core/views/step.py +++ b/src/apps/core/views/step.py @@ -98,6 +98,7 @@ def get_context_data(self, **kwargs): def get_form_kwargs(self): kwargs = super(StepCreateView, self).get_form_kwargs() + kwargs['plan_instance'] = Plan.objects.get(pk=self.kwargs['plan']) kwargs['request'] = self.request return kwargs @@ -146,6 +147,13 @@ class StepDetailView(DetailViewWrapper, CommentsContentTypeWrapper): slug_field = "pk" template_name = "step/detail.html" + def get_success_url(self): + messages.success( + self.request, _( + "%s succesfully created" % + self.form_class._meta.model.__name__)) + return self.request.path + def get_context_data(self, **kwargs): context = super(StepDetailView, self).get_context_data(**kwargs) obj = self.get_object() diff --git a/src/apps/core/views/task.py b/src/apps/core/views/task.py index 6ea6b36..1fe6574 100644 --- a/src/apps/core/views/task.py +++ b/src/apps/core/views/task.py @@ -92,6 +92,7 @@ def get_context_data(self, **kwargs): def get_form_kwargs(self): kwargs = super(TaskCreateView, self).get_form_kwargs() + kwargs['step_instance'] = Step.objects.get(pk=self.kwargs['step']) kwargs['request'] = self.request return kwargs diff --git a/src/apps/core/views/views.py b/src/apps/core/views/views.py index 00371e1..e303802 100644 --- a/src/apps/core/views/views.py +++ b/src/apps/core/views/views.py @@ -107,8 +107,7 @@ def post(self, request, *args, **kwargs): return redirect(reverse('home')) - def get_translation_by_instance(self, instance, content_type): - language = Language.objects.get(language_code=self.request.LANGUAGE_CODE) + def get_translation_by_instance(self, instance, content_type, language): translation = Translation.objects.filter( content_type=content_type, object_id=instance.id, @@ -118,56 +117,61 @@ def get_translation_by_instance(self, instance, content_type): return translation.first() def get_context_data(self, **kwargs): - items = {'needs': 32, - 'goals': 64, - 'ideas': 128, - 'plans': 256, - 'steps': 512, - 'tasks': 1024, - 'works': 2048} - - if self.request.session.get('needs_number'): - items['goals'] = self.request.session['needs_number'] - if self.request.session.get('goals_number'): - items['goals'] = self.request.session['goals_number'] - if self.request.session.get('ideas_number'): - items['ideas'] = self.request.session['ideas_number'] - if self.request.session.get('plans_number'): - items['plans'] = self.request.session['plans_number'] - if self.request.session.get('steps_number'): - items['steps'] = self.request.session['steps_number'] - if self.request.session.get('tasks_number'): - items['tasks'] = self.request.session['tasks_number'] - if self.request.session.get('works_number'): - items['works'] = self.request.session['works_number'] + current_time = timezone.now() + language = Language.objects.get(language_code=self.request.LANGUAGE_CODE) + + items = {'needs': 16, + 'goals': 16, + 'ideas': 16, + 'plans': 16, + 'steps': 16, + 'tasks': 16, + 'works': 16} + + for key, value in enumerate(items): + if self.request.session.get('%ss_number' % items[value]): + items[items[value]] = self.request.session['%ss_number' % items[value]] + + # Basic search by name in original language + if 's' in self.request.GET: + s = self.request.GET['s'] + q_search = Q(name__icontains=s) + else: + q_search = Q() # Prepare base content access filters + INBOX = False if self.request.user.is_authenticated(): if self.request.resolver_match.url_name == 'inbox': + INBOX = True q_object = ( - Q(personal=True, user=self.request.user) | - Q(personal=True, sharewith=self.request.user) + ( + Q(personal=True, user=self.request.user) | + Q(personal=True, sharewith=self.request.user) + ) + & q_search ) else: q_object = ( - Q(personal=False) | - Q(personal=True, user=self.request.user) | - Q(personal=True, sharewith=self.request.user) + ( + Q(personal=False) + ) + & Q(lang=language) + & q_search ) else: q_object = ( + ( Q(personal=False) + ) + & Q(lang=language) + & q_search ) # Get Content Types for Goal, Idea, Plan, Step, Task - content_types = ContentType.objects.get_for_models(Need, Goal, Idea, Plan, Step, Task, Work) - - now = timezone.now() - in_days = lambda x: float(x.seconds/86400.) - in_hours = lambda x: float(x.seconds/3600.) - instances = {} + content_types = ContentType.objects.get_for_models(Need, Goal, Idea, Plan, Step, Task, Work) for model_class, translations in content_types.items(): model_class_lower_name = model_class.__name__.lower() + 's' @@ -175,60 +179,24 @@ def get_context_data(self, **kwargs): q_object ).order_by('-commented_at').distinct()[:items[model_class_lower_name]] - - needs = instances['needs'] - goals = instances['goals'] - ideas = instances['ideas'] - plans = instances['plans'] - steps = instances['steps'] - tasks = instances['tasks'] - works = instances['works'] - - commented_at = lambda items: [obj.commented_at for obj in items] - - objects_list = list(chain(needs, goals, ideas, plans, steps, tasks, works)) - dates = commented_at(objects_list) - - if dates: - start = min(dates) - days = in_days(now-start) - else: - start = timezone.now() - days = 0. - - try: - hour_value = HourValue.objects.latest('created_at') - except HourValue.DoesNotExist: - hour_value = 0 - instances_list = {} + week_start = (current_time - timezone.timedelta(current_time.weekday())) for model, content_type in content_types.items(): model_name = model.__name__.lower() instances_list[model_name + '_list'] = [{ 'object': instance, - 'is_new': instance.created_at > start, - 'translation': self.get_translation_by_instance(instance, content_type) + 'is_new': instance.created_at > week_start.replace(hour=0, minute=0, second=0, microsecond=0), + 'translation': self.get_translation_by_instance(instance, content_type, INBOX and instance.language or language) } for instance in model.objects.filter(q_object).order_by('-commented_at').distinct()[:items[model_name + 's']]] + try: + hour_value = HourValue.objects.latest('created_at') + except HourValue.DoesNotExist: + hour_value = 0 + context = { - 'need_hours': needs and - '%0.2f' % in_hours(now-max(commented_at(list(needs)))) or 0., - 'goal_hours': goals and - '%0.2f' % in_hours(now-max(commented_at(list(goals)))) or 0., - 'idea_hours': ideas and - '%0.2f' % in_hours(now-max(commented_at(list(ideas)))) or 0., - 'plan_hours': plans and - '%0.2f' % in_hours(now-max(commented_at(list(plans)))) or 0., - 'step_hours': steps and - '%0.2f' % in_hours(now-max(commented_at(list(steps)))) or 0., - 'task_hours': tasks and - '%0.2f' % in_hours(now-max(commented_at(list(tasks)))) or 0., - 'work_hours': works and - '%0.2f' % in_hours(now-max(commented_at(list(works)))) or 0., - 'last_days': '%0.2f' % days, - 'number_of_items': len(objects_list), - 'hour_value': hour_value, + 'hour_value': hour_value, 'dropdown_list': self.dropdown_list, 'items': items, } diff --git a/src/apps/core/views/work.py b/src/apps/core/views/work.py index 0af289a..eb5bf32 100644 --- a/src/apps/core/views/work.py +++ b/src/apps/core/views/work.py @@ -93,6 +93,7 @@ def get_context_data(self, **kwargs): def get_form_kwargs(self): kwargs = super(WorkCreateView, self).get_form_kwargs() + kwargs['task_instance'] = Task.objects.get(pk=self.kwargs['task']) kwargs['request'] = self.request return kwargs diff --git a/src/conf/base.py b/src/conf/base.py index 9eac43f..35e0d0c 100644 --- a/src/conf/base.py +++ b/src/conf/base.py @@ -70,7 +70,7 @@ ('ru', _('Russian')), # ('ja', _('Japanese')), # ('fr', _('French')), - ('zh-cn', _('Chinese')), + ('zh-hans', _('Chinese')), # ('de', _('German')), ('lt', _('Lithuanian')), # ('uk', _('Ukrainian')) diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index b09c38d..5fb5855 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/apps/core/forms.py:199 src/apps/core/forms.py:330 -#: src/apps/core/forms.py:333 src/apps/core/forms.py:1010 +#: src/apps/core/forms.py:219 src/apps/core/forms.py:352 +#: src/apps/core/forms.py:355 src/apps/core/forms.py:1043 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,31 +20,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -56,32 +56,32 @@ msgid "" " estimates." msgstr "" -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "" -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 msgid "" "Topic: (relevant to problem,\n" " click " @@ -89,15 +89,15 @@ msgid "" " add if you can't find it.)" msgstr "" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -107,32 +107,32 @@ msgid "" "and logistics.\"" msgstr "" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "" -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -273,91 +273,91 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -370,11 +370,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -382,11 +382,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -395,7 +395,7 @@ msgstr "" msgid "edit" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -403,29 +403,29 @@ msgstr "" msgid "delete" msgstr "" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "" @@ -468,10 +468,10 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "" @@ -573,14 +573,14 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "" @@ -603,7 +603,7 @@ msgstr "" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "" @@ -633,7 +633,7 @@ msgstr "" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "" @@ -981,12 +981,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "" @@ -1121,7 +1121,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "" @@ -1329,23 +1329,23 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" msgstr "" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" msgstr "" @@ -1369,48 +1369,42 @@ msgstr "" msgid "Plan" msgstr "" -#: src/templates/home.html:57 -msgid "Needs" +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" msgstr "" -#: src/templates/home.html:58 -msgid "share a need" +#: src/templates/home.html:59 +msgid "Needs" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" +#: src/templates/home.html:62 +msgid "share a need" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" +#: src/templates/home.html:64 +msgid "write an open letter" msgstr "" -#: src/templates/home.html:112 +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "" -#: src/templates/home.html:113 +#: src/templates/home.html:120 msgid "Define a need" msgstr "" -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1420,31 +1414,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1455,19 +1449,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1480,7 +1474,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "" @@ -1509,15 +1503,15 @@ msgstr "" msgid "break it down" msgstr "" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1535,23 +1529,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1560,23 +1554,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "" -#: src/templates/home.html:624 +#: src/templates/home.html:621 msgid "Oops! You have no works!" msgstr "" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1585,7 +1579,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "" @@ -1716,10 +1710,6 @@ msgstr "" msgid "Publishing problems" msgstr "" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.mo b/src/locale/en/LC_MESSAGES/django.mo index 0bfae66..da9d099 100644 Binary files a/src/locale/en/LC_MESSAGES/django.mo and b/src/locale/en/LC_MESSAGES/django.mo differ diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index c1eb5d5..4dd5dbb 100644 --- a/src/locale/en/LC_MESSAGES/django.po +++ b/src/locale/en/LC_MESSAGES/django.po @@ -3,14 +3,12 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/apps/core/forms.py:199 src/apps/core/forms.py:330 -#: src/apps/core/forms.py:333 src/apps/core/forms.py:1010 msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" -"PO-Revision-Date: 2016-01-02 14:05+0200\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" +"PO-Revision-Date: 2016-01-16 18:26+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: en\n" @@ -19,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.6\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -55,32 +53,32 @@ msgid "" " estimates." msgstr "" -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "" -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 msgid "" "Topic: (relevant to problem,\n" " click " @@ -88,15 +86,15 @@ msgid "" " add if you can't find it.)" msgstr "" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -106,32 +104,32 @@ msgid "" "and logistics.\"" msgstr "" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "" -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -272,91 +270,91 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -369,11 +367,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -381,11 +379,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -394,7 +392,7 @@ msgstr "" msgid "edit" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -402,29 +400,29 @@ msgstr "" msgid "delete" msgstr "" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "" @@ -467,10 +465,10 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "" @@ -572,14 +570,14 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "" @@ -602,7 +600,7 @@ msgstr "" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "" @@ -632,7 +630,7 @@ msgstr "" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "" @@ -982,12 +980,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "" @@ -1122,7 +1120,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "" @@ -1330,25 +1328,25 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" -msgstr "Explore" +msgstr "Public" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" -msgstr "Inbox" +msgstr "Private" #: src/templates/home.html:21 msgid "invitations" @@ -1370,48 +1368,42 @@ msgstr "Compose" msgid "Plan" msgstr "" -#: src/templates/home.html:57 -msgid "Needs" +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" msgstr "" -#: src/templates/home.html:58 -msgid "share a need" +#: src/templates/home.html:59 +msgid "Needs" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" +#: src/templates/home.html:62 +msgid "share a need" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" +#: src/templates/home.html:64 +msgid "write an open letter" msgstr "" -#: src/templates/home.html:112 +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "" -#: src/templates/home.html:113 +#: src/templates/home.html:120 msgid "Define a need" msgstr "" -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1421,31 +1413,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1456,19 +1448,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1481,7 +1473,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "" @@ -1510,15 +1502,15 @@ msgstr "" msgid "break it down" msgstr "" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1536,23 +1528,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1561,23 +1553,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "" -#: src/templates/home.html:624 +#: src/templates/home.html:621 msgid "Oops! You have no works!" msgstr "" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1586,7 +1578,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "— economy for people —" @@ -1717,10 +1709,6 @@ msgstr "" msgid "Publishing problems" msgstr "" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index 74b0102..449fb5d 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/apps/core/forms.py:199 src/apps/core/forms.py:330 -#: src/apps/core/forms.py:333 src/apps/core/forms.py:1010 +#: src/apps/core/forms.py:219 src/apps/core/forms.py:352 +#: src/apps/core/forms.py:355 src/apps/core/forms.py:1043 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -20,31 +20,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -56,32 +56,32 @@ msgid "" " estimates." msgstr "" -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "" -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 msgid "" "Topic: (relevant to problem,\n" " click " @@ -89,15 +89,15 @@ msgid "" " add if you can't find it.)" msgstr "" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -107,32 +107,32 @@ msgid "" "and logistics.\"" msgstr "" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "" -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -273,91 +273,91 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -370,11 +370,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -382,11 +382,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -395,7 +395,7 @@ msgstr "" msgid "edit" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -403,29 +403,29 @@ msgstr "" msgid "delete" msgstr "" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "" @@ -468,10 +468,10 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "" @@ -573,14 +573,14 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "" @@ -603,7 +603,7 @@ msgstr "" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "" @@ -633,7 +633,7 @@ msgstr "" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "" @@ -981,12 +981,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "" @@ -1121,7 +1121,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "" @@ -1329,23 +1329,23 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" msgstr "" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" msgstr "" @@ -1369,48 +1369,42 @@ msgstr "" msgid "Plan" msgstr "" -#: src/templates/home.html:57 -msgid "Needs" +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" msgstr "" -#: src/templates/home.html:58 -msgid "share a need" +#: src/templates/home.html:59 +msgid "Needs" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" +#: src/templates/home.html:62 +msgid "share a need" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" +#: src/templates/home.html:64 +msgid "write an open letter" msgstr "" -#: src/templates/home.html:112 +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "" -#: src/templates/home.html:113 +#: src/templates/home.html:120 msgid "Define a need" msgstr "" -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1420,31 +1414,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1455,19 +1449,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1480,7 +1474,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "" @@ -1509,15 +1503,15 @@ msgstr "" msgid "break it down" msgstr "" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1535,23 +1529,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1560,23 +1554,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "" -#: src/templates/home.html:624 +#: src/templates/home.html:621 msgid "Oops! You have no works!" msgstr "" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1585,7 +1579,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "" @@ -1716,10 +1710,6 @@ msgstr "" msgid "Publishing problems" msgstr "" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" diff --git a/src/locale/hr/LC_MESSAGES/django.po b/src/locale/hr/LC_MESSAGES/django.po index 137460a..eea98c8 100644 --- a/src/locale/hr/LC_MESSAGES/django.po +++ b/src/locale/hr/LC_MESSAGES/django.po @@ -3,13 +3,13 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/apps/core/forms.py:199 src/apps/core/forms.py:330 -#: src/apps/core/forms.py:333 src/apps/core/forms.py:1010 +#: src/apps/core/forms.py:219 src/apps/core/forms.py:352 +#: src/apps/core/forms.py:355 src/apps/core/forms.py:1043 msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" "PO-Revision-Date: 2015-11-10 02:08+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -21,31 +21,31 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" "X-Generator: Poedit 1.8.5\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "Stvori" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "Ažuriraj" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "USD" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "Euro" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -65,38 +65,38 @@ msgstr "" "indicate\n" " estimates." -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" "Obavijestite spomenute korisnike (pr., Pozdrav [User], kako ste?) e-" "mailom." -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 #, fuzzy #| msgid "Account" msgid "Amount" msgstr "Račun" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 #, fuzzy #| msgid "Comment" msgid "Send Comment" msgstr "Komentar" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "Komentar" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "Obavijestite spomenute korisnike e-mailom." -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 #, fuzzy #| msgid "" #| "Topic: (relevant to problem,\n" @@ -114,15 +114,15 @@ msgstr "" "ovdje to\n" " dodajte ako ne možete pronaći.)" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -132,33 +132,33 @@ msgid "" "and logistics.\"" msgstr "" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "Osobno (omogućava vidljivost unosa odabranoj grupi ljudi)" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "" "Jezik unosa (jezik koji ste koristili za sastavljanje ove objave) " -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, provjerinije li problem\n" " već definiran.)" -#: src/apps/core/forms.py:331 +#: src/apps/core/forms.py:353 msgid "" "Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "Opis: (pr., Mnoštvu ljudi nedostaje čista pitka voda.)" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 #, fuzzy #| msgid "Category: (of the problem)" msgid "Origin: (of the source)" msgstr "Kategorija: (problema)" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "http://" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" @@ -225,46 +225,46 @@ msgstr "" "Ime: (pr., \"Prvi pokušaj sastavljanja solarnih ćelija.\", korišten u " "naslovu.)" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "Dodaj naslov svojoj djelatnosti." -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "Opis: (detalji o radu, korišteni kao tijelo.)" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "Evo kratka priča o mom radu." -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "Fajl: (možete uploadati fajl koji opisuje vaš rad)" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "ID zajedničkog rada: (cijeli broj koji se odnosi na drugi rad)" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "izborno" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "Ciljevi" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "Ime: (npr., Kondenzator solarne vode\", korišteno u naslovu.)" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" @@ -272,37 +272,37 @@ msgstr "" "Sažetak: (npr., \"Korištenje solarnog panela i Peltierovog učinka za " "izvlačenje vode iz zraka.\", koji se pojavljuje kao podnaslov.)" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "Opis: (napišite puni opis ovdje, kao tijelo teksta.)" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "Podijelite sa:" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" "Prekretnica: (npr., \"sklapanje solarnog panela\", korištena u " "naslovu.)" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "Upišite naslov prekretnice." -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "Cilj: (opišite uvjete dostizanja prekretnice)" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -316,7 +316,7 @@ msgstr "" "- Proizvodi očekivanu izlaznu snagu\n" "- Prolazi određene testove pouzdanosti. " -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" @@ -324,7 +324,7 @@ msgstr "" "Prioritet: (cijeli broj, npr., 1,2,3.. - korišten za narudžbu, manji " "broj pokazuje da se prekretnica mora obaviti ranije)" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, korištene za izračunavanje vrijednosti.)" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "ljudi 1\\3, dana 10\\20, USD 50\\70" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, korištene za izračunavanje vrijednosti.)" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" "kompletni crteži za sklapanje solarne ćelije 0\\1, sklapanje solarne ćelije " "1\\2" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "Zadatak: (npr., \"Kupi solarne ćelije\", tekst u naslovu.)" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "Upišite naziv zadatka." -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" @@ -375,38 +375,38 @@ msgstr "" "Prioritet: (cijeli broj, npr., 1,2,3.. - koristi se za narudžbu, " "manji brojevi znače da je zadatak odrađen ranije)" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "Dodaj & Idi" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "Cilj" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "Ideja" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "Članovi" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "Naziv: (pr., \"Projekt solarne vode\".)" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" @@ -414,7 +414,7 @@ msgstr "" "Situacija: (Opišite svoju trenutnu situaciju koristeći stvari koje " "imate, uključujući pristup.)" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -436,11 +436,11 @@ msgstr "" "- Autmobil\n" "- 150 USD za ovaj projekt" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "Dostavljivo: (Opišite što očekujete dobiti.)" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -452,13 +452,13 @@ msgstr "" "Radni prototip solarnog kondenzatora vode, i visoko kvalitetni dizajn " "objavljen na GitHub-u, kojeg ostali mogli jednostavno ponoviti." -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 #, fuzzy #| msgid "Comment" msgid "New comment" msgstr "Komentar" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -467,7 +467,7 @@ msgstr "Komentar" msgid "edit" msgstr "uredi" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -475,33 +475,33 @@ msgstr "uredi" msgid "delete" msgstr "izbriši" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 #, fuzzy #| msgid "Reply:" msgid "reply" msgstr "Odgovori:" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 #, fuzzy #| msgid "edit" msgid "credit" msgstr "uredi" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "Pozovite prijatelja u pomoć!" @@ -546,10 +546,10 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "" @@ -656,14 +656,14 @@ msgstr "prijevodi:" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "" @@ -686,7 +686,7 @@ msgstr "podijeljeno sa:" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "Ideje" @@ -719,7 +719,7 @@ msgstr "želi:" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "Planovi" @@ -1088,12 +1088,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "" @@ -1243,7 +1243,7 @@ msgstr "" "Potvrdili ste da je %(email)s e-mail adresa " "korisnika %(user_display)s." -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "Registracija" @@ -1472,27 +1472,27 @@ msgstr "" "Bilješka: još uvijek možete promijeniti vašu e-mail adresu." -#: src/templates/base.html:97 +#: src/templates/base.html:91 #, fuzzy #| msgid "Solve Your Problems." msgid "Solving Problems" msgstr "Rješite vaše probleme." -#: src/templates/base.html:129 +#: src/templates/base.html:123 #, fuzzy #| msgid "my index" msgid "public index" msgstr "moj indeks" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "O nama" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "Odjava" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" msgstr "" @@ -1518,56 +1518,50 @@ msgstr "" msgid "Plan" msgstr "Planovi" -#: src/templates/home.html:57 +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" +msgstr "Traži" + +#: src/templates/home.html:59 #, fuzzy #| msgid "needs" msgid "Needs" msgstr "potrebe" -#: src/templates/home.html:58 +#: src/templates/home.html:62 #, fuzzy #| msgid "Select the thing that you need..." msgid "share a need" msgstr "Izaberite potrebnu stvar..." -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" -msgstr "(zadnji komentar" - -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" -msgstr "prije par sati)" - -#: src/templates/home.html:112 +#: src/templates/home.html:64 +msgid "write an open letter" +msgstr "" + +#: src/templates/home.html:119 #, fuzzy #| msgid "Oops! You have no ideas!" msgid "Oops! You have no needs!" msgstr "Oops! Nema ideja!" -#: src/templates/home.html:113 +#: src/templates/home.html:120 #, fuzzy #| msgid "Select the thing that you need..." msgid "Define a need" msgstr "Izaberite potrebnu stvar..." -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "...ili mišljenje" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 #, fuzzy #| msgid "" #| "\n" @@ -1592,31 +1586,31 @@ msgstr "" "ukusima. Sviđa mi se, i htio bih jesti omlet svako jutro, bez dodatnih " "troškova.

" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "definiraj problem" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "vidi još" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "Oops! Nema ciljeva!" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "Dodaj problem" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "indeks" -#: src/templates/home.html:195 +#: src/templates/home.html:197 #, fuzzy #| msgid "" #| "\n" @@ -1642,19 +1636,19 @@ msgstr "" "ukusima. Sviđa mi se, i htio bih jesti omlet svako jutro, bez dodatnih " "troškova.

" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "predloži rješenje" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "Oops! Nema ideja!" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "Dodaj rješenje" -#: src/templates/home.html:281 +#: src/templates/home.html:282 #, fuzzy #| msgid "" #| "\n" @@ -1688,7 +1682,7 @@ msgstr "" "robotske hranilice, skupljače jaja, perilice, kočnice, tajmirane miksere, " "kuhala i dispenzere - i imate samoodrživu opskrbu svježeg omleta.

" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "pokreni projekt" @@ -1732,15 +1726,15 @@ msgstr "" msgid "break it down" msgstr "razbijte ga" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "Oops! Nema koraka!" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "Pokrenite projekt da bi dodali prekretnicu" -#: src/templates/home.html:454 +#: src/templates/home.html:453 #, fuzzy #| msgid "" #| "\n" @@ -1783,23 +1777,23 @@ msgstr "" "

Cilj: Smislite izvediv plan poslovanja.

\n" " ..." -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "Zadaci" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "izvršite" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "Oops! Nema zadataka!" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "Izaberite prekretnicu da bi dodali zadatak" -#: src/templates/home.html:543 +#: src/templates/home.html:541 #, fuzzy #| msgid "" #| "\n" @@ -1819,27 +1813,27 @@ msgstr "" "

$ 0.00 Otvori internet i napravi istraživanje.

\n" " ..." -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "" -#: src/templates/home.html:624 +#: src/templates/home.html:621 #, fuzzy #| msgid "Oops! You have no goals!" msgid "Oops! You have no works!" msgstr "Oops! Nema ciljeva!" -#: src/templates/home.html:625 +#: src/templates/home.html:622 #, fuzzy #| msgid "Choose a milestone to add tasks" msgid "Choose a task to add works" msgstr "Izaberite prekretnicu da bi dodali zadatak" -#: src/templates/home.html:628 +#: src/templates/home.html:625 #, fuzzy #| msgid "" #| "\n" @@ -1859,7 +1853,7 @@ msgstr "" "

$ 0.00 Otvori internet i napravi istraživanje.

\n" " ..." -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "Ekonomija usredotočena na ljude." @@ -2009,10 +2003,6 @@ msgstr "" msgid "Publishing problems" msgstr "Rješite vaše probleme." -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "Traži" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "Poništavanje filtera" @@ -2033,6 +2023,12 @@ msgstr "E-mail adresa i/ili lozinka koje ste unijeli nisu točni." msgid "Remember Me" msgstr "Zapamti me" +#~ msgid "(last commented" +#~ msgstr "(zadnji komentar" + +#~ msgid "hours ago)" +#~ msgstr "prije par sati)" + #~ msgid "Select the users to share with:" #~ msgstr "Izaberite korisnike za dijeljenje:" diff --git a/src/locale/ja/LC_MESSAGES/django.mo b/src/locale/ja/LC_MESSAGES/django.mo index 764efb3..ebc6be8 100644 Binary files a/src/locale/ja/LC_MESSAGES/django.mo and b/src/locale/ja/LC_MESSAGES/django.mo differ diff --git a/src/locale/ja/LC_MESSAGES/django.po b/src/locale/ja/LC_MESSAGES/django.po index 6f3ed25..29c2aa1 100644 --- a/src/locale/ja/LC_MESSAGES/django.po +++ b/src/locale/ja/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" -"PO-Revision-Date: 2016-01-11 02:00+0200\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" +"PO-Revision-Date: 2016-01-16 18:32+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: ja\n" @@ -18,31 +18,31 @@ msgstr "" "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Poedit 1.8.6\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "作成" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "更新" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -62,34 +62,34 @@ msgstr "" "を使ってください、例えば\n" " {?1.5}。" -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" "指摘した名前の利用者（例えば、こんにちは、[利用者]、お元気ですか？）を" "メールで通知する。" -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "金額" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "通貨" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "コメントを送る" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "コメント" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "指摘した名前の利用者をメールで通知する。" -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 #, fuzzy #| msgid "" #| "Topic: (relevant to problem,\n" @@ -106,15 +106,15 @@ msgstr "" " ここで \n" " 新しい概念を定義してください。)" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "件名：" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "例：『こんにちは、友達、誰が私と同じく宇宙船が欲しがっている？』" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -129,32 +129,32 @@ msgstr "" "り方を考えようよ、物理法則から、具体的な宇宙船の設計や事業の計画までも考えら" "れるからです。』" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "個人的 （チェックすると選択選択した利用者だけが見れる）" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "入力言語 （この投稿を作成する多面に使われている言葉）" -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "問題の分野：" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "関する需要： （任意）" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, ここで 確かめて\n" " ください。）" -#: src/apps/core/forms.py:331 +#: src/apps/core/forms.py:353 msgid "" "Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "説明: （例えば、世界中飲料水が足りない人は多いです。）" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" "これはリンクです （もし自分の内容ではなくて、別の人の内容を描写してい" "るなら選択してください）" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "由来： （ソースのウェブアドレス）" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" "これは歴史です （もし現在の問題ではなく、歴史の内容を描写しているなら" "選択してください）" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" "これは歴史です （もし現在の仕事ではなく、歴史の内容を描写しているなら" "選択してください）" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" "これは歴史です （もし現在の発想ではなく、歴史の内容を描写しているなら" "選択してください）" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "目的" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "誰と共有する：" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" @@ -286,21 +286,21 @@ msgstr "" "これは歴史です （もし現在の段階ではなく、歴史の内容を描写しているなら" "選択してください）" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -309,95 +309,95 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" "これは歴史です （もし現在のタスクではなく、歴史の内容を描写しているな" "ら選択してください）" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "すすむ" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "どう定義する？例えば「銀河の間を移動する宇宙飛行」" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" "これは歴史です （もし現在の企画ではなく、歴史の内容を描写しているなら" "選択してください）" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "目的" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "発想" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -410,11 +410,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -422,11 +422,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "新規コメント" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -435,7 +435,7 @@ msgstr "新規コメント" msgid "edit" msgstr "編集" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -443,29 +443,29 @@ msgstr "編集" msgid "delete" msgstr "削除" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "返事する" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "支持票" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "反対票" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "クレジット" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "" @@ -508,10 +508,10 @@ msgstr "宇宙空間に打ち上げられ，長時間人間を乗せて運航す #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "リンク" @@ -616,14 +616,14 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "歴史的" @@ -646,7 +646,7 @@ msgstr "" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "発想" @@ -676,7 +676,7 @@ msgstr "" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "企画" @@ -1029,12 +1029,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "オープンデータ" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "オープンソース" @@ -1169,7 +1169,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "ログイン" @@ -1382,25 +1382,25 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "問題を解決します" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" -msgstr "内容一覧" +msgstr "公的索引" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "プロジェクトについて" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "ログアウト" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" -msgstr "受信箱" +msgstr "私的索引" #: src/templates/home.html:21 msgid "invitations" @@ -1422,50 +1422,44 @@ msgstr "作成" msgid "Plan" msgstr "企画" -#: src/templates/home.html:57 +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" +msgstr "" + +#: src/templates/home.html:59 msgid "Needs" msgstr "需要" -#: src/templates/home.html:58 +#: src/templates/home.html:62 msgid "share a need" msgstr "需要を共有する" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" -msgstr "（最終コメント" - -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" -msgstr "時間前）" - -#: src/templates/home.html:112 +#: src/templates/home.html:64 +msgid "write an open letter" +msgstr "公開状を執筆する" + +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "" -#: src/templates/home.html:113 +#: src/templates/home.html:120 #, fuzzy #| msgid "Select the thing that you need..." msgid "Define a need" msgstr "需要と関連する対象の選択..." -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1475,31 +1469,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "問題を定義する" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "つづく" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1510,19 +1504,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "解決を提案する" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1535,7 +1529,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "プロジェクトをはじめる" @@ -1564,15 +1558,15 @@ msgstr "" msgid "break it down" msgstr "節目を定義する" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1590,23 +1584,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "タスク" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "やることを定義する" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1615,23 +1609,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "仕事" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "終えた！" -#: src/templates/home.html:624 +#: src/templates/home.html:621 msgid "Oops! You have no works!" msgstr "" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1640,7 +1634,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "─人への経済─" @@ -1777,10 +1771,6 @@ msgstr "" msgid "Publishing problems" msgstr "問題を解決します" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" @@ -1801,6 +1791,12 @@ msgstr "" msgid "Remember Me" msgstr "" +#~ msgid "(last commented" +#~ msgstr "（最終コメント" + +#~ msgid "hours ago)" +#~ msgstr "時間前）" + #~ msgid "Select the users to share with:" #~ msgstr "共有したい利用者の選択：" diff --git a/src/locale/lt/LC_MESSAGES/django.mo b/src/locale/lt/LC_MESSAGES/django.mo index dec6c68..bc7ec6e 100644 Binary files a/src/locale/lt/LC_MESSAGES/django.mo and b/src/locale/lt/LC_MESSAGES/django.mo differ diff --git a/src/locale/lt/LC_MESSAGES/django.po b/src/locale/lt/LC_MESSAGES/django.po index 93207f9..22d9856 100644 --- a/src/locale/lt/LC_MESSAGES/django.po +++ b/src/locale/lt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" -"PO-Revision-Date: 2016-01-11 02:02+0200\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" +"PO-Revision-Date: 2016-01-16 18:25+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: lt\n" @@ -19,31 +19,31 @@ msgstr "" "%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.6\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "Sukurti" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -62,34 +62,34 @@ msgstr "" "Nurodyti, kiek tikitės išleisti valandų, \n" " naudokite klaustuką, pvz. {?1.5}." -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" "Pranešti paminėtiems vartotojams (e.g., Sveiki [vartotojau], kaip jum " "sekasi?) apie komentarą el. paštu." -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "Kiekis" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "Valiuta" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "Komentuoti" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "Komentaras" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "Pranešti paminėtiems vartotojams el. paštu." -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 #, fuzzy #| msgid "" #| "Topic: (relevant to problem,\n" @@ -107,15 +107,15 @@ msgstr "" "\">čia \n" " pridėti naują.)" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "Pasidalink su draugais:" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "pvz., \"Sveiki draugai, kas taip pat norėtumėte turėti erdvėlaivį?\"" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -131,32 +131,32 @@ msgstr "" "įmanomus būdus, kaip mes tai galėtume padaryti, - nuo fizikos dėsnių iki " "konkrečių erdvėlaivio dizaino variantų bei logistikos.\"" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "Asmeninis (bus matomas tik parinktiems žmonėms)" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "Įvesties kalba (kalba, kuria parašėte šio straipsnio turinį)" -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "Problemos sritis:" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "Susijęs noras: (nebūtinas)" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, Description: (e.g., Many people in the world lack clean potable " "water.)" @@ -177,113 +177,113 @@ msgstr "" "Aprašymas: (pvz., daug žmonių pasaulyje trūksta švaraus geriamo " "vandens.)" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" "Tai yra nuoroda (pažymėkite, jei turinys yra paimtas ir adaptuotas iš " "kitur)" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "Šaltinis: (originalo adresas)" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" "Tai istorinis įrašas (pažymėkite, jei aprašote praeties istorinę " "problemą)" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" "Tai istorinis įrašas (pažymėkite, jei aprašote praeities istorinį " "darbą)" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" "Tai istorinis įrašas (pažymėkite, jei aprašote praeities istorinę " "idėją)" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "Tikslai" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "Dalintis su:" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" @@ -291,21 +291,21 @@ msgstr "" "Tai istorinis įrašas (pažymėkite, jei aprašote praeities projekto " "istorinį etapą)" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -314,95 +314,95 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" "Tai istorinis įrašas (pažymėkite, jei aprašote praeties projekto " "istorinę užduotį)" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "Pirmyn" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "kaip apibrėši? pvz.: skrydis už galaktikų ribų" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" "Tai istorinis įrašas (pažymėkite, jei aprašote praeities istorinį " "projektą)" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "Tikslas" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "Idėja" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -415,11 +415,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -427,11 +427,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "Naujas komentaras" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -440,7 +440,7 @@ msgstr "Naujas komentaras" msgid "edit" msgstr "redaguoti" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -448,29 +448,29 @@ msgstr "redaguoti" msgid "delete" msgstr "ištrinti" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "atsakyti" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "Balsuoti už" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "Balsuoti prieš" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "kreditas" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "Pakviesti draugą padėti." @@ -513,10 +513,10 @@ msgstr "transporto priemonė skirta skrydžiams į kosmosą" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "adaptuotas" @@ -621,14 +621,14 @@ msgstr "vertimai:" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "istorinis" @@ -651,7 +651,7 @@ msgstr "Dalinamasi su:" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "Idėjos" @@ -681,7 +681,7 @@ msgstr "norim:" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "Planai" @@ -1045,12 +1045,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "Atviri duomenys" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "Atviras kodas" @@ -1185,7 +1185,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "Prisijungti" @@ -1401,25 +1401,25 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "Spręskime problemas" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" -msgstr "Temos" +msgstr "Viešos" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "Apie projektą" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "Atsijungti" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" -msgstr "Gautieji" +msgstr "Privačios" #: src/templates/home.html:21 msgid "invitations" @@ -1441,52 +1441,46 @@ msgstr "Rašyti" msgid "Plan" msgstr "Planas" -#: src/templates/home.html:57 +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" +msgstr "" + +#: src/templates/home.html:59 msgid "Needs" msgstr "Poreikiai" -#: src/templates/home.html:58 +#: src/templates/home.html:62 msgid "share a need" msgstr "pasidalinti poreikiu" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" -msgstr "(paskutinis komentaras prieš" - -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" -msgstr "valandų)" - -#: src/templates/home.html:112 +#: src/templates/home.html:64 +msgid "write an open letter" +msgstr "parašyti viešąjį laišką" + +#: src/templates/home.html:119 #, fuzzy #| msgid "Oops! You have no ideas!" msgid "Oops! You have no needs!" msgstr "Jūs dar neturite idėjų!" -#: src/templates/home.html:113 +#: src/templates/home.html:120 #, fuzzy #| msgid "Define what you need" msgid "Define a need" msgstr "Apibrėžk, ko nori" -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "...arba žr." -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1496,31 +1490,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "apibrėžti problemą" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "skaityti daugiau..." -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "Jūs dar neturite tikslų!" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "Apibrėžkite problemą" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "viešą turinį" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1531,19 +1525,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "pasiūlyti sprendimą" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "Jūs dar neturite idėjų!" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "Pridėkite sumanymą" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1556,7 +1550,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "pradėti projektą" @@ -1585,15 +1579,15 @@ msgstr "" msgid "break it down" msgstr "išskaidyti į etapus" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "Jūs dar neturite uždavinių!" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "Pradėkite projektą, ir prie jo pridėkite etapus" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1611,23 +1605,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "Užduotys" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "vykdyti" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1636,25 +1630,25 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "Darbai" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "padaryta!" -#: src/templates/home.html:624 +#: src/templates/home.html:621 #, fuzzy #| msgid "Oops! You have no goals!" msgid "Oops! You have no works!" msgstr "Jūs dar neturite tikslų!" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1663,7 +1657,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "— ekonomika žmogui —" @@ -1800,10 +1794,6 @@ msgstr "" msgid "Publishing problems" msgstr "Spręskim problemas" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" @@ -1824,6 +1814,12 @@ msgstr "" msgid "Remember Me" msgstr "Prisiminti" +#~ msgid "(last commented" +#~ msgstr "(paskutinis komentaras prieš" + +#~ msgid "hours ago)" +#~ msgstr "valandų)" + #~ msgid "Select the users to share with:" #~ msgstr "Vartotojai, kuriem bus matomas." diff --git a/src/locale/ru/LC_MESSAGES/django.mo b/src/locale/ru/LC_MESSAGES/django.mo index 57469f5..b6951a9 100644 Binary files a/src/locale/ru/LC_MESSAGES/django.mo and b/src/locale/ru/LC_MESSAGES/django.mo differ diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index 1e12426..e0a8657 100644 --- a/src/locale/ru/LC_MESSAGES/django.po +++ b/src/locale/ru/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" -"PO-Revision-Date: 2016-01-11 02:08+0200\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" +"PO-Revision-Date: 2016-01-16 18:28+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: ru\n" @@ -19,31 +19,31 @@ msgstr "" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" "X-Generator: Poedit 1.8.6\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "Создать" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "Обновить" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "Доллар США" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "Евро" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -63,38 +63,38 @@ msgstr "" "указать сколько часов вы затратите.\n" " " -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" "Уведомить упомянутых пользователей (e.g., Здравствуйте [пользователь] как " "ваши дела? ) по электронной почте." -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 #, fuzzy #| msgid "Account" msgid "Amount" msgstr "Аккаунт" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 #, fuzzy #| msgid "Comment" msgid "Send Comment" msgstr "Комментарий" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "Комментарий" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "Уведомить упомянутых пользователей по электронной почте." -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 msgid "" "Topic: (relevant to problem,\n" " click " @@ -107,15 +107,15 @@ msgstr "" " добавить, если вы не можете найти " "нужную тему.)" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "Тема:" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -125,34 +125,34 @@ msgid "" "and logistics.\"" msgstr "" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr " Персональный (запись видна только выбранным людям)" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "Язык ввода (язык введенного вами текста) " -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 #, fuzzy #| msgid "Subject:" msgid "Problem category:" msgstr "Тема:" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, здесьналичие аналогичной проблемы.) " -#: src/apps/core/forms.py:331 +#: src/apps/core/forms.py:353 msgid "" "Description: (e.g., Many people in the world lack clean potable " "water.)" @@ -171,48 +171,48 @@ msgstr "" "Описание: (например, Многие люди не имеют доступа к чистой питьевой " "воде.)" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 #, fuzzy #| msgid "Category: (of the problem)" msgid "Origin: (of the source)" msgstr "Категория : (проблемы)" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" @@ -220,48 +220,48 @@ msgstr "" "Название: (например, \"Первая попытка сборки солнечной батареи.\", " "используемое в заголовке.)" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "Название Вашей работы." -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "Описание: (подробно об основной работе.)" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "Небольшое описание моей работы." -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "Файл: (можно загрузить файл с описанием вашей работы)" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "Идентификация головной работы: (эквивалент к другой работе )" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "выборочно" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "Цели" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" "Название: (например, \"Солнечный конденсатор\", используемое в " "заголовке.)" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" @@ -270,31 +270,31 @@ msgstr "" "эффекта Пельтье для извлечения воды из воздуха.\", отображается как " "подзаголовок.)" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "Описание: (написать подробное описание)" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "Поделиться с:" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" "Этап: (например, \"сборка солнечных панелей\", используемый в " "заголовке.)" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "Введите название этапа." -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" @@ -302,7 +302,7 @@ msgstr "" "Цель: (опишите условия, при которых этап будет считаться \"завершенным" "\")" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -316,7 +316,7 @@ msgstr "" "-Создает ожидаемую электрическую мощность\n" "- Проходит определенные тесты на надежность." -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" @@ -324,7 +324,7 @@ msgstr "" "Приоритет: (эквивалент, например, 1,2,3.. - используется для " "упорядочения, меньшее число означает что этап должен быть закончен раньше)" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "люди 1\\3, дней 10\\20, долларов 50\\70" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" "Задача: (например, \"Покупка солнечных батарей\", текст в заголовке.)" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "Введите название задачи." -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" @@ -374,44 +374,44 @@ msgstr "" "Приоритет: (число, например, 1,2,3 .. - используется для заказа, " "меньшее число означает, что задача должна быть выполнена раньше)" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "Добавить & Перейти" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "определение, например, «космический полет за пределы галактики\"" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "Цель" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "Идея" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "Участники" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "Название: (например, \"Проект солнечной воды\".)" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -424,11 +424,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "Результат:: (Опишите, что вы ожидаете получить.)" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -436,11 +436,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "Новый коммент" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -449,7 +449,7 @@ msgstr "Новый коммент" msgid "edit" msgstr "редактировать" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -457,31 +457,31 @@ msgstr "редактировать" msgid "delete" msgstr "удалить" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "ответить" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 #, fuzzy #| msgid "edit" msgid "credit" msgstr "редактировать" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "Пригласить друга помочь!" @@ -524,10 +524,10 @@ msgstr "аппарат, предназначенный для работы в к #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "" @@ -631,14 +631,14 @@ msgstr "перевод:" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "" @@ -661,7 +661,7 @@ msgstr "поделиться с:" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "Идеи" @@ -691,7 +691,7 @@ msgstr "хотим:" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "Планы" @@ -1051,12 +1051,12 @@ msgstr "Хорватский" msgid "Japanese" msgstr "Японский" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "Открытые данные" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "Открытый код" @@ -1208,7 +1208,7 @@ msgstr "" "Вы подтверждаете, что это адрес электронной почты%(email)s принадлежит данному пользователю %(user_display)s." -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "Войти" @@ -1444,25 +1444,25 @@ msgstr "" "Примечание:Вы все еще можете change изменить свой адрес электронной почты.." -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "Решаем проблемы" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" -msgstr "Содержание" +msgstr "Государственно" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "О проекте" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "Выход" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" -msgstr "Входящие" +msgstr "Частное" #: src/templates/home.html:21 msgid "invitations" @@ -1484,50 +1484,44 @@ msgstr "Написать" msgid "Plan" msgstr "План" -#: src/templates/home.html:57 +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" +msgstr "Поиск" + +#: src/templates/home.html:59 msgid "Needs" msgstr "Потребности" -#: src/templates/home.html:58 +#: src/templates/home.html:62 msgid "share a need" msgstr "поделиться необходимость" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" -msgstr "(последний комментарий " - -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" -msgstr "часа назад)" - -#: src/templates/home.html:112 +#: src/templates/home.html:64 +msgid "write an open letter" +msgstr "написать открытое письмо" + +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "У вас не определены потребности" -#: src/templates/home.html:113 +#: src/templates/home.html:120 #, fuzzy #| msgid "define a need" msgid "Define a need" msgstr "Определить потребность" -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "... или смотрите." -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 #, fuzzy #| msgid "" #| "\n" @@ -1552,31 +1546,31 @@ msgstr "" "омлет на завтрак каждое утро.

\n" " " -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "определите проблему" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "подробнее ..." -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr " У вас нету определенной цели!" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "Добавить проблему" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "содержание" -#: src/templates/home.html:195 +#: src/templates/home.html:197 #, fuzzy #| msgid "" #| "\n" @@ -1602,19 +1596,19 @@ msgstr "" "омлет на завтрак каждое утро.

\n" " " -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "предложить решение" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "У вас нету определенных идей." -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "Добавить решение" -#: src/templates/home.html:281 +#: src/templates/home.html:282 #, fuzzy #| msgid "" #| "\n" @@ -1654,7 +1648,7 @@ msgstr "" "омлета

\n" " " -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "начать проект" @@ -1692,15 +1686,15 @@ msgstr "" msgid "break it down" msgstr "разделите на этапы" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "У вас еще нету задач" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "Начните проект, и добавите его этапы" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1732,23 +1726,23 @@ msgstr "" " ...\n" " " -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "Задачи" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "выполните" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "У вас нету задач." -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "Выберите этап для добавления задачи" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1763,27 +1757,27 @@ msgstr "" " ...\n" " " -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "Работа" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "сделал это" -#: src/templates/home.html:624 +#: src/templates/home.html:621 #, fuzzy #| msgid "Oops! You have no goals!" msgid "Oops! You have no works!" msgstr " У вас нету определенной цели!" -#: src/templates/home.html:625 +#: src/templates/home.html:622 #, fuzzy #| msgid "Choose a milestone to add tasks" msgid "Choose a task to add works" msgstr "Выберите этап для добавления задачи" -#: src/templates/home.html:628 +#: src/templates/home.html:625 #, fuzzy #| msgid "" #| "\n" @@ -1806,7 +1800,7 @@ msgstr "" " ...\n" " " -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "Экономика для человека" @@ -1954,10 +1948,6 @@ msgstr "" msgid "Publishing problems" msgstr "" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "Поиск" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "Сброс фильтра" @@ -1978,6 +1968,12 @@ msgstr "Адрес электронной почты и / или пароль у msgid "Remember Me" msgstr "Запомнить" +#~ msgid "(last commented" +#~ msgstr "(последний комментарий " + +#~ msgid "hours ago)" +#~ msgstr "часа назад)" + #~ msgid "Select the users to share with:" #~ msgstr "Пользователь, с которым вы хотите поделиться:" diff --git a/src/locale/uk/LC_MESSAGES/django.po b/src/locale/uk/LC_MESSAGES/django.po index ff24eee..5bd55eb 100644 --- a/src/locale/uk/LC_MESSAGES/django.po +++ b/src/locale/uk/LC_MESSAGES/django.po @@ -3,14 +3,14 @@ # This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # -#: src/apps/core/forms.py:199 src/apps/core/forms.py:330 -#: src/apps/core/forms.py:333 src/apps/core/forms.py:1010 +#: src/apps/core/forms.py:219 src/apps/core/forms.py:352 +#: src/apps/core/forms.py:355 src/apps/core/forms.py:1043 #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,31 +21,31 @@ msgstr "" "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -57,32 +57,32 @@ msgid "" " estimates." msgstr "" -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "" -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 msgid "" "Topic: (relevant to problem,\n" " click " @@ -90,15 +90,15 @@ msgid "" " add if you can't find it.)" msgstr "" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -108,32 +108,32 @@ msgid "" "and logistics.\"" msgstr "" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "" -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -274,91 +274,91 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -371,11 +371,11 @@ msgid "" " - 150 USD for this project" msgstr "" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -383,11 +383,11 @@ msgid "" "published on GitHub, so others could easily replicate." msgstr "" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -396,7 +396,7 @@ msgstr "" msgid "edit" msgstr "" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -404,29 +404,29 @@ msgstr "" msgid "delete" msgstr "" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "" @@ -469,10 +469,10 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "" @@ -574,14 +574,14 @@ msgstr "" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "" @@ -604,7 +604,7 @@ msgstr "" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "" @@ -634,7 +634,7 @@ msgstr "" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "" @@ -982,12 +982,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "" @@ -1122,7 +1122,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "" @@ -1330,23 +1330,23 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" msgstr "" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" msgstr "" @@ -1370,48 +1370,42 @@ msgstr "" msgid "Plan" msgstr "" -#: src/templates/home.html:57 -msgid "Needs" +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" msgstr "" -#: src/templates/home.html:58 -msgid "share a need" +#: src/templates/home.html:59 +msgid "Needs" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" +#: src/templates/home.html:62 +msgid "share a need" msgstr "" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" +#: src/templates/home.html:64 +msgid "write an open letter" msgstr "" -#: src/templates/home.html:112 +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "" -#: src/templates/home.html:113 +#: src/templates/home.html:120 msgid "Define a need" msgstr "" -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1421,31 +1415,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1456,19 +1450,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1481,7 +1475,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "" @@ -1510,15 +1504,15 @@ msgstr "" msgid "break it down" msgstr "" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1536,23 +1530,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1561,23 +1555,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "" -#: src/templates/home.html:624 +#: src/templates/home.html:621 msgid "Oops! You have no works!" msgstr "" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1586,7 +1580,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "" @@ -1717,10 +1711,6 @@ msgstr "" msgid "Publishing problems" msgstr "" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" diff --git a/src/locale/zh_CN/LC_MESSAGES/django.mo b/src/locale/zh_Hans/LC_MESSAGES/django.mo similarity index 66% rename from src/locale/zh_CN/LC_MESSAGES/django.mo rename to src/locale/zh_Hans/LC_MESSAGES/django.mo index 980af7c..942e08d 100644 Binary files a/src/locale/zh_CN/LC_MESSAGES/django.mo and b/src/locale/zh_Hans/LC_MESSAGES/django.mo differ diff --git a/src/locale/zh_CN/LC_MESSAGES/django.po b/src/locale/zh_Hans/LC_MESSAGES/django.po similarity index 85% rename from src/locale/zh_CN/LC_MESSAGES/django.po rename to src/locale/zh_Hans/LC_MESSAGES/django.po index 2745081..2c1886f 100644 --- a/src/locale/zh_CN/LC_MESSAGES/django.po +++ b/src/locale/zh_Hans/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-01-10 15:52-0800\n" -"PO-Revision-Date: 2016-01-11 01:55+0200\n" +"POT-Creation-Date: 2016-01-16 08:10-0800\n" +"PO-Revision-Date: 2016-01-16 18:34+0200\n" "Last-Translator: \n" "Language-Team: \n" "Language: zh_CN\n" @@ -17,31 +17,31 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "X-Generator: Poedit 1.8.6\n" -#: src/apps/core/forms.py:69 src/apps/core/forms.py:163 -#: src/apps/core/forms.py:287 src/apps/core/forms.py:513 -#: src/apps/core/forms.py:654 src/apps/core/forms.py:791 -#: src/apps/core/forms.py:919 src/apps/core/forms.py:1181 +#: src/apps/core/forms.py:69 src/apps/core/forms.py:183 +#: src/apps/core/forms.py:309 src/apps/core/forms.py:539 +#: src/apps/core/forms.py:683 src/apps/core/forms.py:822 +#: src/apps/core/forms.py:952 src/apps/core/forms.py:1217 msgid "Create" msgstr "创造" -#: src/apps/core/forms.py:81 src/apps/core/forms.py:139 -#: src/apps/core/forms.py:233 src/apps/core/forms.py:378 -#: src/apps/core/forms.py:452 src/apps/core/forms.py:587 -#: src/apps/core/forms.py:730 src/apps/core/forms.py:862 -#: src/apps/core/forms.py:1062 src/apps/core/forms.py:1101 +#: src/apps/core/forms.py:91 src/apps/core/forms.py:159 +#: src/apps/core/forms.py:253 src/apps/core/forms.py:400 +#: src/apps/core/forms.py:476 src/apps/core/forms.py:613 +#: src/apps/core/forms.py:759 src/apps/core/forms.py:893 +#: src/apps/core/forms.py:1095 src/apps/core/forms.py:1134 #: src/apps/users/forms.py:61 msgid "Update" msgstr "更新" -#: src/apps/core/forms.py:96 src/apps/payments/forms.py:83 +#: src/apps/core/forms.py:116 src/apps/payments/forms.py:83 msgid "USD" msgstr "" -#: src/apps/core/forms.py:97 src/apps/payments/forms.py:84 +#: src/apps/core/forms.py:117 src/apps/payments/forms.py:84 msgid "EUR" msgstr "" -#: src/apps/core/forms.py:106 +#: src/apps/core/forms.py:126 msgid "" "Comment (to claim hours, just\n" " enclose a number within curly braces, " @@ -59,33 +59,33 @@ msgstr "" " 为了提到需要的小时数的估计\n" " ，请用问号，比如{?1.5}。" -#: src/apps/core/forms.py:111 +#: src/apps/core/forms.py:131 msgid "" "Notify mentioned users (e.g., Hi [User], how are you?) by e-mail." msgstr "" "对提到的用户发给通知到邮箱 (比如，您好 [用户名]，您最近怎么样？)" -#: src/apps/core/forms.py:112 +#: src/apps/core/forms.py:132 msgid "Amount" msgstr "数额" -#: src/apps/core/forms.py:113 +#: src/apps/core/forms.py:133 msgid "Currency" msgstr "货币" -#: src/apps/core/forms.py:117 +#: src/apps/core/forms.py:137 msgid "Send Comment" msgstr "发给评论" -#: src/apps/core/forms.py:134 +#: src/apps/core/forms.py:154 msgid "Comment" msgstr "写评论" -#: src/apps/core/forms.py:135 +#: src/apps/core/forms.py:155 msgid "Notify mentioned users by e-mail." msgstr "发给评论到提到的用户的邮箱" -#: src/apps/core/forms.py:194 +#: src/apps/core/forms.py:214 #, fuzzy msgid "" "Topic: (relevant to problem,\n" @@ -98,15 +98,15 @@ msgstr "" "点击这里\n" " 附加新的对象)" -#: src/apps/core/forms.py:197 +#: src/apps/core/forms.py:217 msgid "Subject:" msgstr "主题：" -#: src/apps/core/forms.py:198 +#: src/apps/core/forms.py:218 msgid "e.g., \"Hi friends, who would also want a spaceship?\"" msgstr "如：你们好，小伙伴们，谁也在想有个宇宙飞船？" -#: src/apps/core/forms.py:200 +#: src/apps/core/forms.py:220 msgid "" "e.g., \"I have been dreaming about travelling to explore other planets since " "childhood. I would enjoy going on a long journey to the unknown together " @@ -119,32 +119,32 @@ msgstr "" "长旅程。这并非不可能。谁想加入这个计划，和我一起尝试从物理规律到后勤准备考虑" "所有可能的方法去实现它。" -#: src/apps/core/forms.py:201 src/apps/core/forms.py:334 -#: src/apps/core/forms.py:539 src/apps/core/forms.py:684 -#: src/apps/core/forms.py:815 src/apps/core/forms.py:1222 +#: src/apps/core/forms.py:221 src/apps/core/forms.py:356 +#: src/apps/core/forms.py:565 src/apps/core/forms.py:713 +#: src/apps/core/forms.py:846 src/apps/core/forms.py:1258 msgid "" "Personal (makes the entry visible only to a chosen set of people)" msgstr "私人 (把发布分享只跟您选择的用户)" -#: src/apps/core/forms.py:202 src/apps/core/forms.py:252 -#: src/apps/core/forms.py:335 src/apps/core/forms.py:415 -#: src/apps/core/forms.py:475 src/apps/core/forms.py:540 -#: src/apps/core/forms.py:610 src/apps/core/forms.py:685 -#: src/apps/core/forms.py:751 src/apps/core/forms.py:816 -#: src/apps/core/forms.py:884 src/apps/core/forms.py:938 -#: src/apps/core/forms.py:1118 src/apps/core/forms.py:1223 +#: src/apps/core/forms.py:222 src/apps/core/forms.py:273 +#: src/apps/core/forms.py:357 src/apps/core/forms.py:438 +#: src/apps/core/forms.py:499 src/apps/core/forms.py:566 +#: src/apps/core/forms.py:636 src/apps/core/forms.py:714 +#: src/apps/core/forms.py:780 src/apps/core/forms.py:847 +#: src/apps/core/forms.py:915 src/apps/core/forms.py:971 +#: src/apps/core/forms.py:1151 src/apps/core/forms.py:1259 msgid "Input Language (the language you used to compose this post) " msgstr "输入语言 (选择您撰写这篇文的主要的语言) " -#: src/apps/core/forms.py:325 +#: src/apps/core/forms.py:347 msgid "Problem category:" msgstr "问题的分类" -#: src/apps/core/forms.py:326 +#: src/apps/core/forms.py:348 msgid "Related Need: (Optional)" msgstr "有关的需要 （可选）" -#: src/apps/core/forms.py:327 +#: src/apps/core/forms.py:349 msgid "" "Title: (e.g., Potable Water\n" " Shortage, 有没有类似的问题\n" " 已经被下定义)" -#: src/apps/core/forms.py:331 +#: src/apps/core/forms.py:353 msgid "" "Description: (e.g., Many people in the world lack clean potable " "water.)" msgstr "描写: (比如，世界上有多人缺乏清洁饮用水)" -#: src/apps/core/forms.py:337 src/apps/core/forms.py:417 -#: src/apps/core/forms.py:476 src/apps/core/forms.py:541 -#: src/apps/core/forms.py:611 src/apps/core/forms.py:688 -#: src/apps/core/forms.py:752 src/apps/core/forms.py:817 -#: src/apps/core/forms.py:885 src/apps/core/forms.py:939 -#: src/apps/core/forms.py:1119 src/apps/core/forms.py:1224 +#: src/apps/core/forms.py:359 src/apps/core/forms.py:440 +#: src/apps/core/forms.py:500 src/apps/core/forms.py:567 +#: src/apps/core/forms.py:637 src/apps/core/forms.py:717 +#: src/apps/core/forms.py:781 src/apps/core/forms.py:848 +#: src/apps/core/forms.py:916 src/apps/core/forms.py:972 +#: src/apps/core/forms.py:1152 src/apps/core/forms.py:1260 msgid "" "This is a link (check if you are only linking to existing content)" msgstr "" "这是个链接 (如果您不是这个内容的作者而且只附加这个内容从其它的地方，请" "选择这个)" -#: src/apps/core/forms.py:338 src/apps/core/forms.py:418 -#: src/apps/core/forms.py:477 src/apps/core/forms.py:542 -#: src/apps/core/forms.py:612 src/apps/core/forms.py:689 -#: src/apps/core/forms.py:753 src/apps/core/forms.py:818 -#: src/apps/core/forms.py:886 src/apps/core/forms.py:940 -#: src/apps/core/forms.py:1120 src/apps/core/forms.py:1225 +#: src/apps/core/forms.py:360 src/apps/core/forms.py:441 +#: src/apps/core/forms.py:501 src/apps/core/forms.py:568 +#: src/apps/core/forms.py:638 src/apps/core/forms.py:718 +#: src/apps/core/forms.py:782 src/apps/core/forms.py:849 +#: src/apps/core/forms.py:917 src/apps/core/forms.py:973 +#: src/apps/core/forms.py:1153 src/apps/core/forms.py:1261 msgid "Origin: (of the source)" msgstr "来自: (输入网络地址)" -#: src/apps/core/forms.py:339 src/apps/core/forms.py:419 -#: src/apps/core/forms.py:478 src/apps/core/forms.py:536 -#: src/apps/core/forms.py:543 src/apps/core/forms.py:613 -#: src/apps/core/forms.py:690 src/apps/core/forms.py:754 -#: src/apps/core/forms.py:819 src/apps/core/forms.py:887 -#: src/apps/core/forms.py:941 src/apps/core/forms.py:1121 -#: src/apps/core/forms.py:1226 +#: src/apps/core/forms.py:361 src/apps/core/forms.py:442 +#: src/apps/core/forms.py:502 src/apps/core/forms.py:562 +#: src/apps/core/forms.py:569 src/apps/core/forms.py:639 +#: src/apps/core/forms.py:719 src/apps/core/forms.py:783 +#: src/apps/core/forms.py:850 src/apps/core/forms.py:918 +#: src/apps/core/forms.py:974 src/apps/core/forms.py:1154 +#: src/apps/core/forms.py:1262 msgid "http://" msgstr "" -#: src/apps/core/forms.py:340 src/apps/core/forms.py:420 +#: src/apps/core/forms.py:362 src/apps/core/forms.py:443 msgid "" "This is a history (check if you are documenting a problem of the past)" msgstr "这是历史 (如果你要记录个历史上的过去的问题，请选择这个)" -#: src/apps/core/forms.py:479 src/apps/core/forms.py:544 +#: src/apps/core/forms.py:503 src/apps/core/forms.py:570 msgid "" "This is a history (check if you are documenting a historical work)" msgstr "这是历史 (如果你要记录个历史上的过去的工作，请选择这个)" -#: src/apps/core/forms.py:531 +#: src/apps/core/forms.py:557 msgid "" "Name: (e.g., \"First attempt to assemble solar cells.\", used in " "title.)" msgstr "" -#: src/apps/core/forms.py:532 +#: src/apps/core/forms.py:558 msgid "Give a title to your work." msgstr "" -#: src/apps/core/forms.py:533 +#: src/apps/core/forms.py:559 msgid "Description: (details about the work, used as body.)" msgstr "" -#: src/apps/core/forms.py:534 +#: src/apps/core/forms.py:560 msgid "Here is a little story of my work." msgstr "" -#: src/apps/core/forms.py:535 +#: src/apps/core/forms.py:561 msgid "File: (you can upload a file describing your work)" msgstr "" -#: src/apps/core/forms.py:537 +#: src/apps/core/forms.py:563 msgid "Parent Work Id: (integer referring to other work)" msgstr "" -#: src/apps/core/forms.py:538 +#: src/apps/core/forms.py:564 msgid "optional" msgstr "" -#: src/apps/core/forms.py:614 src/apps/core/forms.py:691 +#: src/apps/core/forms.py:640 src/apps/core/forms.py:720 msgid "" "This is a history (check if you are documenting an idea of the past)" msgstr "这是历史 (如果你要记录个历史上的过去的思路，请选择这个)" -#: src/apps/core/forms.py:679 src/apps/core/templates/goal/list2.html.py:6 +#: src/apps/core/forms.py:708 src/apps/core/templates/goal/list2.html.py:6 #: src/apps/core/templates/goal/list2.html:9 -#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:134 +#: src/apps/core/templates/need/detail.html:107 src/templates/home.html:137 msgid "Goals" msgstr "目标" -#: src/apps/core/forms.py:681 +#: src/apps/core/forms.py:710 msgid "Name: (e.g., \"Solar Water Condenser\", used in title.)" msgstr "标题: (比如，太阳能水冷凝器)" -#: src/apps/core/forms.py:682 +#: src/apps/core/forms.py:711 msgid "" "Summary: (e.g., \"Use solar panels and Peltier effect to extract " "water from air.\", appears as subtitle.)" msgstr "摘要: (比如，使用太阳能电池板和珀尔帖效应从空气中提取水)" -#: src/apps/core/forms.py:683 +#: src/apps/core/forms.py:712 msgid "Description: (write full description here, used as body.)" msgstr "描写: (写细节关于思路)" -#: src/apps/core/forms.py:687 src/apps/core/forms.py:1214 +#: src/apps/core/forms.py:716 src/apps/core/forms.py:1250 msgid "Share with:" msgstr "对谁可见：" -#: src/apps/core/forms.py:755 src/apps/core/forms.py:820 +#: src/apps/core/forms.py:784 src/apps/core/forms.py:851 msgid "" "This is a history (check if you are documenting a milestone of the " "past)" msgstr "这是历史 (如果你要记录个历史上的过去的步骤，请选择这个)" -#: src/apps/core/forms.py:806 +#: src/apps/core/forms.py:837 msgid "Milestone: (e.g., \"assemble solar panels\", used in title.)" msgstr "" -#: src/apps/core/forms.py:807 +#: src/apps/core/forms.py:838 msgid "Type the name of the milestone." msgstr "" -#: src/apps/core/forms.py:808 +#: src/apps/core/forms.py:839 msgid "" "Objective: (describe conditions, when you will consider the milestone " "to be 'achieved')" msgstr "" -#: src/apps/core/forms.py:809 +#: src/apps/core/forms.py:840 msgid "" "Example:\n" "\n" @@ -291,92 +291,92 @@ msgid "" "- Passes certain tests of reliability." msgstr "" -#: src/apps/core/forms.py:810 +#: src/apps/core/forms.py:841 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the milestone has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:811 +#: src/apps/core/forms.py:842 msgid "" "Investables: (e.g., enumerate the ranges of quantities you expect to " "invest on this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:812 +#: src/apps/core/forms.py:843 msgid "people 1\\3, days 10\\20, usd 50\\70" msgstr "" -#: src/apps/core/forms.py:813 +#: src/apps/core/forms.py:844 msgid "" "Deliverables: (e.g., enumerate the ranges of quantities you expect to " "have by completion of this milestone in IDL syntax, used used for value computation.)" msgstr "" -#: src/apps/core/forms.py:814 +#: src/apps/core/forms.py:845 msgid "complete solar assembly drawings 0\\1, solar cell assembly 1\\2" msgstr "" -#: src/apps/core/forms.py:888 src/apps/core/forms.py:942 +#: src/apps/core/forms.py:919 src/apps/core/forms.py:975 msgid "" "This is a history (check if you are documenting a historical task)" msgstr "这是历史 (如果你要记录个历史上的过去的任务，请选择这个)" -#: src/apps/core/forms.py:935 +#: src/apps/core/forms.py:968 msgid "Task: (e.g., \"Purchase solar cells\", text in title.)" msgstr "" -#: src/apps/core/forms.py:936 +#: src/apps/core/forms.py:969 msgid "Type the name of the task." msgstr "" -#: src/apps/core/forms.py:937 +#: src/apps/core/forms.py:970 msgid "" "Priority: (integer, e.g., 1,2,3.. - used for ordering, smaller number " "means the task has to be done earlier)" msgstr "" -#: src/apps/core/forms.py:995 src/apps/core/forms.py:1001 +#: src/apps/core/forms.py:1028 src/apps/core/forms.py:1034 msgid "Add & Go" msgstr "进行" -#: src/apps/core/forms.py:1024 +#: src/apps/core/forms.py:1057 msgid "definition, e.g., 'spaceflight beyond the bounderies of galaxies'" msgstr "怎么下定义？ 比如《在星系间的空间旅行》" -#: src/apps/core/forms.py:1122 src/apps/core/forms.py:1227 +#: src/apps/core/forms.py:1155 src/apps/core/forms.py:1263 msgid "" "This is a history (check if you are documenting a project of the past)" msgstr "这是历史 (如果你要记录个历史上的过去的计划，请选择这个)" -#: src/apps/core/forms.py:1209 src/apps/core/templates/idea/create.html.py:16 +#: src/apps/core/forms.py:1245 src/apps/core/templates/idea/create.html.py:16 #: src/templates/home.html:37 msgid "Goal" msgstr "目标" -#: src/apps/core/forms.py:1211 src/apps/core/templates/plan/create.html.py:16 +#: src/apps/core/forms.py:1247 src/apps/core/templates/plan/create.html.py:16 #: src/templates/home.html:38 msgid "Idea" msgstr "思路" -#: src/apps/core/forms.py:1213 +#: src/apps/core/forms.py:1249 msgid "Members" msgstr "成员" -#: src/apps/core/forms.py:1216 +#: src/apps/core/forms.py:1252 msgid "Name: (e.g., \"Solar Water Project\".)" msgstr "项目名: (比如，太阳水项目)" -#: src/apps/core/forms.py:1218 +#: src/apps/core/forms.py:1254 msgid "" "Situation: (Describe your current situation by listing the things " "that you have, including access.)" msgstr "" "情况: (描写您的现实情况，包括你的地方，有关的财产，对资源的访问)" -#: src/apps/core/forms.py:1219 +#: src/apps/core/forms.py:1255 msgid "" "Example:\n" "\n" @@ -398,11 +398,11 @@ msgstr "" "- 车\n" "- 1500人民币" -#: src/apps/core/forms.py:1220 +#: src/apps/core/forms.py:1256 msgid "Deliverable: (Describe what do you expect to get.)" msgstr "目的地: (描写您期待的后果)" -#: src/apps/core/forms.py:1221 +#: src/apps/core/forms.py:1257 msgid "" "Example:\n" "\n" @@ -413,11 +413,11 @@ msgstr "" "\n" "可用的太阳能水冷凝器，高质量的开源的设计在GitHub上，为了别人也可以创造它" -#: src/apps/core/templates/comment/list.html:46 +#: src/apps/core/templates/comment/list.html:45 msgid "New comment" msgstr "新的评论" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -426,7 +426,7 @@ msgstr "新的评论" msgid "edit" msgstr "编辑" -#: src/apps/core/templates/comment/list.html:82 +#: src/apps/core/templates/comment/list.html:85 #: src/apps/core/templates/goal/detail.html:94 #: src/apps/core/templates/idea/detail.html:99 #: src/apps/core/templates/need/detail.html:94 @@ -434,29 +434,29 @@ msgstr "编辑" msgid "delete" msgstr "删除" -#: src/apps/core/templates/comment/list.html:84 +#: src/apps/core/templates/comment/list.html:87 msgid "reply" msgstr "回复" -#: src/apps/core/templates/comment/list.html:94 -#: src/apps/core/templates/comment/list.html:99 -#: src/apps/core/templates/comment/list.html:104 -#: src/apps/core/templates/comment/list.html:110 +#: src/apps/core/templates/comment/list.html:97 +#: src/apps/core/templates/comment/list.html:102 +#: src/apps/core/templates/comment/list.html:107 +#: src/apps/core/templates/comment/list.html:113 msgid "Vote Up" msgstr "投了" -#: src/apps/core/templates/comment/list.html:95 -#: src/apps/core/templates/comment/list.html:100 -#: src/apps/core/templates/comment/list.html:105 -#: src/apps/core/templates/comment/list.html:111 +#: src/apps/core/templates/comment/list.html:98 +#: src/apps/core/templates/comment/list.html:103 +#: src/apps/core/templates/comment/list.html:108 +#: src/apps/core/templates/comment/list.html:114 msgid "Vote Down" msgstr "否决" -#: src/apps/core/templates/comment/list.html:142 +#: src/apps/core/templates/comment/list.html:145 msgid "credit" msgstr "信用" -#: src/apps/core/templates/comment/list.html:177 +#: src/apps/core/templates/comment/list.html:180 msgid "Invite a friend to help!" msgstr "邀请好友帮忙！" @@ -499,10 +499,10 @@ msgstr "在太空中航行的工具" #: src/apps/core/templates/plan/detail.html:136 #: src/apps/core/templates/step/detail.html:94 #: src/apps/core/templates/task/detail.html:82 -#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:81 -#: src/templates/home.html.py:158 src/templates/home.html:239 -#: src/templates/home.html.py:325 src/templates/home.html:412 -#: src/templates/home.html.py:501 src/templates/home.html:586 +#: src/apps/core/templates/work/detail.html:102 src/templates/home.html:88 +#: src/templates/home.html.py:160 src/templates/home.html:240 +#: src/templates/home.html.py:325 src/templates/home.html:411 +#: src/templates/home.html.py:499 src/templates/home.html:583 msgid "link" msgstr "链接" @@ -607,14 +607,14 @@ msgstr "翻译:" #: src/apps/core/templates/plan/detail.html:102 #: src/apps/core/templates/step/detail.html:54 #: src/apps/core/templates/task/detail.html:54 -#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:79 -#: src/templates/home.html:85 src/templates/home.html.py:156 -#: src/templates/home.html:162 src/templates/home.html.py:237 -#: src/templates/home.html:243 src/templates/home.html.py:323 -#: src/templates/home.html:329 src/templates/home.html.py:410 -#: src/templates/home.html:416 src/templates/home.html.py:499 -#: src/templates/home.html:505 src/templates/home.html.py:584 -#: src/templates/home.html:590 +#: src/apps/core/templates/work/detail.html:55 src/templates/home.html.py:86 +#: src/templates/home.html:92 src/templates/home.html.py:158 +#: src/templates/home.html:164 src/templates/home.html.py:238 +#: src/templates/home.html:244 src/templates/home.html.py:323 +#: src/templates/home.html:329 src/templates/home.html.py:409 +#: src/templates/home.html:415 src/templates/home.html.py:497 +#: src/templates/home.html:503 src/templates/home.html.py:581 +#: src/templates/home.html:587 msgid "historical" msgstr "历史的" @@ -637,7 +637,7 @@ msgstr "谁可见:" #: src/apps/core/templates/goal/detail.html:108 #: src/apps/core/templates/idea/list2.html:6 -#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:210 +#: src/apps/core/templates/idea/list2.html:9 src/templates/home.html.py:212 msgid "Ideas" msgstr "思路" @@ -667,7 +667,7 @@ msgstr "需要:" #: src/apps/core/templates/idea/detail.html:113 #: src/apps/core/templates/plan/list2.html:6 -#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:297 +#: src/apps/core/templates/plan/list2.html:9 src/templates/home.html.py:298 msgid "Plans" msgstr "计划" @@ -1021,12 +1021,12 @@ msgstr "" msgid "Japanese" msgstr "" -#: src/templates/about.html:55 src/templates/base.html.py:122 +#: src/templates/about.html:55 src/templates/base.html.py:116 #: src/templates/data.html:10 msgid "Open Data" msgstr "开放数据" -#: src/templates/about.html:56 src/templates/base.html.py:124 +#: src/templates/about.html:56 src/templates/base.html.py:118 #: src/templates/dev.html:10 msgid "Open Source" msgstr "开放代码" @@ -1161,7 +1161,7 @@ msgid "" "mail address for user %(user_display)s." msgstr "" -#: src/templates/account/login.html:10 src/templates/base.html.py:152 +#: src/templates/account/login.html:10 src/templates/base.html.py:146 msgid "Sign in" msgstr "登陆" @@ -1372,25 +1372,25 @@ msgid "" "mail address." msgstr "" -#: src/templates/base.html:97 +#: src/templates/base.html:91 msgid "Solving Problems" msgstr "解决问题" -#: src/templates/base.html:129 +#: src/templates/base.html:123 msgid "public index" -msgstr "探索内容" +msgstr "公共目录" -#: src/templates/base.html:134 +#: src/templates/base.html:128 msgid "About" msgstr "关于" -#: src/templates/base.html:140 +#: src/templates/base.html:134 msgid "Logout" msgstr "登出" -#: src/templates/base.html:142 +#: src/templates/base.html:136 msgid "private inbox" -msgstr "收件箱" +msgstr "私人目录" #: src/templates/home.html:21 msgid "invitations" @@ -1412,50 +1412,44 @@ msgstr "作文" msgid "Plan" msgstr "计划" -#: src/templates/home.html:57 +#: src/templates/home.html:45 src/templates/search_form.html.py:17 +msgid "Search" +msgstr "查找" + +#: src/templates/home.html:59 msgid "Needs" msgstr "需要" -#: src/templates/home.html:58 +#: src/templates/home.html:62 msgid "share a need" msgstr "分享个需要" -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "(last commented" -msgstr "（最新的评论" - -#: src/templates/home.html:73 src/templates/home.html.py:150 -#: src/templates/home.html:229 src/templates/home.html.py:317 -#: src/templates/home.html:403 src/templates/home.html.py:492 -#: src/templates/home.html:577 -msgid "hours ago)" -msgstr "小时前）" - -#: src/templates/home.html:112 +#: src/templates/home.html:64 +msgid "write an open letter" +msgstr "写了一封公开信" + +#: src/templates/home.html:119 msgid "Oops! You have no needs!" msgstr "啊呀！您还没有需要！" -#: src/templates/home.html:113 +#: src/templates/home.html:120 #, fuzzy #| msgid "define a need" msgid "Define a need" msgstr "下定义需要..." -#: src/templates/home.html:114 src/templates/home.html.py:192 -#: src/templates/home.html:278 src/templates/home.html.py:364 -#: src/templates/home.html:451 src/templates/home.html.py:541 -#: src/templates/home.html:626 +#: src/templates/home.html:121 src/templates/home.html.py:194 +#: src/templates/home.html:279 src/templates/home.html.py:364 +#: src/templates/home.html:450 src/templates/home.html.py:539 +#: src/templates/home.html:623 msgid "...or view" msgstr "...或者看" -#: src/templates/home.html:114 +#: src/templates/home.html:121 msgid "discussion board" msgstr "" -#: src/templates/home.html:117 +#: src/templates/home.html:124 msgid "" "\n" "

Example:

\n" @@ -1465,31 +1459,31 @@ msgid "" " " msgstr "" -#: src/templates/home.html:135 +#: src/templates/home.html:138 msgid "define a problem" msgstr "下定义个问题" -#: src/templates/home.html:187 src/templates/home.html.py:272 -#: src/templates/home.html:358 src/templates/home.html.py:446 -#: src/templates/home.html:536 src/templates/home.html.py:621 +#: src/templates/home.html:189 src/templates/home.html.py:273 +#: src/templates/home.html:358 src/templates/home.html.py:445 +#: src/templates/home.html:534 src/templates/home.html.py:618 msgid "see more" msgstr "查看更多" -#: src/templates/home.html:190 +#: src/templates/home.html:192 msgid "Oops! You have no goals!" msgstr "啊呀！您还没有目标！" -#: src/templates/home.html:191 +#: src/templates/home.html:193 msgid "Add a problem" msgstr "下定义个问题" -#: src/templates/home.html:192 src/templates/home.html.py:278 -#: src/templates/home.html:364 src/templates/home.html.py:451 -#: src/templates/home.html:541 src/templates/home.html.py:626 +#: src/templates/home.html:194 src/templates/home.html.py:279 +#: src/templates/home.html:364 src/templates/home.html.py:450 +#: src/templates/home.html:539 src/templates/home.html.py:623 msgid "index" msgstr "目录" -#: src/templates/home.html:195 +#: src/templates/home.html:197 msgid "" "\n" "

Example:

\n" @@ -1500,19 +1494,19 @@ msgid "" " " msgstr "" -#: src/templates/home.html:211 +#: src/templates/home.html:213 msgid "suggest a solution" msgstr "提出解决方式" -#: src/templates/home.html:276 +#: src/templates/home.html:277 msgid "Oops! You have no ideas!" msgstr "啊呀！您还没有思路！" -#: src/templates/home.html:277 +#: src/templates/home.html:278 msgid "Add a solution" msgstr "提出解决方式" -#: src/templates/home.html:281 +#: src/templates/home.html:282 msgid "" "\n" "

Example ideas:

\n" @@ -1525,7 +1519,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:299 +#: src/templates/home.html:300 msgid "start a project" msgstr "开始个项目" @@ -1554,15 +1548,15 @@ msgstr "" msgid "break it down" msgstr "把它分解" -#: src/templates/home.html:449 +#: src/templates/home.html:448 msgid "Oops! You have no steps!" msgstr "啊呀！您还没有步骤！" -#: src/templates/home.html:450 +#: src/templates/home.html:449 msgid "Start a project to add milestones" msgstr "开始个项目，然后对它附加步骤" -#: src/templates/home.html:454 +#: src/templates/home.html:453 msgid "" "\n" "

Example:

\n" @@ -1580,23 +1574,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:474 +#: src/templates/home.html:473 msgid "Tasks" msgstr "任务" -#: src/templates/home.html:476 +#: src/templates/home.html:475 msgid "execute it" msgstr "把它执行" -#: src/templates/home.html:539 +#: src/templates/home.html:537 msgid "Oops! You have no tasks!" msgstr "" -#: src/templates/home.html:540 +#: src/templates/home.html:538 msgid "Choose a milestone to add tasks" msgstr "" -#: src/templates/home.html:543 +#: src/templates/home.html:541 msgid "" "\n" "

Example:

\n" @@ -1605,23 +1599,23 @@ msgid "" " " msgstr "" -#: src/templates/home.html:559 +#: src/templates/home.html:557 msgid "Works" msgstr "工作" -#: src/templates/home.html:561 +#: src/templates/home.html:559 msgid "did it" msgstr "做啦！" -#: src/templates/home.html:624 +#: src/templates/home.html:621 msgid "Oops! You have no works!" msgstr "啊呀！您还没有工作！" -#: src/templates/home.html:625 +#: src/templates/home.html:622 msgid "Choose a task to add works" msgstr "" -#: src/templates/home.html:628 +#: src/templates/home.html:625 msgid "" "\n" "

Example:

\n" @@ -1630,7 +1624,7 @@ msgid "" " " msgstr "" -#: src/templates/home.html:638 +#: src/templates/home.html:635 msgid "People-centric economy." msgstr "— 以人为本的经济 —" @@ -1767,10 +1761,6 @@ msgstr "" msgid "Publishing problems" msgstr "解决问题" -#: src/templates/search_form.html:17 -msgid "Search" -msgstr "查找" - #: src/templates/search_form.html:18 msgid "Reset Filter" msgstr "" @@ -1791,6 +1781,12 @@ msgstr "" msgid "Remember Me" msgstr "记住" +#~ msgid "(last commented" +#~ msgstr "（最新的评论" + +#~ msgid "hours ago)" +#~ msgstr "小时前）" + #~ msgid "Select the users to share with:" #~ msgstr "选择用户谁能看到这内容" diff --git a/src/static/css/infinity.css b/src/static/css/infinity.css index 6450819..dcf5f57 100644 --- a/src/static/css/infinity.css +++ b/src/static/css/infinity.css @@ -308,3 +308,42 @@ a:visited{ background-color: #000; border-color: #505050; } + +#scroll_arrowleft { + position:absolute; + background-image: url(/static/fonts/arrow-left.svg); + background-position-x: 50%; + background-position-y: 50%; + background-position: center; + background-size: 60px 60px; + background-repeat: no-repeat; + width: 29px; + height: 300px; + cursor: pointer; + bottom:30%; + left:2px; + float: left; + margin-left: auto; + margin-right: auto; + z-index: 1; +} + +#scroll_arrowright { + position:absolute; + background-image: url(/static/fonts/arrow-right.svg); + background-position-x: 50%; + background-position-y: 50%; + background-position: center; + background-size: 60px 60px; + background-repeat: no-repeat; + width: 29px; + height: 300px; + cursor: pointer; + bottom:30%; + right:2px; + margin-left: auto; + margin-right: auto; + z-index: 1; +} + + diff --git a/src/static/fonts/arrow-left.svg b/src/static/fonts/arrow-left.svg new file mode 100644 index 0000000..c482678 --- /dev/null +++ b/src/static/fonts/arrow-left.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/static/fonts/arrow-right.svg b/src/static/fonts/arrow-right.svg new file mode 100644 index 0000000..581833e --- /dev/null +++ b/src/static/fonts/arrow-right.svg @@ -0,0 +1,7 @@ + + + + + + diff --git a/src/static/js/infinity.js b/src/static/js/infinity.js index 25e8f3a..f119c24 100644 --- a/src/static/js/infinity.js +++ b/src/static/js/infinity.js @@ -26,3 +26,17 @@ $(function() { $("#div_id_url").show(); } }); + +$(function(){ + + // Scroll screen horizontally by one screen + $('#scroll_arrowleft').on("click",function(event){ + $( "div.row-horizon" ).scrollLeft( -$(window).width() ); + event.preventDefault(); + }); + + $('#scroll_arrowright').on("click",function(event){ + $( "div.row-horizon" ).scrollLeft( $(window).width() ); + event.preventDefault(); + }); +}); diff --git a/src/templates/base.html b/src/templates/base.html index afe889b..9f5576c 100644 --- a/src/templates/base.html +++ b/src/templates/base.html @@ -119,8 +119,9 @@ {% else %} {% endif %} {% if request.get_full_path == "/!" %} +
  • {% trans "public index" %}
    • {% else %} -
  • {% trans "public index" %}
    • +
  • {% trans "public index" %}
    • {% endif %} {% if request.user.is_authenticated %} {% else %} @@ -133,7 +134,11 @@
  • {% trans "Logout" %}
    • + {% if request.get_full_path == "/i" %} +
  • {% trans "private inbox" %}
    • + {% else %}
  • {% trans "private inbox" %}
    • + {% endif %}
  • [{{ request.user }}]
    • diff --git a/src/templates/home.html b/src/templates/home.html index 7dc106c..9cbd846 100644 --- a/src/templates/home.html +++ b/src/templates/home.html @@ -42,7 +42,9 @@
    - +
    + +
    @@ -51,13 +53,23 @@ +
    +
    +
    -{% if request.get_full_path == '/i' %} + +
    {% trans "Needs" %} -     - {% trans "share a need" %} +     - + {% if request.get_full_path == '/i' %} + {% trans "share a need" %} + {% else %} + {% trans "write an open letter" %} + {% endif %} +
    {% csrf_token %} @@ -72,7 +84,6 @@
    {% if need_list %} -

    {% trans "(last commented" %} {{ need_hours }} {% trans "hours ago)" %}

    {% for need in need_list %} {% if need.translation %} {# if need translated #} @@ -125,13 +136,9 @@ {% endif %}
    -{% endif %} + - {% if request.get_full_path == '/i' %}
    - {% else %} -
    - {% endif %}
    {% trans "Goals" %}     - {% trans "define a problem" %} @@ -149,7 +156,6 @@
    {% if goal_list %} -

    {% trans "(last commented" %} {{ goal_hours }} {% trans "hours ago)" %}

    {% for goal in goal_list %} {% if goal.translation %} {# if goal translated #} @@ -228,7 +234,6 @@
    {% if idea_list %}

    - {% trans "(last commented" %} {{ idea_hours }} {% trans "hours ago)" %}

    {% for idea in idea_list %} @@ -316,7 +321,6 @@
    {% if plan_list %} -

    {% trans "(last commented" %} {{ plan_hours }} {% trans "hours ago)" %}

    {% for plan in plan_list %} {% if plan.translation %} {# if plan translated #} @@ -402,7 +406,6 @@
    {% if step_list %} -

    {% trans "(last commented" %} {{ step_hours }} {% trans "hours ago)" %}

    {% for step in step_list %} {% if step.translation %} {# if step translated #} @@ -491,7 +494,6 @@
    {% if task_list %} -

    {% trans "(last commented" %} {{ task_hours }} {% trans "hours ago)" %}

    {% for task in task_list %} {% if task.translation %} {# if task translated #} @@ -576,7 +578,6 @@
    {% if work_list %} -

    {% trans "(last commented" %} {{ work_hours }} {% trans "hours ago)" %}

    {% for work in work_list %} {% if work.translation %} {# if task translated #} diff --git a/src/urls.py b/src/urls.py index a7f5f50..bca5e52 100644 --- a/src/urls.py +++ b/src/urls.py @@ -3,14 +3,14 @@ from django.conf import settings from django.views.generic import TemplateView -from core.views import IndexView, DefinitionCreateView, SetLanguageView +from core.views import IndexView, SetLanguageView from django.contrib import admin admin.autodiscover() urlpatterns = [ url(r'^set-lang/(?P\w+)/$', SetLanguageView.as_view(pattern_name='home'), name='lang_redirect'), - url(r'^$', DefinitionCreateView.as_view(), name='home'), + url(r'^$', IndexView.as_view(), name='home'), url(r'^[!]$', IndexView.as_view(), name='index'), url(r'^i$', IndexView.as_view(), name='inbox'), url(r'', include('apps.core.urls')),