Merge pull request #161 from NicholasSavard/fix-157_minor-translations

Fix 157 minor translations

app/businessCanvas/locale/fr/LC_MESSAGES/django.po

@@ -7,9 +7,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 13:44-0400\n"
-"PO-Revision-Date: 2016-03-22 16:23-0400\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2016-03-29 12:12-0400\n"
+"PO-Revision-Date: 2016-03-29 11:06-0400\n"
+"Last-Translator: Nicholas Savard\n"
 "Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
@@ -51,11 +51,11 @@ msgid "Comment"
 msgstr "Commentaire"
 
 #: .\app\businessCanvas\models.py:42
-msgid "Date of creation"
+msgid "Creation date"
 msgstr "Date de création"
 
 #: .\app\businessCanvas\models.py:46
-msgid "Date of updated"
+msgid "Update date"
 msgstr "Date de modification"
 
 #: .\app\businessCanvas\models.py:52
@@ -67,8 +67,8 @@ msgid "Company"
 msgstr "Compagnie"
 
 #: .\app\businessCanvas\models.py:62
-msgid "Disactivated"
-msgstr "Désactiver"
+msgid "Deactivated"
+msgstr "Désactivé"
 
 #: .\app\businessCanvas\models.py:73
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:8
@@ -82,22 +82,20 @@ msgid "Date"
 msgstr "Date"
 
 #: .\app\businessCanvas\models.py:89
-msgid "Elements of the archive"
+msgid "Archive elements"
 msgstr "Elements de l'archive"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:6
-#, fuzzy
-#| msgid "Elements of the archive"
 msgid "Delete archive"
-msgstr "Elements de l'archive"
+msgstr "Supprimer archive"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:9
-msgid "Are you sure you want to delete this archive ?"
-msgstr "Êtes-vous sûr de vouloir supprimer cette archive ?"
+msgid "Are you sure you want to delete this archive?"
+msgstr "Êtes-vous sûr de vouloir supprimer cette archive?"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:11
-msgid "create on"
-msgstr "créé le"
+msgid "Created on"
+msgstr "Créé le"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:15
 msgid "Delete"
@@ -108,11 +106,6 @@ msgid "Cancel"
 msgstr "Annuler"
 
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselement_list.html:6
-#, fuzzy
-#| msgid "Business canvas element"
-msgid "Business canvas"
-msgstr "Element du canevas modèle d'affaire"
-
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselement_list.html:133
 msgid "Business Model Canvas"
 msgstr "Canevas de modèle d'affaire"
@@ -168,11 +161,21 @@ msgid "Brainstorming Space"
 msgstr "Espace de réflexion"
 
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselementarchived_list.html:6
-#, fuzzy
-#| msgid "Business canvas element"
-msgid "Business canvas archived"
-msgstr "Element du canevas modèle d'affaire"
+msgid "Archived Business Model Canvas"
+msgstr "Canevas de modèle d'affaire archivé"
 
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselementarchived_list.html:20
 msgid "Business Model Canvas of "
 msgstr "Canevas de modèle d'affaire du "
+
+#~ msgid "Business canvas archived"
+#~ msgstr "Canevas d'affaire archivé"
+
+#~ msgid "Business canvas"
+#~ msgstr "Canevas de modèle d'affaire"
+
+#~ msgid "Date of creation"
+#~ msgstr "Date de création"
+
+#~ msgid "Elements of the archive"
+#~ msgstr "Elements de l'archive"

app/businessCanvas/locale/pt/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tableau PTBR\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-03-23 13:44-0400\n"
-"PO-Revision-Date: 2016-03-22 16:23-0400\n"
+"POT-Creation-Date: 2016-03-29 12:12-0400\n"
+"PO-Revision-Date: 2016-03-24 14:34-0400\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: pt_BR\n"
@@ -51,11 +51,13 @@ msgid "Comment"
 msgstr "Comentário"
 
 #: .\app\businessCanvas\models.py:42
-msgid "Date of creation"
-msgstr "Data de criação"
+msgid "Creation date"
+msgstr ""
 
 #: .\app\businessCanvas\models.py:46
-msgid "Date of updated"
+#, fuzzy
+#| msgid "Date of updated"
+msgid "Update date"
 msgstr "Data de atualização"
 
 #: .\app\businessCanvas\models.py:52
@@ -67,7 +69,9 @@ msgid "Company"
 msgstr "Empresa"
 
 #: .\app\businessCanvas\models.py:62
-msgid "Disactivated"
+#, fuzzy
+#| msgid "Disactivated"
+msgid "Deactivated"
 msgstr "Desativado"
 
 #: .\app\businessCanvas\models.py:73
@@ -82,8 +86,10 @@ msgid "Date"
 msgstr "Data"
 
 #: .\app\businessCanvas\models.py:89
-msgid "Elements of the archive"
-msgstr "Elementos do arquivo"
+#, fuzzy
+#| msgid "Archive"
+msgid "Archive elements"
+msgstr "Arquivo"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:6
 #, fuzzy
@@ -92,11 +98,15 @@ msgid "Delete archive"
 msgstr "Elementos do arquivo"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:9
-msgid "Are you sure you want to delete this archive ?"
+#, fuzzy
+#| msgid "Are you sure you want to delete this archive ?"
+msgid "Are you sure you want to delete this archive?"
 msgstr "Você tem certeza que quer deletar este arquivo?"
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:11
-msgid "create on"
+#, fuzzy
+#| msgid "create on"
+msgid "Created on"
 msgstr "criado em "
 
 #: .\app\businessCanvas\templates\businessCanvas\archive_confirm_delete.html:15
@@ -108,11 +118,6 @@ msgid "Cancel"
 msgstr "Cancelar"
 
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselement_list.html:6
-#, fuzzy
-#| msgid "Business canvas element"
-msgid "Business canvas"
-msgstr "Elemento do Modelo Canvas"
-
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselement_list.html:133
 msgid "Business Model Canvas"
 msgstr "Canvas do Modelo de negócio"
@@ -169,10 +174,26 @@ msgstr "Área de Braninstorming"
 
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselementarchived_list.html:6
 #, fuzzy
-#| msgid "Business canvas element"
-msgid "Business canvas archived"
-msgstr "Elemento do Modelo Canvas"
+#| msgid "Business Model Canvas"
+msgid "Archived Business Model Canvas"
+msgstr "Canvas do Modelo de negócio"
 
 #: .\app\businessCanvas\templates\businessCanvas\businesscanvaselementarchived_list.html:20
 msgid "Business Model Canvas of "
 msgstr "Canvas do Modelo de Negócio de"
+
+#, fuzzy
+#~| msgid "Business canvas element"
+#~ msgid "Business canvas archived"
+#~ msgstr "Elemento do Modelo Canvas"
+
+#, fuzzy
+#~| msgid "Business canvas element"
+#~ msgid "Business canvas"
+#~ msgstr "Elemento do Modelo Canvas"
+
+#~ msgid "Date of creation"
+#~ msgstr "Data de criação"
+
+#~ msgid "Elements of the archive"
+#~ msgstr "Elementos do arquivo"

app/businessCanvas/models.py

@@ -21,7 +21,7 @@
 
 
 # Element of the business canvas
-# Can be disactivated if it's archived
+# Can be deactivated if it's archived
 class BusinessCanvasElement(models.Model):
     class Meta:
         verbose_name = _('Business canvas element')
@@ -39,11 +39,11 @@ class Meta:
     date = models.DateTimeField(
         auto_now_add=True,
         auto_now=False,
-        verbose_name=_('Date of creation')
+        verbose_name=_('Creation date')
     )
     updated = models.DateTimeField(
         auto_now=True,
-        verbose_name=_('Date of updated')
+        verbose_name=_('Update date')
     )
     type = models.CharField(
         max_length=20,
@@ -59,7 +59,7 @@ class Meta:
     # True -> Archived | False -> Current use
     disactivated = models.BooleanField(
         default=False,
-        verbose_name=_('Disactivated')
+        verbose_name=_('Deactivated')
     )
 
     def __unicode__(self):
@@ -86,7 +86,7 @@ class Meta:
     elements = models.ManyToManyField(
         BusinessCanvasElement,
         blank=True,
-        verbose_name=_('Elements of the archive')
+        verbose_name=_('Archive elements')
     )
 
     def __unicode__(self):

app/businessCanvas/templates/businessCanvas/archive_confirm_delete.html

@@ -6,9 +6,9 @@
 {% block title %}{% trans "Delete archive" %}{% endblock %}
 {% block content %}
     <h1>{% trans "Archive" %}</h1>
-    <h1>{% trans "Are you sure you want to delete this archive ?" %}</h1>
+    <h1>{% trans "Are you sure you want to delete this archive?" %}</h1>
 
-    <p>{% trans "create on" %} : {{ archive.date}}</p>
+    <p>{% trans "Created on" %} : {{ archive.date}}</p>
 
     <form method="post" action="">
        {% csrf_token %}

app/businessCanvas/templates/businessCanvas/businesscanvaselement_list.html

@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{company}} - {% trans "Business canvas" %}{% endblock %}
+{% block title %}{{company}} - {% trans "Business Model Canvas" %}{% endblock %}
 
 {% block extrahead %}
 

app/businessCanvas/templates/businessCanvas/businesscanvaselementarchived_list.html

@@ -3,7 +3,7 @@
 {% load i18n %}
 {% load staticfiles %}
 
-{% block title %}{{company}} - {% trans "Business canvas archived" %}{% endblock %}
+{% block title %}{{company}} - {% trans "Archived Business Model Canvas" %}{% endblock %}
 
 {% block extrahead %}
 <!-- Main CSS --->

app/company/forms.py

@@ -102,7 +102,7 @@ class Meta:
     )
     name.widget.attrs.update(
         {
-            'placeholder': _(u'Name of the company')
+            'placeholder': _(u'Company name')
         }
     )
 
@@ -208,7 +208,7 @@ class Meta:
     )
 
     incubated_on = forms.DateField(
-        label=_('Incubated on'),
+        label=_('Start date'),
         required=False,
         input_formats=('%Y-%m-%d',),
         widget=forms.DateInput(
@@ -220,7 +220,7 @@ class Meta:
     )
 
     endOfIncubation = forms.DateField(
-        label=_('Incubation end on'),
+        label=_('End date'),
         required=False,
         input_formats=('%Y-%m-%d',),
         widget=forms.DateInput(