diff --git a/app/businessCanvas/locale/fr/LC_MESSAGES/django.mo b/app/businessCanvas/locale/fr/LC_MESSAGES/django.mo index 1f46913..202c609 100644 Binary files a/app/businessCanvas/locale/fr/LC_MESSAGES/django.mo and b/app/businessCanvas/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/businessCanvas/locale/fr/LC_MESSAGES/django.po b/app/businessCanvas/locale/fr/LC_MESSAGES/django.po index b975fb3..9227bd3 100644 --- a/app/businessCanvas/locale/fr/LC_MESSAGES/django.po +++ b/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" diff --git a/app/businessCanvas/locale/pt/LC_MESSAGES/django.mo b/app/businessCanvas/locale/pt/LC_MESSAGES/django.mo index 0a7f3cb..8860e37 100644 Binary files a/app/businessCanvas/locale/pt/LC_MESSAGES/django.mo and b/app/businessCanvas/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/businessCanvas/locale/pt/LC_MESSAGES/django.po b/app/businessCanvas/locale/pt/LC_MESSAGES/django.po index b181c0f..a439441 100644 --- a/app/businessCanvas/locale/pt/LC_MESSAGES/django.po +++ b/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" diff --git a/app/businessCanvas/models.py b/app/businessCanvas/models.py index f7d3656..36bc21c 100644 --- a/app/businessCanvas/models.py +++ b/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): diff --git a/app/businessCanvas/templates/businessCanvas/archive_confirm_delete.html b/app/businessCanvas/templates/businessCanvas/archive_confirm_delete.html index 7db0de1..335c486 100644 --- a/app/businessCanvas/templates/businessCanvas/archive_confirm_delete.html +++ b/app/businessCanvas/templates/businessCanvas/archive_confirm_delete.html @@ -6,9 +6,9 @@ {% block title %}{% trans "Delete archive" %}{% endblock %} {% block content %}

{% trans "Archive" %}

-

{% trans "Are you sure you want to delete this archive ?" %}

+

{% trans "Are you sure you want to delete this archive?" %}

-

{% trans "create on" %} : {{ archive.date}}

+

{% trans "Created on" %} : {{ archive.date}}

{% csrf_token %} diff --git a/app/businessCanvas/templates/businessCanvas/businesscanvaselement_list.html b/app/businessCanvas/templates/businessCanvas/businesscanvaselement_list.html index 5a8f48a..5f5716f 100644 --- a/app/businessCanvas/templates/businessCanvas/businesscanvaselement_list.html +++ b/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 %} diff --git a/app/businessCanvas/templates/businessCanvas/businesscanvaselementarchived_list.html b/app/businessCanvas/templates/businessCanvas/businesscanvaselementarchived_list.html index 467fab9..dbb71dd 100644 --- a/app/businessCanvas/templates/businessCanvas/businesscanvaselementarchived_list.html +++ b/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 %} diff --git a/app/company/forms.py b/app/company/forms.py index d788433..d60dbef 100644 --- a/app/company/forms.py +++ b/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( diff --git a/app/company/locale/fr/LC_MESSAGES/django.mo b/app/company/locale/fr/LC_MESSAGES/django.mo index 4dd6bbc..2ccb617 100644 Binary files a/app/company/locale/fr/LC_MESSAGES/django.mo and b/app/company/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/company/locale/fr/LC_MESSAGES/django.po b/app/company/locale/fr/LC_MESSAGES/django.po index d72ba19..7ee53eb 100644 --- a/app/company/locale/fr/LC_MESSAGES/django.po +++ b/app/company/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-23 13:48-0400\n" -"Last-Translator: \n" +"POT-Creation-Date: 2016-03-29 12:12-0400\n" +"PO-Revision-Date: 2016-03-24 14:48-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "" "X-Generator: Poedit 1.8.7\n" #: .\app\company\forms.py:48 .\app\company\forms.py:100 -#: .\app\company\models.py:21 .\app\company\models.py:39 +#: .\app\company\models.py:22 .\app\company\models.py:40 msgid "Name" msgstr "Nom" @@ -27,7 +27,7 @@ msgstr "Nom" msgid "Name of the new status" msgstr "Nom du nouveau statut" -#: .\app\company\forms.py:56 .\app\company\models.py:24 +#: .\app\company\forms.py:56 .\app\company\models.py:25 msgid "Comment" msgstr "Commentaire" @@ -42,14 +42,14 @@ msgid "Save" msgstr "Enregistrer" #: .\app\company\forms.py:105 -msgid "Name of the company" +msgid "Company name" msgstr "Nom de la compagnie" -#: .\app\company\forms.py:110 .\app\company\models.py:44 +#: .\app\company\forms.py:110 .\app\company\models.py:45 msgid "Logo" msgstr "Logo" -#: .\app\company\forms.py:115 .\app\company\models.py:52 +#: .\app\company\forms.py:115 .\app\company\models.py:53 msgid "Video" msgstr "Vidéo" @@ -65,7 +65,7 @@ msgstr "Site web" msgid "https://example.com" msgstr "https://exemple.com" -#: .\app\company\forms.py:135 .\app\company\models.py:84 +#: .\app\company\forms.py:135 .\app\company\models.py:85 msgid "Facebook" msgstr "Facebook" @@ -73,7 +73,7 @@ msgstr "Facebook" msgid "https://www.facebook.com/lastname.firstname" msgstr "https://www.facebook.com/nom.prenom" -#: .\app\company\forms.py:145 .\app\company\models.py:89 +#: .\app\company\forms.py:145 .\app\company\models.py:90 msgid "Twitter" msgstr "Twitter" @@ -81,7 +81,7 @@ msgstr "Twitter" msgid "https://twitter.com/username" msgstr "https://twitter.com/nomUtilisateur" -#: .\app\company\forms.py:155 .\app\company\models.py:94 +#: .\app\company\forms.py:155 .\app\company\models.py:95 msgid "Google+" msgstr "Google+" @@ -89,7 +89,7 @@ msgstr "Google+" msgid "https://plus.google.com/id" msgstr "https://plus.google.com/id" -#: .\app\company\forms.py:165 .\app\company\models.py:99 +#: .\app\company\forms.py:165 .\app\company\models.py:100 msgid "linkedIn" msgstr "linkedIn" @@ -97,7 +97,7 @@ msgstr "linkedIn" msgid "https://ca.linkedin.com/in/username" msgstr "https://ca.linkedin.com/in/nomUtilisateur" -#: .\app\company\forms.py:172 .\app\company\models.py:57 +#: .\app\company\forms.py:172 .\app\company\models.py:58 msgid "Description" msgstr "Description" @@ -110,48 +110,48 @@ msgstr "Ecrivez ici un bref résumé de votre entreprise." msgid "Incubation phase" msgstr "Phase d'incubation" -#: .\app\company\forms.py:211 -msgid "Incubated on" -msgstr "Incubé le" +#: .\app\company\forms.py:211 .\app\company\templates\company\detail.html:173 +msgid "Start date" +msgstr "Date de début" -#: .\app\company\forms.py:223 -msgid "Incubation end on" -msgstr "Incubation terminée le" +#: .\app\company\forms.py:223 .\app\company\templates\company\detail.html:174 +msgid "End date" +msgstr "Date de fin" -#: .\app\company\forms.py:235 .\app\company\models.py:69 +#: .\app\company\forms.py:235 .\app\company\models.py:70 #: .\app\company\templates\company\detail.html:109 #: .\templates\dashboard.html:54 msgid "Founders" msgstr "Fondateurs" -#: .\app\company\forms.py:242 .\app\company\models.py:77 +#: .\app\company\forms.py:242 .\app\company\models.py:78 #: .\app\company\templates\company\detail.html:138 #: .\templates\dashboard.html:51 msgid "Mentors" msgstr "Mentors" -#: .\app\company\models.py:17 -msgid "Company Status" +#: .\app\company\models.py:17 .\app\company\models.py:18 +msgid "Company status" msgstr "Statut de la compagnie" -#: .\app\company\models.py:34 .\app\company\models.py:188 +#: .\app\company\models.py:35 .\app\company\models.py:189 #: .\templates\dashboard.html:48 msgid "Companies" msgstr "Compagnies" -#: .\app\company\models.py:48 +#: .\app\company\models.py:49 msgid "URL" msgstr "URL" -#: .\app\company\models.py:61 +#: .\app\company\models.py:62 msgid "Status" msgstr "Statut" -#: .\app\company\models.py:185 +#: .\app\company\models.py:186 msgid "Presences" msgstr "Presences" -#: .\app\company\models.py:190 .\app\company\templates\company\presence.html:40 +#: .\app\company\models.py:191 .\app\company\templates\company\presence.html:40 #: .\app\company\templates\company\presence_confirm_delete.html:10 msgid "Date" msgstr "Date" @@ -167,7 +167,7 @@ msgstr "Réinitialiser" #: .\app\company\templates\company\detail.html:8 msgid "Details" -msgstr "" +msgstr "Détails" #: .\app\company\templates\company\detail.html:19 msgid "Actions on this company" @@ -188,35 +188,33 @@ msgstr "Phase d'incubation" #: .\app\company\templates\company\detail.html:63 msgctxt "20 characters max" -msgid "Begin date of phase" +msgid "Start date" msgstr "Date de début" #: .\app\company\templates\company\detail.html:65 msgctxt "20 characters max" -msgid "End date of phase" +msgid "End date" msgstr "Date de fin" #: .\app\company\templates\company\detail.html:83 -#, fuzzy -#| msgid "Time spent incubation" msgid "Time spent" -msgstr "Temps d'incubation passé" +msgstr "Temps passé" #: .\app\company\templates\company\detail.html:91 -msgid "About" -msgstr "A propos" +msgid "Value proposition" +msgstr "Proposition de valeur" #: .\app\company\templates\company\detail.html:99 msgid "Video pitch" msgstr "Vidéo de présentation" #: .\app\company\templates\company\detail.html:132 -msgid "No founders exist." -msgstr "Aucun fondateurs." +msgid "No founders found" +msgstr "Aucun fondateur trouvé" #: .\app\company\templates\company\detail.html:161 -msgid "No mentors exist." -msgstr "Aucun mentors." +msgid "No mentors found" +msgstr "Aucun mentor trouvé" #: .\app\company\templates\company\detail.html:167 msgid "Room rental" @@ -226,17 +224,6 @@ msgstr "Location de salle" msgid "Room" msgstr "Local" -#: .\app\company\templates\company\detail.html:173 -msgid "Start date" -msgstr "Date de début" - -#: .\app\company\templates\company\detail.html:174 -#, fuzzy -#| msgctxt "20 characters max" -#| msgid "End date of phase" -msgid "End date" -msgstr "Date de fin" - #: .\app\company\templates\company\detail.html:176 #: .\app\company\templates\company\detail.html:190 #: .\app\company\templates\company\presence.html:45 @@ -253,14 +240,12 @@ msgid "Delete" msgstr "Supprimer" #: .\app\company\templates\company\detail.html:197 -msgid "No room rentals found." -msgstr "Aucune location trouvée." +msgid "No room rentals found" +msgstr "Aucune location trouvée" #: .\app\company\templates\company\detail.html:200 -#, fuzzy -#| msgid "Add new mentor" -msgid "Add new rental" -msgstr "Ajouter un nouveau mentor" +msgid "New rental" +msgstr "Nouvelle location" #: .\app\company\templates\company\filter.html:9 #: .\app\company\templates\company\index.html:5 @@ -274,12 +259,12 @@ msgid "No companies satisfy that query." msgstr "Aucune compagnies ne satisfait cette demande." #: .\app\company\templates\company\index.html:11 -msgid "Add new company" -msgstr "Ajouter une nouvelle compagnie" +msgid "New company" +msgstr "Nouvelle compagnie" #: .\app\company\templates\company\index.html:14 -msgid "Add new status" -msgstr "Ajouter un nouveau statut" +msgid "New status" +msgstr "Nouveau statut" #: .\app\company\templates\company\index.html:23 msgid "Search" @@ -293,10 +278,8 @@ msgid "Presence" msgstr "Presence" #: .\app\company\templates\company\presence.html:14 -#, fuzzy -#| msgid "Presence in Centech" msgid "Presence in Centech for company status" -msgstr "Presence au Centech" +msgstr "Presence au Centech pour statut de compagnie" #: .\app\company\templates\company\presence.html:19 msgid "Select a status" @@ -304,7 +287,7 @@ msgstr "Sélectionnez un status" #: .\app\company\templates\company\presence.html:71 msgid "No one presence for the moment" -msgstr "" +msgstr "Pas une presence pour le moment" #: .\app\company\templates\company\presence.html:75 msgid "New Presence" @@ -312,25 +295,31 @@ msgstr "Nouvelle presence" #: .\app\company\templates\company\presence.html:81 msgid "Sorry! But you have no company in this status." -msgstr "" +msgstr "Désolé! Mais vous n'avez pas de compagnies pour ce statut." #: .\app\company\templates\company\presence.html:83 msgid "" "To manage presence, you must first create companies in this status or select " "an other status." msgstr "" +"Pour gérer presence, vous devez premièrement créer des companies pour ce " +"statut ou selecter un autre statut." #: .\app\company\templates\company\presence.html:92 msgid "Sorry! But you have no company status to access this feature." msgstr "" +"Désolé! Mais vous n'avez pas de statut de compagnies pour acceder à cette " +"fonctionalité." #: .\app\company\templates\company\presence.html:94 msgid "To manage presence, you must first create company status and companies." msgstr "" +"Pour gérer presence, vous devez premièrement créé des statut de companies et " +"des compagnies." #: .\app\company\templates\company\presence_confirm_delete.html:8 msgid "Are you sure you want to delete this presence ?" -msgstr "Êtes-vous sûr de vouloir supprimer cette présence ?" +msgstr "Êtes-vous sûr de vouloir supprimer cette présence?" #: .\app\company\templates\company\presence_confirm_delete.html:20 msgid "Cancel" @@ -341,12 +330,12 @@ msgid "New presence" msgstr "Nouvelle présence" #: .\app\company\views.py:88 -msgid "This status has been added." -msgstr "Le statut a été ajouté" +msgid "The status has been added." +msgstr "Le statut a été ajouté." #: .\app\company\views.py:111 -msgid "This company has been added." -msgstr "La compagnie a été ajouté" +msgid "The company has been added." +msgstr "La compagnie a été ajouté." #: .\centech2\settings.py:193 msgid "French" @@ -360,10 +349,6 @@ msgstr "Anglais" msgid "Portuguese" msgstr "Portugais" -#: .\templates\dashboard.html:10 -msgid "Dashboard v.1" -msgstr "Tableau de bord v.1" - #: .\templates\dashboard.html:42 msgid "Road map" msgstr "Carte routière" @@ -409,7 +394,7 @@ msgid "KanBoard" msgstr "KanBoard" #: .\templates\dashboard.html:120 -msgid "Welcome to the Centech Dashboard." +msgid "Welcome to the Centech Dashboard" msgstr "Bienvenue sur le tableau de bord du Centech" #: .\templates\dashboard.html:131 .\templates\dashboard.html.py:134 @@ -437,7 +422,7 @@ msgid "Change password" msgstr "Modifier le mot de passe" #: .\templates\dashboard.html:188 -msgid "Log out" +msgid "Logout" msgstr "Déconnexion" #: .\templates\landing_base.html:12 @@ -453,9 +438,44 @@ msgid "Login" msgstr "Connexion" #: .\templates\landing_base.html:114 -msgid "All Rights Reserved" +msgid "All rights reserved" msgstr "Tous droits réservés" +#~ msgid "Log out" +#~ msgstr "Déconnexion" + +#~ msgid "About" +#~ msgstr "A propos" + +#~ msgid "No mentors exist." +#~ msgstr "Aucun mentors." + +#~ msgid "Add new company" +#~ msgstr "Ajouter une nouvelle compagnie" + +#~ msgid "Add new status" +#~ msgstr "Ajouter un nouveau statut" + +#~ msgid "Name of the company" +#~ msgstr "Nom de la compagnie" + +#~ msgid "Incubated on" +#~ msgstr "Incubé le" + +#~ msgid "Incubation end on" +#~ msgstr "Incubation terminée le" + +#~ msgctxt "20 characters max" +#~ msgid "Begin date of phase" +#~ msgstr "Date de début" + +#~ msgctxt "20 characters max" +#~ msgid "End date of phase" +#~ msgstr "Date de fin" + +#~ msgid "Dashboard v.1" +#~ msgstr "Tableau de bord v.1" + #~ msgid "ADMINISTRATION" #~ msgstr "ADMINISTRATION" @@ -481,12 +501,6 @@ msgstr "Tous droits réservés" #~ msgid "End of incubation date" #~ msgstr "Date de fin d'incubation" -#~ msgid "New status" -#~ msgstr "Nouveau statut" - -#~ msgid "New company" -#~ msgstr "Nouvelle compagnie" - #~ msgid "Update company" #~ msgstr "Modifier cette compagnie" diff --git a/app/company/locale/pt/LC_MESSAGES/django.mo b/app/company/locale/pt/LC_MESSAGES/django.mo index 91e9a8b..47114e4 100644 Binary files a/app/company/locale/pt/LC_MESSAGES/django.mo and b/app/company/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/company/locale/pt/LC_MESSAGES/django.po b/app/company/locale/pt/LC_MESSAGES/django.po index 092cc01..1e32415 100644 --- a/app/company/locale/pt/LC_MESSAGES/django.po +++ b/app/company/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" @@ -19,7 +19,7 @@ msgstr "" "X-Generator: Poedit 1.8.7\n" #: .\app\company\forms.py:48 .\app\company\forms.py:100 -#: .\app\company\models.py:21 .\app\company\models.py:39 +#: .\app\company\models.py:22 .\app\company\models.py:40 msgid "Name" msgstr "Nome" @@ -27,7 +27,7 @@ msgstr "Nome" msgid "Name of the new status" msgstr "Nome do novo status" -#: .\app\company\forms.py:56 .\app\company\models.py:24 +#: .\app\company\forms.py:56 .\app\company\models.py:25 msgid "Comment" msgstr "Comentar" @@ -42,14 +42,16 @@ msgid "Save" msgstr "Salvar" #: .\app\company\forms.py:105 -msgid "Name of the company" -msgstr "Nome da empresa" +#, fuzzy +#| msgid "Company" +msgid "Company name" +msgstr "Empresa" -#: .\app\company\forms.py:110 .\app\company\models.py:44 +#: .\app\company\forms.py:110 .\app\company\models.py:45 msgid "Logo" msgstr "Logo" -#: .\app\company\forms.py:115 .\app\company\models.py:52 +#: .\app\company\forms.py:115 .\app\company\models.py:53 msgid "Video" msgstr "Vídeo" @@ -65,7 +67,7 @@ msgstr "Website" msgid "https://example.com" msgstr "https://example.com" -#: .\app\company\forms.py:135 .\app\company\models.py:84 +#: .\app\company\forms.py:135 .\app\company\models.py:85 msgid "Facebook" msgstr "Facebook" @@ -73,7 +75,7 @@ msgstr "Facebook" msgid "https://www.facebook.com/lastname.firstname" msgstr "https://www.facebook.com/lastname.firstname" -#: .\app\company\forms.py:145 .\app\company\models.py:89 +#: .\app\company\forms.py:145 .\app\company\models.py:90 msgid "Twitter" msgstr "Twitter" @@ -81,7 +83,7 @@ msgstr "Twitter" msgid "https://twitter.com/username" msgstr "https://twitter.com/username" -#: .\app\company\forms.py:155 .\app\company\models.py:94 +#: .\app\company\forms.py:155 .\app\company\models.py:95 msgid "Google+" msgstr "Google+" @@ -89,7 +91,7 @@ msgstr "Google+" msgid "https://plus.google.com/id" msgstr "https://plus.google.com/id" -#: .\app\company\forms.py:165 .\app\company\models.py:99 +#: .\app\company\forms.py:165 .\app\company\models.py:100 msgid "linkedIn" msgstr "LinkedIn" @@ -97,7 +99,7 @@ msgstr "LinkedIn" msgid "https://ca.linkedin.com/in/username" msgstr "https://ca.linkedin.com/in/username" -#: .\app\company\forms.py:172 .\app\company\models.py:57 +#: .\app\company\forms.py:172 .\app\company\models.py:58 msgid "Description" msgstr "Descrição" @@ -110,48 +112,52 @@ msgstr "Escreva aqui um breve sumário de seu negócio." msgid "Incubation phase" msgstr "Fase de Incubação" -#: .\app\company\forms.py:211 -msgid "Incubated on" -msgstr "Incubada em" +#: .\app\company\forms.py:211 .\app\company\templates\company\detail.html:173 +msgid "Start date" +msgstr "" -#: .\app\company\forms.py:223 -msgid "Incubation end on" -msgstr "Incubação termina em" +#: .\app\company\forms.py:223 .\app\company\templates\company\detail.html:174 +#, fuzzy +#| msgid "Incubation phase" +msgid "End date" +msgstr "Fase de Incubação" -#: .\app\company\forms.py:235 .\app\company\models.py:69 +#: .\app\company\forms.py:235 .\app\company\models.py:70 #: .\app\company\templates\company\detail.html:109 #: .\templates\dashboard.html:54 msgid "Founders" msgstr "Fundadores" -#: .\app\company\forms.py:242 .\app\company\models.py:77 +#: .\app\company\forms.py:242 .\app\company\models.py:78 #: .\app\company\templates\company\detail.html:138 #: .\templates\dashboard.html:51 msgid "Mentors" msgstr "Mentores" -#: .\app\company\models.py:17 -msgid "Company Status" +#: .\app\company\models.py:17 .\app\company\models.py:18 +#, fuzzy +#| msgid "Company Status" +msgid "Company status" msgstr "Status da empresa" -#: .\app\company\models.py:34 .\app\company\models.py:188 +#: .\app\company\models.py:35 .\app\company\models.py:189 #: .\templates\dashboard.html:48 msgid "Companies" msgstr "Empresas" -#: .\app\company\models.py:48 +#: .\app\company\models.py:49 msgid "URL" msgstr "URL" -#: .\app\company\models.py:61 +#: .\app\company\models.py:62 msgid "Status" msgstr "Status" -#: .\app\company\models.py:185 +#: .\app\company\models.py:186 msgid "Presences" msgstr "Presenças" -#: .\app\company\models.py:190 .\app\company\templates\company\presence.html:40 +#: .\app\company\models.py:191 .\app\company\templates\company\presence.html:40 #: .\app\company\templates\company\presence_confirm_delete.html:10 msgid "Date" msgstr "Data" @@ -194,14 +200,14 @@ msgstr "Fase de Incubação" #: .\app\company\templates\company\detail.html:63 msgctxt "20 characters max" -msgid "Begin date of phase" +msgid "Start date" msgstr "" #: .\app\company\templates\company\detail.html:65 #, fuzzy #| msgid "Incubation phase" msgctxt "20 characters max" -msgid "End date of phase" +msgid "End date" msgstr "Fase de Incubação" #: .\app\company\templates\company\detail.html:83 @@ -211,19 +217,23 @@ msgid "Time spent" msgstr "Tempo inbucada" #: .\app\company\templates\company\detail.html:91 -msgid "About" -msgstr "Sobre" +msgid "Value proposition" +msgstr "" #: .\app\company\templates\company\detail.html:99 msgid "Video pitch" msgstr "Pitch em vídeo" #: .\app\company\templates\company\detail.html:132 -msgid "No founders exist." +#, fuzzy +#| msgid "No founders exist." +msgid "No founders found" msgstr "Não há fundadores." #: .\app\company\templates\company\detail.html:161 -msgid "No mentors exist." +#, fuzzy +#| msgid "No mentors exist." +msgid "No mentors found" msgstr "Não há mentores." #: .\app\company\templates\company\detail.html:167 @@ -234,16 +244,6 @@ msgstr "" msgid "Room" msgstr "" -#: .\app\company\templates\company\detail.html:173 -msgid "Start date" -msgstr "" - -#: .\app\company\templates\company\detail.html:174 -#, fuzzy -#| msgid "Incubation phase" -msgid "End date" -msgstr "Fase de Incubação" - #: .\app\company\templates\company\detail.html:176 #: .\app\company\templates\company\detail.html:190 #: .\app\company\templates\company\presence.html:45 @@ -260,18 +260,20 @@ msgid "Delete" msgstr "Deletar" #: .\app\company\templates\company\detail.html:197 -msgid "No room rentals found." +msgid "No room rentals found" msgstr "" #: .\app\company\templates\company\detail.html:200 #, fuzzy #| msgid "Add new mentor" -msgid "Add new rental" +msgid "New rental" msgstr "Adicionar novo mentor" #: .\app\company\templates\company\filter.html:9 #: .\app\company\templates\company\index.html:5 #: .\app\company\templates\company\index.html:9 +#, fuzzy +#| msgid "Centech Companies" msgid "Centech Companies" msgstr "Empresas da Centech" @@ -281,12 +283,12 @@ msgid "No companies satisfy that query." msgstr "Nenhuma empresa satisfaz esta consulta." #: .\app\company\templates\company\index.html:11 -msgid "Add new company" -msgstr "Adicionar nova empresa" +msgid "New company" +msgstr "Nova empresa" #: .\app\company\templates\company\index.html:14 -msgid "Add new status" -msgstr "Adicionar novo status" +msgid "New status" +msgstr "Novo status" #: .\app\company\templates\company\index.html:23 msgid "Search" @@ -348,11 +350,11 @@ msgid "New presence" msgstr "Nova assistência" #: .\app\company\views.py:88 -msgid "This status has been added." +msgid "The status has been added." msgstr "" #: .\app\company\views.py:111 -msgid "This company has been added." +msgid "The company has been added." msgstr "" #: .\centech2\settings.py:193 @@ -367,10 +369,6 @@ msgstr "Inglês" msgid "Portuguese" msgstr "" -#: .\templates\dashboard.html:10 -msgid "Dashboard v.1" -msgstr "Dashboard v.1" - #: .\templates\dashboard.html:42 msgid "Road map" msgstr "Roadmap" @@ -416,7 +414,9 @@ msgid "KanBoard" msgstr "KanBoard" #: .\templates\dashboard.html:120 -msgid "Welcome to the Centech Dashboard." +#, fuzzy +#| msgid "Welcome to the Centech Dashboard." +msgid "Welcome to the Centech Dashboard" msgstr "Benvindo ao Dashboard da Centech" #: .\templates\dashboard.html:131 .\templates\dashboard.html.py:134 @@ -444,8 +444,10 @@ msgid "Change password" msgstr "Mudar o password" #: .\templates\dashboard.html:188 -msgid "Log out" -msgstr "Log out" +#, fuzzy +#| msgid "Logo" +msgid "Logout" +msgstr "Logo" #: .\templates\landing_base.html:12 msgid "Centech Dashboard" @@ -460,9 +462,41 @@ msgid "Login" msgstr "Login" #: .\templates\landing_base.html:114 -msgid "All Rights Reserved" +#, fuzzy +#| msgid "All Rights Reserved" +msgid "All rights reserved" msgstr "Todos os direitos reservados" +#~ msgid "Log out" +#~ msgstr "Log out" + +#~ msgid "About" +#~ msgstr "Sobre" + +#~ msgid "Add new company" +#~ msgstr "Adicionar nova empresa" + +#~ msgid "Add new status" +#~ msgstr "Adicionar novo status" + +#~ msgid "Name of the company" +#~ msgstr "Nome da empresa" + +#~ msgid "Incubated on" +#~ msgstr "Incubada em" + +#~ msgid "Incubation end on" +#~ msgstr "Incubação termina em" + +#, fuzzy +#~| msgid "Incubation phase" +#~ msgctxt "20 characters max" +#~ msgid "End date of phase" +#~ msgstr "Fase de Incubação" + +#~ msgid "Dashboard v.1" +#~ msgstr "Dashboard v.1" + #~ msgid "Add new founder" #~ msgstr "Adicionar novo empreendedor" @@ -475,11 +509,5 @@ msgstr "Todos os direitos reservados" #~ msgid "End of incubation date" #~ msgstr "Fim da data de incubação" -#~ msgid "New status" -#~ msgstr "Novo status" - -#~ msgid "New company" -#~ msgstr "Nova empresa" - #~ msgid "Update company" #~ msgstr "Atualizar empresa" diff --git a/app/company/models.py b/app/company/models.py index e133699..c520786 100644 --- a/app/company/models.py +++ b/app/company/models.py @@ -14,7 +14,8 @@ class CompanyStatus(models.Model): # Status of a company in the Centech (ex: emergence) class Meta: - verbose_name_plural = _('Company Status') + verbose_name = _('Company status') + verbose_name_plural = _('Company status') status = models.CharField( max_length=50, diff --git a/app/company/templates/company/detail.html b/app/company/templates/company/detail.html index 54ca6b8..5304a4d 100644 --- a/app/company/templates/company/detail.html +++ b/app/company/templates/company/detail.html @@ -60,9 +60,9 @@

{{ company.name }}

{{ company.companyStatus }}
{% if company.incubated_on and company.endOfIncubation %} -
{% trans "Begin date of phase" context "20 characters max" %} :
+
{% trans "Start date" context "20 characters max" %} :
{{ company.incubated_on }}
-
{% trans "End date of phase" context "20 characters max" %} :
+
{% trans "End date" context "20 characters max" %} :
{{ company.endOfIncubation }}
{% endif %} @@ -88,7 +88,7 @@

{{ company.name }}

{% if company.description != "" %}
-

{% trans "About" %}

+

{% trans "Value proposition" %}

{{ company.description }}
@@ -129,7 +129,7 @@

{{ company.name }}

{% endfor %}
{% else %} -

{% trans "No founders exist." %}

+

{% trans "No founders found" %}

{% endif %} @@ -158,7 +158,7 @@

{{ company.name }}

{% endfor %} {% else %} -

{% trans "No mentors exist." %}

+

{% trans "No mentors found" %}

{% endif %} @@ -194,10 +194,10 @@

{{ company.name }}

{% endfor %} {% else %} -

{% trans "No room rentals found." %}

+

{% trans "No room rentals found" %}

{% endif %} {% if isCentech == True %} -

{% trans "Add new rental" %}

+

{% trans "New rental" %}

{% endif %} diff --git a/app/company/templates/company/index.html b/app/company/templates/company/index.html index b016003..377a0b2 100644 --- a/app/company/templates/company/index.html +++ b/app/company/templates/company/index.html @@ -8,10 +8,10 @@ {% block content %}

{% trans "Centech Companies" %}

- {% trans "Add new company" %} + {% trans "New company" %} - {% trans "Add new status" %} + {% trans "New status" %}
diff --git a/app/company/views.py b/app/company/views.py index 88bf13a..dd551a8 100644 --- a/app/company/views.py +++ b/app/company/views.py @@ -85,7 +85,7 @@ def get_success_url(self): messages.add_message( self.request, messages.SUCCESS, - _(u'This status has been added.') + _(u'The status has been added.') ) return reverse_lazy("company:index") @@ -108,7 +108,7 @@ def get_success_url(self): messages.add_message( self.request, messages.SUCCESS, - _(u'This company has been added.') + _(u'The company has been added.') ) return reverse_lazy("company:index") diff --git a/app/experiment/locale/fr/LC_MESSAGES/django.mo b/app/experiment/locale/fr/LC_MESSAGES/django.mo index fbb782a..d00beae 100644 Binary files a/app/experiment/locale/fr/LC_MESSAGES/django.mo and b/app/experiment/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/experiment/locale/fr/LC_MESSAGES/django.po b/app/experiment/locale/fr/LC_MESSAGES/django.po index 20a1392..eaf64b9 100644 --- a/app/experiment/locale/fr/LC_MESSAGES/django.po +++ b/app/experiment/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:22-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -41,15 +41,15 @@ msgid "Validation" msgstr "Validation" #: .\app\experiment\models.py:42 -msgid "Description of the experiment" -msgstr "Description de l'expérimentation" +msgid "Experiment description" +msgstr "Description de l'expérience" #: .\app\experiment\models.py:46 -msgid "Number of subject for the test" -msgstr "Nombre de sujet pour le test" +msgid "Number of test participants" +msgstr "Nombre de participants pour le test" #: .\app\experiment\models.py:50 -msgid "Description of the subject test" +msgid "Test description" msgstr "Description du test" #: .\app\experiment\models.py:55 @@ -57,24 +57,22 @@ msgid "Conclusion" msgstr "Conclusion" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:7 -#, fuzzy -#| msgid "New Experiment" msgid "Delete experiment" -msgstr "Nouvelle expérimentation" +msgstr "Supprimer expérience" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:10 #: .\app\experiment\templates\experiment\customerexperiment_form.html:8 #: .\app\experiment\templates\experiment\customerexperiment_form.html:11 msgid "Experiment" -msgstr "Experimentation" +msgstr "Expérience" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:12 -msgid "Are you sure you want to delete this experiment ?" -msgstr "Êtes-vous sûr de vouloir supprimer cette expérimentation ?" +msgid "Are you sure you want to delete this experiment?" +msgstr "Êtes-vous sûr de vouloir supprimer cette expérience?" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:16 -msgid "create on" -msgstr "créé le" +msgid "Created on" +msgstr "Créé le" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:20 #: .\app\experiment\templates\experiment\customerexperiment_list.html:21 @@ -92,7 +90,9 @@ msgstr "Enregistrer" #: .\app\experiment\templates\experiment\customerexperiment_list.html:6 #: .\app\experiment\templates\experiment\customerexperiment_list.html:9 -msgid "Customer Experiments" +#, fuzzy +#| msgid "Customer Experiments" +msgid "Customer Experimentation" msgstr "Expérimentation clientèle" #: .\app\experiment\templates\experiment\customerexperiment_list.html:16 @@ -114,4 +114,13 @@ msgstr "Modifier" #: .\app\experiment\templates\experiment\customerexperiment_list.html:39 msgid "New Experiment" -msgstr "Nouvelle expérimentation" +msgstr "Nouvelle expérience" + +#~ msgid "Description of the experiment" +#~ msgstr "Description de l'expérimentation" + +#~ msgid "Number of subject for the test" +#~ msgstr "Nombre de sujet pour le test" + +#~ msgid "Description of the subject test" +#~ msgstr "Description du test" diff --git a/app/experiment/locale/pt/LC_MESSAGES/django.mo b/app/experiment/locale/pt/LC_MESSAGES/django.mo index 84eaf94..0cd9f1a 100644 Binary files a/app/experiment/locale/pt/LC_MESSAGES/django.mo and b/app/experiment/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/experiment/locale/pt/LC_MESSAGES/django.po b/app/experiment/locale/pt/LC_MESSAGES/django.po index 8ef3ced..1746222 100644 --- a/app/experiment/locale/pt/LC_MESSAGES/django.po +++ b/app/experiment/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -41,16 +41,18 @@ msgid "Validation" msgstr "Validação" #: .\app\experiment\models.py:42 -msgid "Description of the experiment" -msgstr "Descrição do experimento" +#, fuzzy +#| msgid "Experiment" +msgid "Experiment description" +msgstr "Experimento" #: .\app\experiment\models.py:46 -msgid "Number of subject for the test" -msgstr "Número de participantes do experimento" +msgid "Number of test participants" +msgstr "" #: .\app\experiment\models.py:50 -msgid "Description of the subject test" -msgstr "Descrição do participante do experimento" +msgid "Test description" +msgstr "" #: .\app\experiment\models.py:55 msgid "Conclusion" @@ -69,11 +71,15 @@ msgid "Experiment" msgstr "Experimento" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:12 -msgid "Are you sure you want to delete this experiment ?" +#, fuzzy +#| msgid "Are you sure you want to delete this experiment ?" +msgid "Are you sure you want to delete this experiment?" msgstr "Você tem certeza que quer deletar este experimento?" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:16 -msgid "create on" +#, fuzzy +#| msgid "create on" +msgid "Created on" msgstr "criado em" #: .\app\experiment\templates\experiment\customerexperiment_confirm_delete.html:20 @@ -92,7 +98,9 @@ msgstr "Salvar" #: .\app\experiment\templates\experiment\customerexperiment_list.html:6 #: .\app\experiment\templates\experiment\customerexperiment_list.html:9 -msgid "Customer Experiments" +#, fuzzy +#| msgid "Customer Experiments" +msgid "Customer Experimentation" msgstr "Experimentos com clientes" #: .\app\experiment\templates\experiment\customerexperiment_list.html:16 @@ -115,3 +123,12 @@ msgstr "Modificar" #: .\app\experiment\templates\experiment\customerexperiment_list.html:39 msgid "New Experiment" msgstr "Novo Experimento" + +#~ msgid "Description of the experiment" +#~ msgstr "Descrição do experimento" + +#~ msgid "Number of subject for the test" +#~ msgstr "Número de participantes do experimento" + +#~ msgid "Description of the subject test" +#~ msgstr "Descrição do participante do experimento" diff --git a/app/experiment/models.py b/app/experiment/models.py index 9c66a7b..54df808 100644 --- a/app/experiment/models.py +++ b/app/experiment/models.py @@ -39,15 +39,15 @@ class CustomerExperiment(models.Model): experiment_description = models.TextField( max_length=1024, - verbose_name=_('Description of the experiment') + verbose_name=_('Experiment description') ) test_subject_count = models.PositiveIntegerField( default=0, - verbose_name=_('Number of subject for the test') + verbose_name=_('Number of test participants') ) test_subject_description = models.TextField( max_length=512, - verbose_name=_('Description of the subject test') + verbose_name=_('Test description') ) conclusions = models.TextField( max_length=512, diff --git a/app/experiment/templates/experiment/customerexperiment_confirm_delete.html b/app/experiment/templates/experiment/customerexperiment_confirm_delete.html index 070e44e..8860cf8 100644 --- a/app/experiment/templates/experiment/customerexperiment_confirm_delete.html +++ b/app/experiment/templates/experiment/customerexperiment_confirm_delete.html @@ -9,11 +9,11 @@ {% block content %}

{% trans "Experiment" %}

-

{% trans "Are you sure you want to delete this experiment ?" %}

+

{% trans "Are you sure you want to delete this experiment?" %}

{% trans "Hypothesis"%} : {{ experiment.hypothesis }}
- {% trans "create on" %} : {{ experiment.dateStart}}

+ {% trans "Created on" %} : {{ experiment.dateStart}}

{% csrf_token %} diff --git a/app/experiment/templates/experiment/customerexperiment_list.html b/app/experiment/templates/experiment/customerexperiment_list.html index c8cb5f5..e3b6a76 100644 --- a/app/experiment/templates/experiment/customerexperiment_list.html +++ b/app/experiment/templates/experiment/customerexperiment_list.html @@ -3,10 +3,10 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{{company}} - {% trans "Customer Experiments" %}{% endblock %} +{% block title %}{{company}} - {% trans "Customer Experimentation" %}{% endblock %} {% block content %} -

{% trans "Customer Experiments" %}

+

{% trans "Customer Experimentation" %}



diff --git a/app/finance/locale/fr/LC_MESSAGES/django.mo b/app/finance/locale/fr/LC_MESSAGES/django.mo index b309922..938d9dc 100644 Binary files a/app/finance/locale/fr/LC_MESSAGES/django.mo and b/app/finance/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/finance/locale/fr/LC_MESSAGES/django.po b/app/finance/locale/fr/LC_MESSAGES/django.po index 5cc909a..3b7f2e3 100644 --- a/app/finance/locale/fr/LC_MESSAGES/django.po +++ b/app/finance/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-24 14:34-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -76,8 +76,6 @@ msgid "Amount received" msgstr "Somme reçu" #: .\app\finance\forms.py:55 -#, fuzzy -#| msgid "Date of reception" msgid "Date de reception" msgstr "Date de réception" @@ -104,22 +102,16 @@ msgid "Company" msgstr "Compagnie" #: .\app\finance\templates\finance\bourse_confirm_delete.html:6 -#, fuzzy -#| msgid "New grant" -msgid "Delete grants" -msgstr "Nouvelle bourse" +msgid "Delete grant" +msgstr "Supprimer bourse" #: .\app\finance\templates\finance\bourse_confirm_delete.html:9 -#: .\app\finance\templates\finance\index.html:22 -#: .\app\finance\templates\finance\index.html:41 -#: .\app\finance\templates\finance\index.html:342 -#: .\app\finance\templates\finance\index.html:351 -msgid "Grants" -msgstr "Bourses" +msgid "Grant" +msgstr "Bourse" #: .\app\finance\templates\finance\bourse_confirm_delete.html:10 -msgid "Are you sure you want to delete this grants ?" -msgstr "Êtes vous sûr de vouloir supprimer cette bourse ?" +msgid "Are you sure you want to delete this grant?" +msgstr "Êtes vous sûr de vouloir supprimer cette bourse?" #: .\app\finance\templates\finance\bourse_confirm_delete.html:18 #: .\app\finance\templates\finance\index.html:52 @@ -162,10 +154,8 @@ msgstr "Annuler" #: .\app\finance\templates\finance\finance_form.html:8 #: .\app\finance\templates\finance\index.html:6 -#, fuzzy -#| msgid "Finance of" msgid "Finance" -msgstr "Finance de" +msgstr "Finance" #: .\app\finance\templates\finance\finance_form.html:23 msgid "Save" @@ -184,11 +174,17 @@ msgstr "Finance de" msgid "Overview" msgstr "Vue générale" +#: .\app\finance\templates\finance\index.html:22 +#: .\app\finance\templates\finance\index.html:41 +#: .\app\finance\templates\finance\index.html:342 +#: .\app\finance\templates\finance\index.html:351 +msgid "Grants" +msgstr "Bourses" + #: .\app\finance\templates\finance\index.html:23 #: .\app\finance\templates\finance\index.html:99 #: .\app\finance\templates\finance\index.html:343 #: .\app\finance\templates\finance\index.html:356 -#: .\app\finance\templates\finance\subvention_confirm_delete.html:9 msgid "Subsidies" msgstr "Subventions" @@ -196,7 +192,6 @@ msgstr "Subventions" #: .\app\finance\templates\finance\index.html:157 #: .\app\finance\templates\finance\index.html:344 #: .\app\finance\templates\finance\index.html:361 -#: .\app\finance\templates\finance\investissement_confirm_delete.html:9 msgid "Investments" msgstr "Investissements" @@ -204,7 +199,6 @@ msgstr "Investissements" #: .\app\finance\templates\finance\index.html:216 #: .\app\finance\templates\finance\index.html:345 #: .\app\finance\templates\finance\index.html:366 -#: .\app\finance\templates\finance\pret_confirm_delete.html:9 msgid "Loans" msgstr "Prêts" @@ -212,7 +206,6 @@ msgstr "Prêts" #: .\app\finance\templates\finance\index.html:275 #: .\app\finance\templates\finance\index.html:346 #: .\app\finance\templates\finance\index.html:371 -#: .\app\finance\templates\finance\vente_confirm_delete.html:9 msgid "Sales" msgstr "Ventes" @@ -314,44 +307,52 @@ msgid "Service offering" msgstr "Offre de service" #: .\app\finance\templates\finance\investissement_confirm_delete.html:6 -#, fuzzy -#| msgid "New investment" -msgid "Delete investments" -msgstr "Nouvel investissement" +msgid "Delete investment" +msgstr "Supprimer investissement" + +#: .\app\finance\templates\finance\investissement_confirm_delete.html:9 +msgid "Investment" +msgstr "Investissements" #: .\app\finance\templates\finance\investissement_confirm_delete.html:10 -msgid "Are you sure you want to delete this investments ?" -msgstr "Êtes vous sûr de vouloir supprimer cet investissement ?" +msgid "Are you sure you want to delete this investment?" +msgstr "Êtes vous sûr de vouloir supprimer cet investissement?" #: .\app\finance\templates\finance\pret_confirm_delete.html:6 -#, fuzzy -#| msgid "Delete" -msgid "Delete loans" -msgstr "Supprimer" +msgid "Delete loan" +msgstr "Supprimer prêt" + +#: .\app\finance\templates\finance\pret_confirm_delete.html:9 +msgid "Loan" +msgstr "Prêt" #: .\app\finance\templates\finance\pret_confirm_delete.html:10 -msgid "Are you sure you want to delete this loan ?" -msgstr "Êtes vous sûr de vouloir supprimer ce prêt ?" +msgid "Are you sure you want to delete this loan?" +msgstr "Êtes vous sûr de vouloir supprimer ce prêt?" #: .\app\finance\templates\finance\subvention_confirm_delete.html:6 -#, fuzzy -#| msgid "Subsidies" -msgid "Delete subsidies" -msgstr "Subventions" +msgid "Delete subsidy" +msgstr "Supprimer subvention" + +#: .\app\finance\templates\finance\subvention_confirm_delete.html:9 +msgid "Subsidy" +msgstr "Subvention" #: .\app\finance\templates\finance\subvention_confirm_delete.html:10 -msgid "Are you sure you want to delete this subsidy ?" -msgstr "Êtes vous sûr de vouloir supprimer cette subvention ?" +msgid "Are you sure you want to delete this subsidy?" +msgstr "Êtes vous sûr de vouloir supprimer cette subvention?" #: .\app\finance\templates\finance\vente_confirm_delete.html:6 -#, fuzzy -#| msgid "Delete" -msgid "Delete sales" -msgstr "Supprimer" +msgid "Delete sale" +msgstr "Supprimer vente" + +#: .\app\finance\templates\finance\vente_confirm_delete.html:9 +msgid "Sale" +msgstr "Vente" #: .\app\finance\templates\finance\vente_confirm_delete.html:10 -msgid "Are you sure you want to delete this sale ?" -msgstr "Êtes vous sûr de vouloir supprimer cette vente ?" +msgid "Are you sure you want to delete this sale?" +msgstr "Êtes vous sûr de vouloir supprimer cette vente?" #~ msgid "Summary" #~ msgstr "Sommaire" diff --git a/app/finance/locale/pt/LC_MESSAGES/django.mo b/app/finance/locale/pt/LC_MESSAGES/django.mo index 4638d83..5223746 100644 Binary files a/app/finance/locale/pt/LC_MESSAGES/django.mo and b/app/finance/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/finance/locale/pt/LC_MESSAGES/django.po b/app/finance/locale/pt/LC_MESSAGES/django.po index 49a6045..154bf3e 100644 --- a/app/finance/locale/pt/LC_MESSAGES/django.po +++ b/app/finance/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -104,19 +104,19 @@ msgstr "Empresa" #: .\app\finance\templates\finance\bourse_confirm_delete.html:6 #, fuzzy #| msgid "New grant" -msgid "Delete grants" +msgid "Delete grant" msgstr "Novo fundo" #: .\app\finance\templates\finance\bourse_confirm_delete.html:9 -#: .\app\finance\templates\finance\index.html:22 -#: .\app\finance\templates\finance\index.html:41 -#: .\app\finance\templates\finance\index.html:342 -#: .\app\finance\templates\finance\index.html:351 -msgid "Grants" +#, fuzzy +#| msgid "Grants" +msgid "Grant" msgstr "Fundos" #: .\app\finance\templates\finance\bourse_confirm_delete.html:10 -msgid "Are you sure you want to delete this grants ?" +#, fuzzy +#| msgid "Are you sure you want to delete this grants ?" +msgid "Are you sure you want to delete this grant?" msgstr "Você tem certeza que deseja deletar estes fundos?" #: .\app\finance\templates\finance\bourse_confirm_delete.html:18 @@ -182,11 +182,17 @@ msgstr "Finanças de" msgid "Overview" msgstr "Visão Geral" +#: .\app\finance\templates\finance\index.html:22 +#: .\app\finance\templates\finance\index.html:41 +#: .\app\finance\templates\finance\index.html:342 +#: .\app\finance\templates\finance\index.html:351 +msgid "Grants" +msgstr "Fundos" + #: .\app\finance\templates\finance\index.html:23 #: .\app\finance\templates\finance\index.html:99 #: .\app\finance\templates\finance\index.html:343 #: .\app\finance\templates\finance\index.html:356 -#: .\app\finance\templates\finance\subvention_confirm_delete.html:9 msgid "Subsidies" msgstr "Subsídios" @@ -194,7 +200,6 @@ msgstr "Subsídios" #: .\app\finance\templates\finance\index.html:157 #: .\app\finance\templates\finance\index.html:344 #: .\app\finance\templates\finance\index.html:361 -#: .\app\finance\templates\finance\investissement_confirm_delete.html:9 msgid "Investments" msgstr "Investimentos" @@ -202,7 +207,6 @@ msgstr "Investimentos" #: .\app\finance\templates\finance\index.html:216 #: .\app\finance\templates\finance\index.html:345 #: .\app\finance\templates\finance\index.html:366 -#: .\app\finance\templates\finance\pret_confirm_delete.html:9 msgid "Loans" msgstr "Empréstimos" @@ -210,7 +214,6 @@ msgstr "Empréstimos" #: .\app\finance\templates\finance\index.html:275 #: .\app\finance\templates\finance\index.html:346 #: .\app\finance\templates\finance\index.html:371 -#: .\app\finance\templates\finance\vente_confirm_delete.html:9 msgid "Sales" msgstr "Vendas" @@ -318,41 +321,73 @@ msgstr "" #: .\app\finance\templates\finance\investissement_confirm_delete.html:6 #, fuzzy #| msgid "New investment" -msgid "Delete investments" +msgid "Delete investment" msgstr "Novo investimento" +#: .\app\finance\templates\finance\investissement_confirm_delete.html:9 +#, fuzzy +#| msgid "Investments" +msgid "Investment" +msgstr "Investimentos" + #: .\app\finance\templates\finance\investissement_confirm_delete.html:10 -msgid "Are you sure you want to delete this investments ?" +#, fuzzy +#| msgid "Are you sure you want to delete this investments ?" +msgid "Are you sure you want to delete this investment?" msgstr "Você tem certeza que deseja deletar estes investimentos?" #: .\app\finance\templates\finance\pret_confirm_delete.html:6 #, fuzzy #| msgid "Delete" -msgid "Delete loans" +msgid "Delete loan" msgstr "Deletar" +#: .\app\finance\templates\finance\pret_confirm_delete.html:9 +#, fuzzy +#| msgid "Loans" +msgid "Loan" +msgstr "Empréstimos" + #: .\app\finance\templates\finance\pret_confirm_delete.html:10 -msgid "Are you sure you want to delete this loan ?" +#, fuzzy +#| msgid "Are you sure you want to delete this loan ?" +msgid "Are you sure you want to delete this loan?" msgstr "Você tem certeza que deseja deletar este empréstimo?" #: .\app\finance\templates\finance\subvention_confirm_delete.html:6 #, fuzzy #| msgid "Subsidies" -msgid "Delete subsidies" +msgid "Delete subsidy" +msgstr "Subsídios" + +#: .\app\finance\templates\finance\subvention_confirm_delete.html:9 +#, fuzzy +#| msgid "Subsidies" +msgid "Subsidy" msgstr "Subsídios" #: .\app\finance\templates\finance\subvention_confirm_delete.html:10 -msgid "Are you sure you want to delete this subsidy ?" +#, fuzzy +#| msgid "Are you sure you want to delete this subsidy ?" +msgid "Are you sure you want to delete this subsidy?" msgstr "Você tem certeza que deseja deletar esta subsidiária?" #: .\app\finance\templates\finance\vente_confirm_delete.html:6 #, fuzzy #| msgid "Delete" -msgid "Delete sales" +msgid "Delete sale" msgstr "Deletar" +#: .\app\finance\templates\finance\vente_confirm_delete.html:9 +#, fuzzy +#| msgid "Sales" +msgid "Sale" +msgstr "Vendas" + #: .\app\finance\templates\finance\vente_confirm_delete.html:10 -msgid "Are you sure you want to delete this sale ?" +#, fuzzy +#| msgid "Are you sure you want to delete this sale ?" +msgid "Are you sure you want to delete this sale?" msgstr "Você tem certeza que deseja deletar esta venda?" #~ msgid "Summary" diff --git a/app/finance/templates/finance/bourse_confirm_delete.html b/app/finance/templates/finance/bourse_confirm_delete.html index b6ad8b3..65d6ead 100644 --- a/app/finance/templates/finance/bourse_confirm_delete.html +++ b/app/finance/templates/finance/bourse_confirm_delete.html @@ -3,11 +3,11 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{% trans "Delete grants" %}{% endblock %} +{% block title %}{% trans "Delete grant" %}{% endblock %} {% block content %} -

{% trans "Grants" %}

-

{% trans "Are you sure you want to delete this grants ?" %}

+

{% trans "Grant" %}

+

{% trans "Are you sure you want to delete this grant?" %}

{% trans "Name"%} : {{ bourse.name }}
diff --git a/app/finance/templates/finance/investissement_confirm_delete.html b/app/finance/templates/finance/investissement_confirm_delete.html index fd52dd4..83532ba 100644 --- a/app/finance/templates/finance/investissement_confirm_delete.html +++ b/app/finance/templates/finance/investissement_confirm_delete.html @@ -3,11 +3,11 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{% trans "Delete investments" %}{% endblock %} +{% block title %}{% trans "Delete investment" %}{% endblock %} {% block content %} -

{% trans "Investments" %}

-

{% trans "Are you sure you want to delete this investments ?" %}

+

{% trans "Investment" %}

+

{% trans "Are you sure you want to delete this investment?" %}

{% trans "Name"%} : {{ investissement.name }}
diff --git a/app/finance/templates/finance/pret_confirm_delete.html b/app/finance/templates/finance/pret_confirm_delete.html index d07a615..e30a5b3 100644 --- a/app/finance/templates/finance/pret_confirm_delete.html +++ b/app/finance/templates/finance/pret_confirm_delete.html @@ -3,11 +3,11 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{% trans "Delete loans" %}{% endblock %} +{% block title %}{% trans "Delete loan" %}{% endblock %} {% block content %} -

{% trans "Loans" %}

-

{% trans "Are you sure you want to delete this loan ?" %}

+

{% trans "Loan" %}

+

{% trans "Are you sure you want to delete this loan?" %}

diff --git a/app/finance/templates/finance/subvention_confirm_delete.html b/app/finance/templates/finance/subvention_confirm_delete.html index 4361899..a05d207 100644 --- a/app/finance/templates/finance/subvention_confirm_delete.html +++ b/app/finance/templates/finance/subvention_confirm_delete.html @@ -3,11 +3,11 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{% trans "Delete subsidies" %}{% endblock %} +{% block title %}{% trans "Delete subsidy" %}{% endblock %} {% block content %} -

{% trans "Subsidies" %}

-

{% trans "Are you sure you want to delete this subsidy ?" %}

+

{% trans "Subsidy" %}

+

{% trans "Are you sure you want to delete this subsidy?" %}

{% trans "Name"%} : {{ subvention.name }}
diff --git a/app/finance/templates/finance/vente_confirm_delete.html b/app/finance/templates/finance/vente_confirm_delete.html index 33d23f6..6bc5d6e 100644 --- a/app/finance/templates/finance/vente_confirm_delete.html +++ b/app/finance/templates/finance/vente_confirm_delete.html @@ -3,11 +3,11 @@ {% load i18n %} {% load staticfiles %} -{% block title %}{% trans "Delete sales" %}{% endblock %} +{% block title %}{% trans "Delete sale" %}{% endblock %} {% block content %} -

{% trans "Sales" %}

-

{% trans "Are you sure you want to delete this sale ?" %}

+

{% trans "Sale" %}

+

{% trans "Are you sure you want to delete this sale?" %}

{% trans "Name"%} : {{ vente.name }}
{% trans "Date of submission" %} : {{ vente.dateSoumission}}
diff --git a/app/floorMap/forms.py b/app/floorMap/forms.py index 7d43e2f..55eb1da 100644 --- a/app/floorMap/forms.py +++ b/app/floorMap/forms.py @@ -2,6 +2,7 @@ from django import forms from django.db.models import Q +from django.utils.safestring import mark_safe from django.utils.translation import ugettext_lazy as _ from app.company.models import Company @@ -68,28 +69,28 @@ def clean(self): if ('room' and 'date_start' and 'date_end') not in self.cleaned_data: return self.cleaned_data - lst_conflicting = [] + lst_room_conflicts = self.conflicts() - for rent in self.conflicts(): - lst_conflicting.append(rent.company.name) + if lst_room_conflicts: + conflict_html_list = "" - if lst_conflicting: - str_conflicts = lst_conflicting[0] - - for name in lst_conflicting[1:-1]: - str_conflicts = ", ".join([str_conflicts, name]) - - if len(lst_conflicting) > 1: - str_conflicts = " ".join([ - str_conflicts, "&", lst_conflicting[-1:][0] - ]) + for rent in self.conflicts(): + conflict_html_list += mark_safe( + "

  • " + rent.company.name + "
    • " + ) raise forms.ValidationError({ 'room': [forms.ValidationError( - _(u"Room not available at specified date. " - u"Conflicting companies: %(conflicts)s"), - code='invalid', - params={'conflicts': str_conflicts} + mark_safe( + u"{error_message} {lst_conflict_message} :
    " + u"
      {lst_conflict}
    ".format( + error_message=_( + u"Room not available at specified date."), + lst_conflict_message=_(u"Conflicts with"), + lst_conflict=conflict_html_list + ) + ), + code='invalid' )] }) diff --git a/app/floorMap/locale/fr/LC_MESSAGES/django.mo b/app/floorMap/locale/fr/LC_MESSAGES/django.mo index 6064c4d..c388602 100644 Binary files a/app/floorMap/locale/fr/LC_MESSAGES/django.mo and b/app/floorMap/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/floorMap/locale/fr/LC_MESSAGES/django.po b/app/floorMap/locale/fr/LC_MESSAGES/django.po index 52c6184..62db6b7 100644 --- a/app/floorMap/locale/fr/LC_MESSAGES/django.po +++ b/app/floorMap/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-23 13:50-0400\n" -"Last-Translator: \n" +"POT-Creation-Date: 2016-03-29 12:12-0400\n" +"PO-Revision-Date: 2016-03-24 14:34-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -18,36 +18,36 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Poedit 1.8.7\n" -#: .\app\floorMap\forms.py:17 .\app\floorMap\models.py:148 +#: .\app\floorMap\forms.py:18 .\app\floorMap\models.py:148 #: .\app\floorMap\templates\rental\rent_confirm_delete.html:33 msgid "Company" msgstr "Compagnie" -#: .\app\floorMap\forms.py:24 .\app\floorMap\models.py:84 +#: .\app\floorMap\forms.py:25 .\app\floorMap\models.py:84 msgid "Room code" msgstr "Numéro du local" -#: .\app\floorMap\forms.py:30 .\app\floorMap\models.py:153 +#: .\app\floorMap\forms.py:31 .\app\floorMap\models.py:153 #: .\app\floorMap\templates\rental\rent_confirm_delete.html:25 msgid "Start date" msgstr "Date de début" -#: .\app\floorMap\forms.py:42 .\app\floorMap\models.py:154 +#: .\app\floorMap\forms.py:43 .\app\floorMap\models.py:154 #: .\app\floorMap\templates\rental\rent_confirm_delete.html:29 msgid "End date" msgstr "Date de fin" -#: .\app\floorMap\forms.py:59 +#: .\app\floorMap\forms.py:60 msgid "End date cannot be before the start date!" msgstr "La date de fin ne peut pas être avant la date de début!" +#: .\app\floorMap\forms.py:88 +msgid "Room not available at specified date." +msgstr "Le local n'est pas disponible à la date spécifiée." + #: .\app\floorMap\forms.py:89 -#, python-format -msgid "" -"Room not available at specified date. Conflicting companies: %(conflicts)s" -msgstr "" -"Le local n'est pas disponible à la date spécifiée. Compagnies en conflit: " -"%(conflicts)s" +msgid "Conflicts with" +msgstr "Conflits avec" #: .\app\floorMap\models.py:13 msgid "Name" @@ -127,6 +127,7 @@ msgid "Room" msgstr "Local" #: .\app\floorMap\templates\floorMap\floorMap.html:5 +#: .\app\floorMap\templates\floorMap\floorMap.html:40 msgid "Floor plan" msgstr "Plan d'étage" @@ -135,12 +136,12 @@ msgid "Actions on floor map" msgstr "Actions sur plan d'étage" #: .\app\floorMap\templates\floorMap\floorMap.html:31 -msgid "Add new rental" -msgstr "Ajouter une nouvelle location" +msgid "New rental" +msgstr "Nouvelle location" #: .\app\floorMap\templates\rental\rent_confirm_delete.html:5 msgid "Delete rental" -msgstr "Supprimer la location" +msgstr "Supprimer location" #: .\app\floorMap\templates\rental\rent_confirm_delete.html:8 #: .\app\floorMap\templates\rental\rent_form.html:5 diff --git a/app/floorMap/locale/pt/LC_MESSAGES/django.mo b/app/floorMap/locale/pt/LC_MESSAGES/django.mo index fd78224..9a83fa1 100644 Binary files a/app/floorMap/locale/pt/LC_MESSAGES/django.mo and b/app/floorMap/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/floorMap/locale/pt/LC_MESSAGES/django.po b/app/floorMap/locale/pt/LC_MESSAGES/django.po index 9de15e3..9ff3e5c 100644 --- a/app/floorMap/locale/pt/LC_MESSAGES/django.po +++ b/app/floorMap/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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\n" @@ -18,33 +18,35 @@ msgstr "" "Plural-Forms: nplurals=2; plural=(n != 1);\n" "X-Generator: Poedit 1.8.7\n" -#: .\app\floorMap\forms.py:17 .\app\floorMap\models.py:148 +#: .\app\floorMap\forms.py:18 .\app\floorMap\models.py:148 #: .\app\floorMap\templates\rental\rent_confirm_delete.html:33 msgid "Company" msgstr "" -#: .\app\floorMap\forms.py:24 .\app\floorMap\models.py:84 +#: .\app\floorMap\forms.py:25 .\app\floorMap\models.py:84 msgid "Room code" msgstr "" -#: .\app\floorMap\forms.py:30 .\app\floorMap\models.py:153 +#: .\app\floorMap\forms.py:31 .\app\floorMap\models.py:153 #: .\app\floorMap\templates\rental\rent_confirm_delete.html:25 msgid "Start date" msgstr "" -#: .\app\floorMap\forms.py:42 .\app\floorMap\models.py:154 +#: .\app\floorMap\forms.py:43 .\app\floorMap\models.py:154 #: .\app\floorMap\templates\rental\rent_confirm_delete.html:29 msgid "End date" msgstr "" -#: .\app\floorMap\forms.py:59 +#: .\app\floorMap\forms.py:60 msgid "End date cannot be before the start date!" msgstr "" +#: .\app\floorMap\forms.py:88 +msgid "Room not available at specified date." +msgstr "" + #: .\app\floorMap\forms.py:89 -#, python-format -msgid "" -"Room not available at specified date. Conflicting companies: %(conflicts)s" +msgid "Conflicts with" msgstr "" #: .\app\floorMap\models.py:13 @@ -123,6 +125,7 @@ msgid "Room" msgstr "" #: .\app\floorMap\templates\floorMap\floorMap.html:5 +#: .\app\floorMap\templates\floorMap\floorMap.html:40 msgid "Floor plan" msgstr "" @@ -131,7 +134,7 @@ msgid "Actions on floor map" msgstr "" #: .\app\floorMap\templates\floorMap\floorMap.html:31 -msgid "Add new rental" +msgid "New rental" msgstr "" #: .\app\floorMap\templates\rental\rent_confirm_delete.html:5 diff --git a/app/floorMap/templates/floorMap/floorMap.html b/app/floorMap/templates/floorMap/floorMap.html index a221b3c..3abba88 100644 --- a/app/floorMap/templates/floorMap/floorMap.html +++ b/app/floorMap/templates/floorMap/floorMap.html @@ -28,7 +28,7 @@ diff --git a/app/founder/forms.py b/app/founder/forms.py index f300b22..03c1e9e 100644 --- a/app/founder/forms.py +++ b/app/founder/forms.py @@ -143,7 +143,7 @@ class Meta: widget=forms.Textarea( attrs={ 'placeholder': _(u'Write here a brief summary of your ' - u'skills and your career.'), + u'skills and career.'), 'class': 'md-editor' } ) diff --git a/app/founder/locale/fr/LC_MESSAGES/django.mo b/app/founder/locale/fr/LC_MESSAGES/django.mo index 3396dc3..7bd53f3 100644 Binary files a/app/founder/locale/fr/LC_MESSAGES/django.mo and b/app/founder/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/founder/locale/fr/LC_MESSAGES/django.po b/app/founder/locale/fr/LC_MESSAGES/django.po index 09e0f9d..b7f14d4 100644 --- a/app/founder/locale/fr/LC_MESSAGES/django.po +++ b/app/founder/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-24 14:34-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgid "Description" msgstr "Description" #: .\app\founder\forms.py:145 -msgid "Write here a brief summary of your skills and your career." +msgid "Write here a brief summary of your skills and career." msgstr "Ecrivez ici un bref résumé de vos compétences et de votre parcours." #: .\app\founder\forms.py:153 @@ -101,7 +101,7 @@ msgstr "A propos" #: .\app\founder\templates\founder\detail.html:5 msgid "Details" -msgstr "" +msgstr "Détails" #: .\app\founder\templates\founder\detail.html:11 msgid "Actions on this founder" @@ -120,8 +120,8 @@ msgid "Companies" msgstr "Compagnies" #: .\app\founder\templates\founder\detail.html:99 -msgid "No companies exist." -msgstr "Aucune compagnies." +msgid "No companies found" +msgstr "Aucune compagnie trouvée" #: .\app\founder\templates\founder\founder_form.html:8 msgid "Profile" @@ -141,14 +141,12 @@ msgid "Centech Founders" msgstr "Fondateur du Centech" #: .\app\founder\templates\founder\index.html:11 -msgid "Add new founder" -msgstr "" +msgid "New founder" +msgstr "Nouveau fondateur" #: .\app\founder\templates\founder\index.html:20 -#, fuzzy -#| msgid "Search by name" msgid "Search" -msgstr "Rechercher par nom" +msgstr "Rechercher" #: .\app\founder\templates\founder\index.html:40 msgid "Previous" @@ -158,6 +156,10 @@ msgstr "Précédente" msgid "Next" msgstr "Suivante" +#: .\app\founder\templates\founder\index.html:77 +msgid "Founder" +msgstr "Fondateur" + #: .\app\founder\templates\founder\index.html:83 -msgid "No founders exist." -msgstr "Aucun fondateur" +msgid "No founders found" +msgstr "Aucun fondateur trouvé" diff --git a/app/founder/locale/pt/LC_MESSAGES/django.mo b/app/founder/locale/pt/LC_MESSAGES/django.mo index 58b2ac2..6852a02 100644 Binary files a/app/founder/locale/pt/LC_MESSAGES/django.mo and b/app/founder/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/founder/locale/pt/LC_MESSAGES/django.po b/app/founder/locale/pt/LC_MESSAGES/django.po index 0fb8364..629200a 100644 --- a/app/founder/locale/pt/LC_MESSAGES/django.po +++ b/app/founder/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -71,7 +71,9 @@ msgid "Description" msgstr "Description" #: .\app\founder\forms.py:145 -msgid "Write here a brief summary of your skills and your career." +#, fuzzy +#| msgid "Write here a brief summary of your skills and your career." +msgid "Write here a brief summary of your skills and career." msgstr "Escreva aqui um breve sumário de suas competências e de sua carreira." #: .\app\founder\forms.py:153 @@ -122,7 +124,9 @@ msgid "Companies" msgstr "Empresas" #: .\app\founder\templates\founder\detail.html:99 -msgid "No companies exist." +#, fuzzy +#| msgid "No companies exist." +msgid "No companies found" msgstr "Não há empresas existentes." #: .\app\founder\templates\founder\founder_form.html:8 @@ -145,7 +149,7 @@ msgstr "Fundadores da UCS" #: .\app\founder\templates\founder\index.html:11 #, fuzzy #| msgid "New founder" -msgid "Add new founder" +msgid "New founder" msgstr "Novo fundador" #: .\app\founder\templates\founder\index.html:20 @@ -162,8 +166,16 @@ msgstr "Anterior" msgid "Next" msgstr "Próximo" +#: .\app\founder\templates\founder\index.html:77 +#, fuzzy +#| msgid "Centech Founders" +msgid "Founder" +msgstr "Fundadores da UCS" + #: .\app\founder\templates\founder\index.html:83 -msgid "No founders exist." +#, fuzzy +#| msgid "No founders exist." +msgid "No founders found" msgstr "Não há fundadores." #~ msgid "First name" diff --git a/app/founder/templates/founder/detail.html b/app/founder/templates/founder/detail.html index 3c266bc..51cda43 100644 --- a/app/founder/templates/founder/detail.html +++ b/app/founder/templates/founder/detail.html @@ -96,7 +96,7 @@

    {{ founder.user.first_name }} {{ founder.user.last_name }}< {% endfor %}

    {% else %} -

    {% trans "No companies exist." %}

    +

    {% trans "No companies found" %}

    {% endif %}
    diff --git a/app/founder/templates/founder/index.html b/app/founder/templates/founder/index.html index 73f5822..31046de 100644 --- a/app/founder/templates/founder/index.html +++ b/app/founder/templates/founder/index.html @@ -8,7 +8,7 @@ {% block content %}

    {% trans "Centech Founders" %}

    - {% trans "Add new founder" %} + {% trans "New founder" %}
    @@ -80,6 +80,6 @@

    {% trans "Centech Founders" %}

    {% endfor %}
    {% else %} -

    {% trans "No founders exist." %}

    +

    {% trans "No founders found" %}

    {% endif %} {% endblock %} \ No newline at end of file diff --git a/app/home/locale/fr/LC_MESSAGES/django.mo b/app/home/locale/fr/LC_MESSAGES/django.mo index 1c39732..055a714 100644 Binary files a/app/home/locale/fr/LC_MESSAGES/django.mo and b/app/home/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/home/locale/fr/LC_MESSAGES/django.po b/app/home/locale/fr/LC_MESSAGES/django.po index a5de5ab..b5bfb70 100644 --- a/app/home/locale/fr/LC_MESSAGES/django.po +++ b/app/home/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:52-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -36,7 +36,7 @@ msgstr "Courriel" #: .\app\home\models.py:20 msgid "Education" -msgstr "Niveau d'étude" +msgstr "Étude" #: .\app\home\models.py:24 msgid "Education level" @@ -88,7 +88,7 @@ msgstr "linkedIn" #: .\app\home\templates\home\index.html:5 msgid "Home" -msgstr "" +msgstr "Accueil" #: .\app\home\templates\home\index.html:13 msgid "Dashboard" @@ -99,47 +99,51 @@ msgid "Follow us on" msgstr "Suivez nous sur" #: .\app\home\templates\home\index.html:44 +#, fuzzy msgid "" "Cette plateforme est une plateforme privée appartenant au Centech, " "incubateur de sociétés technologiques de l'École de Technologie supérieure " "de Montréal." msgstr "" +"Cette plateforme est une plateforme privée appartenant au Centech, " +"incubateur de sociétés technologiques de l'École de Technologie supérieure " +"de Montréal." #: .\app\home\templates\home\index.html:45 +#, fuzzy msgid "" "Si vous voulez disposer d'un compte d'accès ou avoir plus de renseignements " "sur notre plateforme, merci de contacter nos services via l'adresse" msgstr "" +"Si vous voulez disposer d'un compte d'accès ou avoir plus de renseignements " +"sur notre plateforme, merci de contacter nos services via l'adresse" #: .\app\home\templates\home\maStartup.html:4 msgid "Road map" -msgstr "" +msgstr "Carte routière" #: .\app\home\templates\home\noAccessPermissions.html:5 msgid "No Access" msgstr "Pas d'autorisation" #: .\app\home\templates\home\noAccessPermissions.html:9 -msgid "Sorry! But you don't have the permissions to access this page" -msgstr "Désolé! Mais vous n'avez pas la permissions d'accéder a cette page" +msgid "Sorry! You do not have the permissions to access this page." +msgstr "Désolé! Vous n'avez pas les permissions pour accéder à cette page" #: .\app\home\templates\home\noAccessPermissions.html:11 +#: .\app\home\templates\registration\login.html:15 msgid "" -"If it's an error, you can contact the administrator for have access on this " -"page" -msgstr "" -"Si c'est une erreur, vous pouvez contacter l'administrateur pour avoir " -"l'accès a cette page" +"If you believe this is an error, please contact the administrator for " +"assistance" +msgstr "Si c'est une erreur, merci de contact l'administrateur" #: .\app\home\templates\home\noAccessPermissions.html:13 -msgid "Sorry for inconvenience" +msgid "Sorry for the inconvenience" msgstr "Désolé pour le dérangement" #: .\app\home\templates\home\password_update_form.html:7 -#, fuzzy -#| msgid "Account" msgid "My account" -msgstr "Compte" +msgstr "Mon Compte" #: .\app\home\templates\home\password_update_form.html:14 msgid "Save" @@ -151,7 +155,7 @@ msgstr "Réinitialiser" #: .\app\home\templates\home\summary.html:8 msgid "Summary" -msgstr "" +msgstr "Sommaire" #: .\app\home\templates\home\summary.html:20 msgid "Select a status" @@ -211,12 +215,12 @@ msgstr "TRL" #: .\app\home\templates\home\summary.html:154 #: .\app\home\templates\home\summary.html:156 -msgid "Last irl" +msgid "Last IRL" msgstr "Dernier IRL" #: .\app\home\templates\home\summary.html:154 #: .\app\home\templates\home\summary.html:158 -msgid "Last trl" +msgid "Last TRL" msgstr "Dernier TRL" #: .\app\home\templates\home\summary.html:177 @@ -262,8 +266,8 @@ msgid "Incubation duration (months)" msgstr "Temps d'incubation (mois)" #: .\app\home\templates\registration\login.html:5 -msgid "Connexion" -msgstr "" +msgid "Login" +msgstr "Connexion" #: .\app\home\templates\registration\login.html:14 msgid "Your username and password didn't match. Please try again." @@ -271,9 +275,18 @@ msgstr "" "Votre nom d'utilisateur et votre mot de passe ne correspondent pas. Veuillez " "recommencer." -#: .\app\home\templates\registration\login.html:15 -msgid "If it's an error, please contact the administrator" -msgstr "Si c'est une erreur, merci de contact l'administrateur" +#~ msgid "Connexion" +#~ msgstr "Login" + +#~ msgid "" +#~ "If it's an error, you can contact the administrator for have access on " +#~ "this page" +#~ msgstr "" +#~ "Si c'est une erreur, vous pouvez contacter l'administrateur pour avoir " +#~ "l'accès a cette page" + +#~ msgid "Last trl" +#~ msgstr "Dernier TRL" #, fuzzy #~| msgid "Companies" diff --git a/app/home/locale/pt/LC_MESSAGES/django.mo b/app/home/locale/pt/LC_MESSAGES/django.mo index 0dd1f88..6816246 100644 Binary files a/app/home/locale/pt/LC_MESSAGES/django.mo and b/app/home/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/home/locale/pt/LC_MESSAGES/django.po b/app/home/locale/pt/LC_MESSAGES/django.po index 72b6e73..14920fe 100644 --- a/app/home/locale/pt/LC_MESSAGES/django.po +++ b/app/home/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -136,17 +136,24 @@ msgid "No Access" msgstr "Sem acesso" #: .\app\home\templates\home\noAccessPermissions.html:9 -msgid "Sorry! But you don't have the permissions to access this page" +#, fuzzy +#| msgid "Sorry! But you don't have the permissions to access this page" +msgid "Sorry! You do not have the permissions to access this page." msgstr "Desculpe! Mas você não tem permissões para acessar esta página" #: .\app\home\templates\home\noAccessPermissions.html:11 +#: .\app\home\templates\registration\login.html:15 +#, fuzzy +#| msgid "If it's an error, please contact the administrator" msgid "" -"If it's an error, you can contact the administrator for have access on this " -"page" -msgstr "Se há um erro, contate o administrador para ter acesso a esta página" +"If you believe this is an error, please contact the administrator for " +"assistance" +msgstr "Se há um erro, por favor contate o administrador" #: .\app\home\templates\home\noAccessPermissions.html:13 -msgid "Sorry for inconvenience" +#, fuzzy +#| msgid "Sorry for inconvenience" +msgid "Sorry for the inconvenience" msgstr "Desculpe pela inconveniência" #: .\app\home\templates\home\password_update_form.html:7 @@ -223,13 +230,17 @@ msgstr "TRL" #: .\app\home\templates\home\summary.html:154 #: .\app\home\templates\home\summary.html:156 -msgid "Last irl" +#, fuzzy +#| msgid "Last irl" +msgid "Last IRL" msgstr "Último irl" #: .\app\home\templates\home\summary.html:154 #: .\app\home\templates\home\summary.html:158 -msgid "Last trl" -msgstr "Último trl" +#, fuzzy +#| msgid "Last irl" +msgid "Last TRL" +msgstr "Último irl" #: .\app\home\templates\home\summary.html:177 msgid "Level" @@ -274,16 +285,21 @@ msgid "Incubation duration (months)" msgstr "Duração da incubação (meses)" #: .\app\home\templates\registration\login.html:5 -msgid "Connexion" +msgid "Login" msgstr "" #: .\app\home\templates\registration\login.html:14 msgid "Your username and password didn't match. Please try again." msgstr "Seu login e senha não conferem. Por favor tente novamente." -#: .\app\home\templates\registration\login.html:15 -msgid "If it's an error, please contact the administrator" -msgstr "Se há um erro, por favor contate o administrador" +#~ msgid "" +#~ "If it's an error, you can contact the administrator for have access on " +#~ "this page" +#~ msgstr "" +#~ "Se há um erro, contate o administrador para ter acesso a esta página" + +#~ msgid "Last trl" +#~ msgstr "Último trl" #~ msgid "Account" #~ msgstr "Conta" diff --git a/app/home/locale/pt/LC_MESSAGES/djangojs.mo b/app/home/locale/pt/LC_MESSAGES/djangojs.mo index 3d480c2..163651c 100644 Binary files a/app/home/locale/pt/LC_MESSAGES/djangojs.mo and b/app/home/locale/pt/LC_MESSAGES/djangojs.mo differ diff --git a/app/home/locale/pt/LC_MESSAGES/djangojs.po b/app/home/locale/pt/LC_MESSAGES/djangojs.po index e2ec0d0..29f7027 100644 --- a/app/home/locale/pt/LC_MESSAGES/djangojs.po +++ b/app/home/locale/pt/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 12:54-0400\n" -"PO-Revision-Date: 2016-03-22 16:23-0400\n" +"PO-Revision-Date: 2016-03-24 14:34-0400\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/app/home/templates/home/noAccessPermissions.html b/app/home/templates/home/noAccessPermissions.html index aec00c9..6de8840 100644 --- a/app/home/templates/home/noAccessPermissions.html +++ b/app/home/templates/home/noAccessPermissions.html @@ -6,11 +6,11 @@ {% block content %} -

    {% trans "Sorry! But you don't have the permissions to access this page" %}

    +

    {% trans "Sorry! You do not have the permissions to access this page." %}

    -

    {% trans "If it's an error, you can contact the administrator for have access on this page" %} : {{app.site.email_technique}}

    +

    {% trans "If you believe this is an error, please contact the administrator for assistance" %} : {{app.site.email_technique}}

    -

    {% trans "Sorry for inconvenience" %}..

    +

    {% trans "Sorry for the inconvenience" %}...

    {% endblock %} \ No newline at end of file diff --git a/app/home/templates/home/summary.html b/app/home/templates/home/summary.html index 4d981eb..c2a097c 100644 --- a/app/home/templates/home/summary.html +++ b/app/home/templates/home/summary.html @@ -151,11 +151,11 @@

    {% trans "Indicators of performances" %}

    data.addColumn({type: 'string', role: 'tooltip'}); {% for company, irl, trl in KPI %} {% if irl and trl %} - data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}\n{% trans "Last irl" %}:{{irl.period_start}}", {{trl.level}}, "TRL:{{trl.level}}\n{% trans "Last trl" %}:{{trl.period_start}}"],]); + data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}\n{% trans "Last IRL" %}:{{irl.period_start}}", {{trl.level}}, "TRL:{{trl.level}}\n{% trans "Last TRL" %}:{{trl.period_start}}"],]); {% elif irl %} - data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}\n{% trans "Last irl" %}:{{irl.period_start}}", {{trl.level}}, "TRL:{{trl.level}}"],]); + data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}\n{% trans "Last IRL" %}:{{irl.period_start}}", {{trl.level}}, "TRL:{{trl.level}}"],]); {% elif trl %} - data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}", {{trl.level}}, "TRL:{{trl.level}}\n{% trans "Last trl" %}:{{trl.period_start}}"],]); + data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}", {{trl.level}}, "TRL:{{trl.level}}\n{% trans "Last TRL" %}:{{trl.period_start}}"],]); {% else %} data.addRows([['{{company.name|safe}}', '{{company.id}}', {{irl.level}}, "IRL:{{irl.level}}", {{trl.level}}, "TRL:{{trl.level}}"],]); {% endif %} diff --git a/app/home/templates/registration/login.html b/app/home/templates/registration/login.html index 319a8dd..1b67214 100644 --- a/app/home/templates/registration/login.html +++ b/app/home/templates/registration/login.html @@ -2,7 +2,7 @@ {% load i18n %} -{% block title %}{% trans "Connexion" %}{% endblock %} +{% block title %}{% trans "Login" %}{% endblock %} {% block content %}
    @@ -12,7 +12,7 @@ {% if form.errors %}

    {% trans "Your username and password didn't match. Please try again." %}
    - {% trans "If it's an error, please contact the administrator" %} : {{app.site.email_technique}}

    + {% trans "If you believe this is an error, please contact the administrator for assistance" %} : {{app.site.email_technique}}

    {% endif %} {% csrf_token %} diff --git a/app/kanboard/forms.py b/app/kanboard/forms.py index 203313e..ef2b74b 100644 --- a/app/kanboard/forms.py +++ b/app/kanboard/forms.py @@ -46,7 +46,7 @@ class Meta: label=_('Title*'), required=True, ) - title.widget.attrs.update({'placeholder': _(u'Titre'), 'id': 'title'}) + title.widget.attrs.update({'placeholder': _(u'Title'), 'id': 'title'}) comment = forms.CharField( label=_('Comment'), diff --git a/app/kanboard/locale/fr/LC_MESSAGES/django.mo b/app/kanboard/locale/fr/LC_MESSAGES/django.mo index 32c362c..cf89a72 100644 Binary files a/app/kanboard/locale/fr/LC_MESSAGES/django.mo and b/app/kanboard/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/kanboard/locale/fr/LC_MESSAGES/django.po b/app/kanboard/locale/fr/LC_MESSAGES/django.po index baf8d5a..e27b928 100644 --- a/app/kanboard/locale/fr/LC_MESSAGES/django.po +++ b/app/kanboard/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-24 14:34-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -27,8 +27,8 @@ msgid "Title*" msgstr "Titre*" #: .\app\kanboard\forms.py:49 -msgid "Titre" -msgstr "Titre" +msgid "Title" +msgstr "Titre*" #: .\app\kanboard\forms.py:52 msgid "Comment" @@ -55,10 +55,8 @@ msgid "State" msgstr "Etat" #: .\app\kanboard\templates\kanboard\board.html:5 -#, fuzzy -#| msgid "Kanboard of" msgid "Kanboard" -msgstr "Kanboard de" +msgstr "Kanboard" #: .\app\kanboard\templates\kanboard\board.html:51 msgid "Cancel" @@ -89,9 +87,8 @@ msgstr "Tous" #: .\app\kanboard\templates\kanboard\card.html:8 #, fuzzy -#| msgid "Kanboard of" msgid "Kanboard card" -msgstr "Kanboard de" +msgstr "Carte Kanboard" #: .\app\kanboard\templates\kanboard\card.html:28 msgid "From" @@ -106,7 +103,7 @@ msgid "since" msgstr "depuis" #: .\app\kanboard\templates\kanboard\card.html:35 -msgid "Description of the task" +msgid "Task description" msgstr "Description de la tâche" #: .\app\kanboard\templates\kanboard\card.html:41 @@ -116,3 +113,9 @@ msgstr "Commentaires" #: .\app\kanboard\templates\kanboard\card.html:51 msgid "Save" msgstr "Enregistrer" + +#~ msgid "Titre" +#~ msgstr "Titre" + +#~ msgid "Description of the task" +#~ msgstr "Description de la tâche" diff --git a/app/kanboard/locale/fr/LC_MESSAGES/djangojs.mo b/app/kanboard/locale/fr/LC_MESSAGES/djangojs.mo index 4b13c74..4cf5ce3 100644 Binary files a/app/kanboard/locale/fr/LC_MESSAGES/djangojs.mo and b/app/kanboard/locale/fr/LC_MESSAGES/djangojs.mo differ diff --git a/app/kanboard/locale/fr/LC_MESSAGES/djangojs.po b/app/kanboard/locale/fr/LC_MESSAGES/djangojs.po index 0e09196..dc0951c 100644 --- a/app/kanboard/locale/fr/LC_MESSAGES/djangojs.po +++ b/app/kanboard/locale/fr/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-08-05 15:26-0400\n" -"PO-Revision-Date: 2016-03-22 16:23-0400\n" +"PO-Revision-Date: 2016-03-24 14:34-0400\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/app/kanboard/locale/pt/LC_MESSAGES/django.mo b/app/kanboard/locale/pt/LC_MESSAGES/django.mo index 0c78e61..1886877 100644 Binary files a/app/kanboard/locale/pt/LC_MESSAGES/django.mo and b/app/kanboard/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/kanboard/locale/pt/LC_MESSAGES/django.po b/app/kanboard/locale/pt/LC_MESSAGES/django.po index cebad31..df11b18 100644 --- a/app/kanboard/locale/pt/LC_MESSAGES/django.po +++ b/app/kanboard/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -27,8 +27,10 @@ msgid "Title*" msgstr "Título*" #: .\app\kanboard\forms.py:49 -msgid "Titre" -msgstr "Título" +#, fuzzy +#| msgid "Title*" +msgid "Title" +msgstr "Título*" #: .\app\kanboard\forms.py:52 msgid "Comment" @@ -106,8 +108,8 @@ msgid "since" msgstr "desde" #: .\app\kanboard\templates\kanboard\card.html:35 -msgid "Description of the task" -msgstr "Descrição da tarefa" +msgid "Task description" +msgstr "" #: .\app\kanboard\templates\kanboard\card.html:41 msgid "Comments" @@ -116,3 +118,9 @@ msgstr "Comentários" #: .\app\kanboard\templates\kanboard\card.html:51 msgid "Save" msgstr "Salvar" + +#~ msgid "Titre" +#~ msgstr "Título" + +#~ msgid "Description of the task" +#~ msgstr "Descrição da tarefa" diff --git a/app/kanboard/locale/pt/LC_MESSAGES/djangojs.mo b/app/kanboard/locale/pt/LC_MESSAGES/djangojs.mo index 3d480c2..163651c 100644 Binary files a/app/kanboard/locale/pt/LC_MESSAGES/djangojs.mo and b/app/kanboard/locale/pt/LC_MESSAGES/djangojs.mo differ diff --git a/app/kanboard/locale/pt/LC_MESSAGES/djangojs.po b/app/kanboard/locale/pt/LC_MESSAGES/djangojs.po index 17b8a0c..ced25b7 100644 --- a/app/kanboard/locale/pt/LC_MESSAGES/djangojs.po +++ b/app/kanboard/locale/pt/LC_MESSAGES/djangojs.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-10-09 12:54-0400\n" -"PO-Revision-Date: 2016-03-22 16:23-0400\n" +"PO-Revision-Date: 2016-03-24 14:34-0400\n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" diff --git a/app/kanboard/templates/kanboard/card.html b/app/kanboard/templates/kanboard/card.html index 832611e..f38b442 100644 --- a/app/kanboard/templates/kanboard/card.html +++ b/app/kanboard/templates/kanboard/card.html @@ -32,7 +32,7 @@

    {{card.title}}

    {%trans "since" %} {{card.created|date:"Y/m/d"}}
    {%trans "Due date" %} {{card.deadline|date:"Y/m/d" }}

    -

    {%trans "Description of the task" %} :

    +

    {%trans "Task description" %} :

    {{card.comment}}

    diff --git a/app/kpi/locale/fr/LC_MESSAGES/django.mo b/app/kpi/locale/fr/LC_MESSAGES/django.mo index 06ef43d..e4ee031 100644 Binary files a/app/kpi/locale/fr/LC_MESSAGES/django.mo and b/app/kpi/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/kpi/locale/fr/LC_MESSAGES/django.po b/app/kpi/locale/fr/LC_MESSAGES/django.po index 7e76b14..ee8c8ab 100644 --- a/app/kpi/locale/fr/LC_MESSAGES/django.po +++ b/app/kpi/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-24 14:34-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -53,7 +53,7 @@ msgstr "Commentaire" #: .\app\kpi\templates\kpi\irl.html:7 msgid "IRLs" -msgstr "" +msgstr "IRLs" #: .\app\kpi\templates\kpi\irl.html:25 msgid "Complete First-Pass Business Model Canvas" @@ -119,26 +119,24 @@ msgid "Delete" msgstr "Supprimer" #: .\app\kpi\templates\kpi\irl.html:137 -msgid "No one IRL for the moment." -msgstr "Aucun IRL" +msgid "No IRLs found" +msgstr "Aucun IRL trouvé" #: .\app\kpi\templates\kpi\irl.html:140 msgid "New IRL" msgstr "Nouvel IRL" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:7 -#, fuzzy -#| msgid "Delete" msgid "Delete IRL" -msgstr "Supprimer" +msgstr "Supprimer IRL" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:11 -msgid "Are you sure you want to delete this IRL ?" -msgstr "Etes-vous sûr de vouloir supprimer cet IRL" +msgid "Are you sure you want to delete this IRL?" +msgstr "Etes-vous sûr de vouloir supprimer cet IRL?" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:14 #: .\app\kpi\templates\kpi\trl_confirm_delete.html:14 -msgid "create on" +msgid "Created on" msgstr "Créé le" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:19 @@ -157,7 +155,7 @@ msgstr "Enregistrer" #: .\app\kpi\templates\kpi\trl.html:7 msgid "TRLs" -msgstr "" +msgstr "TRLs" #: .\app\kpi\templates\kpi\trl.html:25 msgid "Observation and recording of concept basics" @@ -222,23 +220,27 @@ msgid "TRL" msgstr "TRL" #: .\app\kpi\templates\kpi\trl.html:137 -msgid "No one TRL for the moment." -msgstr "Aucun TRL." +msgid "No TRLs found" +msgstr "Aucun TRL trouvé" #: .\app\kpi\templates\kpi\trl.html:140 msgid "New TRL" msgstr "Nouveau TRL" #: .\app\kpi\templates\kpi\trl_confirm_delete.html:7 -#, fuzzy -#| msgid "Delete" msgid "Delete TRL" -msgstr "Supprimer" +msgstr "Supprimer TRL" #: .\app\kpi\templates\kpi\trl_confirm_delete.html:11 -msgid "Are you sure you want to delete this TRL ?" -msgstr "Etes-vous sûr de vouloir supprimer ce TRL" +msgid "Are you sure you want to delete this TRL?" +msgstr "Etes-vous sûr de vouloir supprimer ce TRL?" #: .\app\kpi\templates\kpi\trl_form.html:10 msgid "New TRL for" msgstr "Nouveau TRL pour" + +#~ msgid "No one IRL for the moment." +#~ msgstr "Aucun IRL trouvé" + +#~ msgid "No one TRL for the moment." +#~ msgstr "Aucun TRL trouvé" diff --git a/app/kpi/locale/pt/LC_MESSAGES/django.mo b/app/kpi/locale/pt/LC_MESSAGES/django.mo index de26d85..b0e026d 100644 Binary files a/app/kpi/locale/pt/LC_MESSAGES/django.mo and b/app/kpi/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/kpi/locale/pt/LC_MESSAGES/django.po b/app/kpi/locale/pt/LC_MESSAGES/django.po index 3ec98df..ad50e74 100644 --- a/app/kpi/locale/pt/LC_MESSAGES/django.po +++ b/app/kpi/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -118,8 +118,10 @@ msgid "Delete" msgstr "Deletar" #: .\app\kpi\templates\kpi\irl.html:137 -msgid "No one IRL for the moment." -msgstr "Sem IRL para este momento." +#, fuzzy +#| msgid "New IRL for" +msgid "No IRLs found" +msgstr "Nova IRL para" #: .\app\kpi\templates\kpi\irl.html:140 msgid "New IRL" @@ -132,12 +134,16 @@ msgid "Delete IRL" msgstr "Deletar" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:11 -msgid "Are you sure you want to delete this IRL ?" +#, fuzzy +#| msgid "Are you sure you want to delete this IRL ?" +msgid "Are you sure you want to delete this IRL?" msgstr "Você tem certeza que deseja deletar esta venda?" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:14 #: .\app\kpi\templates\kpi\trl_confirm_delete.html:14 -msgid "create on" +#, fuzzy +#| msgid "create on" +msgid "Created on" msgstr "criado em" #: .\app\kpi\templates\kpi\irl_confirm_delete.html:19 @@ -220,8 +226,10 @@ msgid "TRL" msgstr "TRL" #: .\app\kpi\templates\kpi\trl.html:137 -msgid "No one TRL for the moment." -msgstr "Não há TRL para o momento." +#, fuzzy +#| msgid "New TRL for" +msgid "No TRLs found" +msgstr "Nova TRL para" #: .\app\kpi\templates\kpi\trl.html:140 msgid "New TRL" @@ -234,13 +242,21 @@ msgid "Delete TRL" msgstr "Deletar" #: .\app\kpi\templates\kpi\trl_confirm_delete.html:11 -msgid "Are you sure you want to delete this TRL ?" +#, fuzzy +#| msgid "Are you sure you want to delete this TRL ?" +msgid "Are you sure you want to delete this TRL?" msgstr "Você tem certeza que deseja deletar esta TRL?" #: .\app\kpi\templates\kpi\trl_form.html:10 msgid "New TRL for" msgstr "Nova TRL para" +#~ msgid "No one IRL for the moment." +#~ msgstr "Sem IRL para este momento." + +#~ msgid "No one TRL for the moment." +#~ msgstr "Não há TRL para o momento." + #~ msgid "Basic principles observed and reported" #~ msgstr "Princípios básicos observados e reportados" diff --git a/app/kpi/templates/kpi/irl.html b/app/kpi/templates/kpi/irl.html index 3340fd4..ea64cb6 100644 --- a/app/kpi/templates/kpi/irl.html +++ b/app/kpi/templates/kpi/irl.html @@ -134,7 +134,7 @@

    {% trans "IRL of" %} {{ company.name }}

    {% else %} -

    {% trans "No one IRL for the moment." %}

    +

    {% trans "No IRLs found" %}

    {% endif %} {% if isCentech %} {% trans "New IRL" %} diff --git a/app/kpi/templates/kpi/irl_confirm_delete.html b/app/kpi/templates/kpi/irl_confirm_delete.html index e6b6b32..627ffcc 100644 --- a/app/kpi/templates/kpi/irl_confirm_delete.html +++ b/app/kpi/templates/kpi/irl_confirm_delete.html @@ -8,10 +8,10 @@ {% block content %}

    {% trans "IRL" %}

    -

    {% trans "Are you sure you want to delete this IRL ?" %}

    +

    {% trans "Are you sure you want to delete this IRL?" %}

    {% trans "Level"%} : {{ irl.level }}
    - {% trans "create on" %} : {{ irl.period_start }}
    + {% trans "Created on" %} : {{ irl.period_start }}
    {% trans "Comment" %} : {{ irl.comment }}

    diff --git a/app/kpi/templates/kpi/trl.html b/app/kpi/templates/kpi/trl.html index e8cca9b..68a22d8 100644 --- a/app/kpi/templates/kpi/trl.html +++ b/app/kpi/templates/kpi/trl.html @@ -134,7 +134,7 @@

    {% trans "TRL of" %} {{ company.name }}

    {% else %} -

    {% trans "No one TRL for the moment." %}

    +

    {% trans "No TRLs found" %}

    {% endif %} {% if isCentech %} {% trans "New TRL" %} diff --git a/app/kpi/templates/kpi/trl_confirm_delete.html b/app/kpi/templates/kpi/trl_confirm_delete.html index 1919cad..3392dae 100644 --- a/app/kpi/templates/kpi/trl_confirm_delete.html +++ b/app/kpi/templates/kpi/trl_confirm_delete.html @@ -8,10 +8,10 @@ {% block content %}

    {% trans "TRL" %}

    -

    {% trans "Are you sure you want to delete this TRL ?" %}

    +

    {% trans "Are you sure you want to delete this TRL?" %}

    {% trans "Level"%} : {{ trl.level }}
    - {% trans "create on" %} : {{ trl.period_start }}
    + {% trans "Created on" %} : {{ trl.period_start }}
    {% trans "Comment" %} : {{ trl.comment }}

    diff --git a/app/mentor/locale/fr/LC_MESSAGES/django.mo b/app/mentor/locale/fr/LC_MESSAGES/django.mo index af0ca4c..d2c8c02 100644 Binary files a/app/mentor/locale/fr/LC_MESSAGES/django.mo and b/app/mentor/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/mentor/locale/fr/LC_MESSAGES/django.po b/app/mentor/locale/fr/LC_MESSAGES/django.po index aa7847c..4dd1103 100644 --- a/app/mentor/locale/fr/LC_MESSAGES/django.po +++ b/app/mentor/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-24 14:34-0400\n" +"Last-Translator: Nicholas Savard\n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" @@ -99,9 +99,13 @@ msgstr "Type" msgid "URL" msgstr "URL" +#: .\app\mentor\models.py:58 .\app\mentor\models.py:61 +msgid "Mentor" +msgstr "Mentor" + #: .\app\mentor\templates\mentor\detail.html:5 msgid "Details" -msgstr "" +msgstr "Détails" #: .\app\mentor\templates\mentor\detail.html:11 msgid "Actions on this mentor" @@ -120,8 +124,8 @@ msgid "Companies" msgstr "Compagnies" #: .\app\mentor\templates\mentor\detail.html:105 -msgid "No companies exist." -msgstr "Aucune compagnies." +msgid "No companies found" +msgstr "Aucune compagnie trouvée" #: .\app\mentor\templates\mentor\index.html:6 #: .\app\mentor\templates\mentor\index.html:9 @@ -129,18 +133,16 @@ msgid "Centech Mentors" msgstr "Mentors du Centech" #: .\app\mentor\templates\mentor\index.html:11 -msgid "Add new mentor" -msgstr "" +msgid "New mentor" +msgstr "Nouveau mentor" #: .\app\mentor\templates\mentor\index.html:20 -#, fuzzy -#| msgid "Search by name" msgid "Search" -msgstr "Rechercher par nom" +msgstr "Rechercher" #: .\app\mentor\templates\mentor\index.html:48 -msgid "No mentors exist." -msgstr "Aucun mentors." +msgid "No mentors found" +msgstr "Aucun mentor trouvé" #: .\app\mentor\templates\mentor\mentor_form.html:8 msgid "Profile" diff --git a/app/mentor/locale/pt/LC_MESSAGES/django.mo b/app/mentor/locale/pt/LC_MESSAGES/django.mo index abf459f..3659de2 100644 Binary files a/app/mentor/locale/pt/LC_MESSAGES/django.mo and b/app/mentor/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/mentor/locale/pt/LC_MESSAGES/django.po b/app/mentor/locale/pt/LC_MESSAGES/django.po index cbe3eaa..1d2a439 100644 --- a/app/mentor/locale/pt/LC_MESSAGES/django.po +++ b/app/mentor/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" @@ -99,6 +99,10 @@ msgstr "Tipo" msgid "URL" msgstr "URL" +#: .\app\mentor\models.py:58 .\app\mentor\models.py:61 +msgid "Mentor" +msgstr "" + #: .\app\mentor\templates\mentor\detail.html:5 msgid "Details" msgstr "" @@ -122,7 +126,9 @@ msgid "Companies" msgstr "Empresas" #: .\app\mentor\templates\mentor\detail.html:105 -msgid "No companies exist." +#, fuzzy +#| msgid "No companies exist." +msgid "No companies found" msgstr "Nenhuma empresa existe." #: .\app\mentor\templates\mentor\index.html:6 @@ -133,7 +139,7 @@ msgstr "Mentores da ETS" #: .\app\mentor\templates\mentor\index.html:11 #, fuzzy #| msgid "New mentor" -msgid "Add new mentor" +msgid "New mentor" msgstr "Novo mentor" #: .\app\mentor\templates\mentor\index.html:20 @@ -143,7 +149,9 @@ msgid "Search" msgstr "Procurar por nome" #: .\app\mentor\templates\mentor\index.html:48 -msgid "No mentors exist." +#, fuzzy +#| msgid "No mentors exist." +msgid "No mentors found" msgstr "Nenhum mentor existe" #: .\app\mentor\templates\mentor\mentor_form.html:8 diff --git a/app/mentor/templates/mentor/detail.html b/app/mentor/templates/mentor/detail.html index 5c350eb..326da7a 100644 --- a/app/mentor/templates/mentor/detail.html +++ b/app/mentor/templates/mentor/detail.html @@ -102,7 +102,7 @@

    {{ mentor.get_type }}

    {% else %} -

    {% trans "No companies exist." %}

    +

    {% trans "No companies found" %}

    {% endif %} diff --git a/app/mentor/templates/mentor/index.html b/app/mentor/templates/mentor/index.html index a488917..80ea08f 100644 --- a/app/mentor/templates/mentor/index.html +++ b/app/mentor/templates/mentor/index.html @@ -8,7 +8,7 @@ {% block content %}

    {% trans "Centech Mentors" %}

    - {% trans "Add new mentor" %} + {% trans "New mentor" %}
    @@ -45,7 +45,7 @@

    {% trans "Centech Mentors" %}

    {% else %} -

    {% trans "No mentors exist." %}

    +

    {% trans "No mentors found" %}

    {% endif %} {% endblock %} diff --git a/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.mo b/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.mo index 088a8ea..e5e50b6 100644 Binary files a/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.mo and b/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.po b/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.po index f8d0e2e..6727ee5 100644 --- a/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.po +++ b/app/valuePropositionCanvas/locale/fr/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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: fr\n" diff --git a/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.mo b/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.mo index 5d747bc..4da3712 100644 Binary files a/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.mo and b/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.mo differ diff --git a/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.po b/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.po index 6305bda..30b2a9f 100644 --- a/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.po +++ b/app/valuePropositionCanvas/locale/pt/LC_MESSAGES/django.po @@ -7,8 +7,8 @@ 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" +"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" diff --git a/templates/dashboard.html b/templates/dashboard.html index bdec7a4..3a45456 100644 --- a/templates/dashboard.html +++ b/templates/dashboard.html @@ -115,7 +115,7 @@
    -

    Copyright © ETS Centech 2015. {% trans "All Rights Reserved" %}

    +

    Copyright © ETS Centech 2015. {% trans "All rights reserved" %}.