From 724f3d8d6ffca5fad2a5b3238b191e0ca9d5556d Mon Sep 17 00:00:00 2001
From: Skia <skia@libskia.so>
Date: Thu, 21 Jul 2016 12:09:57 +0200
Subject: [PATCH] Templates and views

---
 .../accounting/bank_account_details.jinja     |   7 +-
 .../accounting/club_account_details.jinja     |   7 +-
 accounting/views.py                           |   7 +-
 core/templates/core/user_tools.jinja          |  20 +-
 locale/fr/LC_MESSAGES/django.mo               | Bin 16353 -> 16727 bytes
 locale/fr/LC_MESSAGES/django.po               | 223 ++++++++++--------
 6 files changed, 159 insertions(+), 105 deletions(-)

diff --git a/accounting/templates/accounting/bank_account_details.jinja b/accounting/templates/accounting/bank_account_details.jinja
index 434d7ef1..96ef7b30 100644
--- a/accounting/templates/accounting/bank_account_details.jinja
+++ b/accounting/templates/accounting/bank_account_details.jinja
@@ -5,7 +5,12 @@
     <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
     {{ object.name }}
     </p>
-    <h2>{% trans %}View account{% endtrans %}</h2>
+    <h2>{% trans %}Bank account: {% endtrans %}{{ object.name }}</h2>
+    <h4>{% trans %}Infos{% endtrans %}</h4>
+    <ul>
+        <li><strong>{% trans %}IBAN: {% endtrans %}</strong>{{ object.iban }}</li>
+        <li><strong>{% trans %}Number: {% endtrans %}</strong>{{ object.number }}</li>
+    </ul>
     <p><a href="{{ url('accounting:club_new') }}?parent={{ object.id }}">{% trans %}New club account{% endtrans %}</a></p>
     <ul>
     {% for c in object.club_accounts.all() %}
diff --git a/accounting/templates/accounting/club_account_details.jinja b/accounting/templates/accounting/club_account_details.jinja
index 4c0eff9b..73e513bb 100644
--- a/accounting/templates/accounting/club_account_details.jinja
+++ b/accounting/templates/accounting/club_account_details.jinja
@@ -5,12 +5,7 @@
     <a href="{{ url('accounting:bank_list') }}">{% trans %}Accounting{% endtrans %}</a> >
     <a href="{{ url('accounting:bank_details', b_account_id=object.bank_account.id) }}">{{object.bank_account }}</a> >
     {{ object }}
-    <h2>{% trans %}View account:{% endtrans %} {{ object.name }}</h2>
-    <ul>
-        {% for k,v in object.__dict__.items() %}
-        <li>{{ k }} - {{ v }}</li>
-        {% endfor %}
-    </ul>
+    <h2>{% trans %}Club account:{% endtrans %} {{ object.name }}</h2>
     {% if not object.has_open_journal() %}
     <p><a href="{{ url('accounting:journal_new') }}?parent={{ object.id }}">{% trans %}New journal{% endtrans %}</a></p>
     {% else %}
diff --git a/accounting/views.py b/accounting/views.py
index 5016ce75..473e2457 100644
--- a/accounting/views.py
+++ b/accounting/views.py
@@ -65,7 +65,7 @@ class BankAccountCreateView(CanCreateMixin, CreateView):
     Create a bank account (for the admins)
     """
     model = BankAccount
-    fields = ['name', 'iban', 'number']
+    fields = ['name', 'club', 'iban', 'number']
     template_name = 'core/create.jinja'
 
 class BankAccountDeleteView(CanEditPropMixin, DeleteView): # TODO change Delete to Close
@@ -163,9 +163,8 @@ class OperationCreateView(CanCreateMixin, CreateView):
     Create an operation
     """
     model = Operation
-    # fields = ['type', 'amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done']
     form_class = modelform_factory(Operation,
-            fields=['amount', 'label', 'remark', 'journal', 'date', 'cheque_number', 'accounting_type', 'done'],
+            fields=['amount', 'label', 'remark', 'journal', 'date', 'mode', 'cheque_number', 'accounting_type', 'done'],
             widgets={'journal': HiddenInput})
     template_name = 'core/create.jinja'
 
@@ -183,6 +182,6 @@ class OperationEditView(CanEditMixin, UpdateView):
     """
     model = Operation
     pk_url_kwarg = "op_id"
-    fields = ['amount', 'label', 'remark', 'date', 'cheque_number', 'accounting_type', 'done']
+    fields = ['amount', 'label', 'remark', 'date', 'mode', 'cheque_number', 'accounting_type', 'done']
     template_name = 'core/edit.jinja'
 
diff --git a/core/templates/core/user_tools.jinja b/core/templates/core/user_tools.jinja
index 241ca37d..4d63f1be 100644
--- a/core/templates/core/user_tools.jinja
+++ b/core/templates/core/user_tools.jinja
@@ -7,6 +7,7 @@
 {% block content %}
 <h3>{% trans %}User Tools{% endtrans %}</h3>
 
+<hr>
 <h4>{% trans %}Sith management{% endtrans %}</h4>
 <ul>
     {% if user.is_in_group(settings.SITH_GROUPS['root']['name']) %}
@@ -23,6 +24,7 @@
     {% endif %}
 </ul>
 
+<hr>
 <h4>{% trans %}Counters{% endtrans %}</h4>
 <ul>
     {% for b in settings.SITH_COUNTER_BARS %}
@@ -33,7 +35,23 @@
     {% endfor %}
 </ul>
 
-<h4>{% trans %}Clubs{% endtrans %}</h4>
+<hr>
+<h4>{% trans %}Accounting{% endtrans %}</h4>
+<ul>
+    {% for m in user.membership.filter(end_date=None).filter(role__gte=7).all() %}
+    {% for b in m.club.bank_accounts.all() %}
+    <li><strong>{% trans %}Bank account: {% endtrans %}</strong>
+        <a href="{{ url('accounting:bank_details', b_account_id=b.id) }}">{{ b.club }}</a></li>
+    {% endfor %}
+    {% if m.club.club_account %}
+    <li><strong>{% trans %}Club account: {% endtrans %}</strong>
+        <a href="{{ url('accounting:club_details', c_account_id=m.club.club_account.id) }}">{{ m.club.club_account }}</a></li>
+    {% endif %}
+    {% endfor %}
+</ul>
+
+<hr>
+<h4>{% trans %}Club tools{% endtrans %}</h4>
 <ul>
     {% for m in user.membership.filter(end_date=None).all() %}
     <li><a href="{{ url('club:tools', club_id=m.club.id) }}">{{ m.club }}</a></li>
diff --git a/locale/fr/LC_MESSAGES/django.mo b/locale/fr/LC_MESSAGES/django.mo
index 8bdda6e8c64eee44955bcf8139a4082c4dcc7dcc..4af6dae04129c02b56dc3cb9565ed741d478df95 100644
GIT binary patch
delta 5930
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

delta 5562
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

diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po
index 1651f549..bd42e751 100644
--- a/locale/fr/LC_MESSAGES/django.po
+++ b/locale/fr/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-07-19 17:00+0000\n"
+"POT-Creation-Date: 2016-07-21 12:08+0200\n"
 "PO-Revision-Date: 2016-07-18\n"
 "Last-Translator: Skia <skia@libskia.so>\n"
 "Language-Team: AE info <ae.info@utbm.fr>\n"
@@ -16,71 +16,84 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
 
-#: accounting/models.py:29 accounting/models.py:52 accounting/models.py:91
-#: club/models.py:18 counter/models.py:35 counter/models.py:54
-#: counter/models.py:76
+#: accounting/models.py:32 accounting/models.py:55 accounting/models.py:94
+#: club/models.py:18 counter/models.py:39 counter/models.py:58
+#: counter/models.py:80
 msgid "name"
 msgstr "nom"
 
-#: accounting/models.py:30
+#: accounting/models.py:33
 msgid "iban"
 msgstr "IBAN"
 
-#: accounting/models.py:31
+#: accounting/models.py:34
 msgid "account number"
 msgstr "numero de compte"
 
-#: accounting/models.py:89 club/models.py:109 counter/models.py:211
+#: accounting/models.py:92 club/models.py:109 counter/models.py:215
 msgid "start date"
 msgstr "date de début"
 
-#: accounting/models.py:90 club/models.py:110 counter/models.py:212
+#: accounting/models.py:93 club/models.py:110 counter/models.py:216
 msgid "end date"
 msgstr "date de fin"
 
-#: accounting/models.py:92
+#: accounting/models.py:95
 msgid "is closed"
 msgstr "est fermé"
 
-#: accounting/models.py:94 accounting/models.py:132 counter/models.py:21
-#: counter/models.py:159
+#: accounting/models.py:97 accounting/models.py:136 counter/models.py:22
+#: counter/models.py:163
 msgid "amount"
 msgstr "montant"
 
-#: accounting/models.py:95
+#: accounting/models.py:98
 msgid "effective_amount"
 msgstr "montant effectif"
 
-#: accounting/models.py:133 core/models.py:456 counter/models.py:162
-#: counter/models.py:190
+#: accounting/models.py:134
+msgid "number"
+msgstr "numéro"
+
+#: accounting/models.py:137 core/models.py:462 counter/models.py:166
+#: counter/models.py:194
 msgid "date"
 msgstr "date"
 
-#: accounting/models.py:134 accounting/models.py:182
+#: accounting/models.py:138 accounting/models.py:198
 msgid "label"
 msgstr "intitulé"
 
-#: accounting/models.py:135
+#: accounting/models.py:139
 msgid "remark"
 msgstr "remarque"
 
-#: accounting/models.py:136 counter/models.py:163 subscription/models.py:34
+#: accounting/models.py:140 counter/models.py:167 subscription/models.py:34
 msgid "payment method"
 msgstr "méthode de paiement"
 
-#: accounting/models.py:137
+#: accounting/models.py:141
 msgid "cheque number"
 msgstr "numéro de chèque"
 
-#: accounting/models.py:139
+#: accounting/models.py:143
 msgid "is done"
 msgstr "est fait"
 
-#: accounting/models.py:181 counter/models.py:57
+#: accounting/models.py:153
+#, python-format
+msgid ""
+"The date can not be before the start date of the journal, which is\n"
+"%(start_date)s."
+msgstr ""
+"La date ne peut pas être avant la date de début du journal, qui est\n"
+"%(start_date)s."
+
+#: accounting/models.py:197 counter/models.py:61
 msgid "code"
 msgstr "code"
 
-#: accounting/models.py:183
+#: accounting/models.py:199
 msgid "movement type"
 msgstr "type de mouvement"
 
@@ -100,31 +113,46 @@ msgstr "Il n'y a pas de types comptable dans ce site web."
 #: accounting/templates/accounting/bank_account_details.jinja:5
 #: accounting/templates/accounting/club_account_details.jinja:5
 #: accounting/templates/accounting/journal_details.jinja:5
-#: core/templates/core/user_tools.jinja:19
+#: core/templates/core/user_tools.jinja:20
+#: core/templates/core/user_tools.jinja:39
 msgid "Accounting"
 msgstr "Comptabilité"
 
 #: accounting/templates/accounting/bank_account_details.jinja:8
-msgid "View account"
-msgstr "Voir le compte"
+#: core/templates/core/user_tools.jinja:43
+msgid "Bank account: "
+msgstr "Compte en banque : "
 
 #: accounting/templates/accounting/bank_account_details.jinja:9
+#: core/templates/core/user_base.jinja:6
+msgid "Infos"
+msgstr "Infos"
+
+#: accounting/templates/accounting/bank_account_details.jinja:11
+msgid "IBAN: "
+msgstr "IBAN : "
+
+#: accounting/templates/accounting/bank_account_details.jinja:12
+msgid "Number: "
+msgstr "Numéro : "
+
+#: accounting/templates/accounting/bank_account_details.jinja:14
 msgid "New club account"
 msgstr "Nouveau compte club"
 
-#: accounting/templates/accounting/bank_account_details.jinja:13
+#: accounting/templates/accounting/bank_account_details.jinja:18
 #: accounting/templates/accounting/bank_account_list.jinja:15
-#: accounting/templates/accounting/club_account_details.jinja:45
-#: accounting/templates/accounting/journal_details.jinja:48
+#: accounting/templates/accounting/club_account_details.jinja:44
+#: accounting/templates/accounting/journal_details.jinja:51
 #: club/templates/club/club_detail.jinja:7
 #: core/templates/core/page_detail.jinja:7
 #: core/templates/core/user_base.jinja:8
-#: core/templates/core/user_tools.jinja:31
+#: core/templates/core/user_tools.jinja:33
 #: counter/templates/counter/counter_list.jinja:14
 msgid "Edit"
 msgstr "Éditer"
 
-#: accounting/templates/accounting/bank_account_details.jinja:14
+#: accounting/templates/accounting/bank_account_details.jinja:19
 #: accounting/templates/accounting/bank_account_list.jinja:16
 #: core/templates/core/group_list.jinja:13
 msgid "Delete"
@@ -148,53 +176,58 @@ msgid "There is no accounts in this website."
 msgstr "Il n'y a pas de comptes dans ce site web."
 
 #: accounting/templates/accounting/club_account_details.jinja:8
-msgid "View account:"
-msgstr "Voir le compte:"
+msgid "Club account:"
+msgstr "Compte club : "
 
-#: accounting/templates/accounting/club_account_details.jinja:15
+#: accounting/templates/accounting/club_account_details.jinja:10
 msgid "New journal"
 msgstr "Nouveau classeur"
 
-#: accounting/templates/accounting/club_account_details.jinja:17
+#: accounting/templates/accounting/club_account_details.jinja:12
 msgid "You can not create new journal while you still have one opened"
 msgstr "Vous ne pouvez pas créer de journal tant qu'il y en a un d'ouvert"
 
-#: accounting/templates/accounting/club_account_details.jinja:21
+#: accounting/templates/accounting/club_account_details.jinja:17
 msgid "Name"
 msgstr "Nom"
 
-#: accounting/templates/accounting/club_account_details.jinja:22
+#: accounting/templates/accounting/club_account_details.jinja:18
 msgid "Start"
 msgstr "Début"
 
-#: accounting/templates/accounting/club_account_details.jinja:23
+#: accounting/templates/accounting/club_account_details.jinja:19
 msgid "End"
 msgstr "Fin"
 
-#: accounting/templates/accounting/club_account_details.jinja:24
-#: accounting/templates/accounting/journal_details.jinja:22
+#: accounting/templates/accounting/club_account_details.jinja:20
+#: accounting/templates/accounting/journal_details.jinja:23
 msgid "Amount"
 msgstr "Montant"
 
-#: accounting/templates/accounting/club_account_details.jinja:25
+#: accounting/templates/accounting/club_account_details.jinja:21
 msgid "Effective amount"
 msgstr "Montant effectif"
 
-#: accounting/templates/accounting/club_account_details.jinja:26
+#: accounting/templates/accounting/club_account_details.jinja:22
 msgid "Closed"
 msgstr "Fermé"
 
-#: accounting/templates/accounting/club_account_details.jinja:40
-#: accounting/templates/accounting/journal_details.jinja:41
+#: accounting/templates/accounting/club_account_details.jinja:23
+#: accounting/templates/accounting/journal_details.jinja:30
+msgid "Actions"
+msgstr "Actions"
+
+#: accounting/templates/accounting/club_account_details.jinja:39
+#: accounting/templates/accounting/journal_details.jinja:44
 msgid "Yes"
 msgstr "Oui"
 
-#: accounting/templates/accounting/club_account_details.jinja:42
-#: accounting/templates/accounting/journal_details.jinja:43
+#: accounting/templates/accounting/club_account_details.jinja:41
+#: accounting/templates/accounting/journal_details.jinja:46
 msgid "No"
 msgstr "Non"
 
-#: accounting/templates/accounting/club_account_details.jinja:44
+#: accounting/templates/accounting/club_account_details.jinja:43
 msgid "View"
 msgstr "Voir"
 
@@ -214,42 +247,38 @@ msgstr "Le classeur est fermé, vous ne pouvez pas créer d'opération"
 msgid "New operation"
 msgstr "Nouvelle opération"
 
-#: accounting/templates/accounting/journal_details.jinja:19
+#: accounting/templates/accounting/journal_details.jinja:20
 msgid "Nb"
 msgstr "No"
 
-#: accounting/templates/accounting/journal_details.jinja:20
+#: accounting/templates/accounting/journal_details.jinja:21
 msgid "Date"
 msgstr "Date"
 
-#: accounting/templates/accounting/journal_details.jinja:21
+#: accounting/templates/accounting/journal_details.jinja:22
 msgid "Label"
 msgstr "Intitulé"
 
-#: accounting/templates/accounting/journal_details.jinja:23
+#: accounting/templates/accounting/journal_details.jinja:24
 msgid "Payment mode"
 msgstr "Méthode de paiement"
 
-#: accounting/templates/accounting/journal_details.jinja:25
+#: accounting/templates/accounting/journal_details.jinja:26
 msgid "Code"
 msgstr "Code"
 
-#: accounting/templates/accounting/journal_details.jinja:26
+#: accounting/templates/accounting/journal_details.jinja:27
 msgid "Nature"
 msgstr "Nature"
 
-#: accounting/templates/accounting/journal_details.jinja:27
+#: accounting/templates/accounting/journal_details.jinja:28
 msgid "Done"
 msgstr "Effectué"
 
-#: accounting/templates/accounting/journal_details.jinja:28
+#: accounting/templates/accounting/journal_details.jinja:29
 msgid "Comment"
 msgstr "Commentaire"
 
-#: accounting/templates/accounting/journal_details.jinja:29
-msgid "Actions"
-msgstr "Actions"
-
 #: club/models.py:20
 msgid "unix name"
 msgstr "nom unix"
@@ -286,8 +315,8 @@ msgstr "club"
 msgid "role"
 msgstr "rôle"
 
-#: club/models.py:113 core/models.py:27 counter/models.py:36
-#: counter/models.py:55
+#: club/models.py:113 core/models.py:27 counter/models.py:40
+#: counter/models.py:59
 msgid "description"
 msgstr "description"
 
@@ -361,12 +390,13 @@ msgid "Add"
 msgstr "Ajouter"
 
 #: club/templates/club/club_tools.jinja:4
+#: core/templates/core/user_tools.jinja:54
 msgid "Club tools"
-msgstr "Outils du club"
+msgstr "Outils club"
 
 #: club/templates/club/club_tools.jinja:8
 msgid "Counters:"
-msgstr "Comptoirs:"
+msgstr "Comptoirs : "
 
 #: core/models.py:23
 msgid "meta group status"
@@ -446,35 +476,35 @@ msgstr "super-utilisateur"
 msgid "Designates whether this user is a superuser. "
 msgstr "Est-ce que l'utilisateur est super-utilisateur."
 
-#: core/models.py:274
+#: core/models.py:280
 msgid "Visitor"
 msgstr "Visiteur"
 
-#: core/models.py:279
+#: core/models.py:285
 msgid "define if we show a users stats"
 msgstr "Definit si l'on montre les statistiques de l'utilisateur"
 
-#: core/models.py:281
+#: core/models.py:287
 msgid "Show your account statistics to others"
 msgstr "Montrez vos statistiques de compte aux autres"
 
-#: core/models.py:307 core/models.py:311
+#: core/models.py:313 core/models.py:317
 msgid "page name"
 msgstr "nom de la page"
 
-#: core/models.py:344
+#: core/models.py:350
 msgid "Duplicate page"
 msgstr "Duppliquer la page"
 
-#: core/models.py:350
+#: core/models.py:356
 msgid "Loop in page tree"
 msgstr "Boucle dans l'arborescence des pages"
 
-#: core/models.py:454
+#: core/models.py:460
 msgid "page title"
 msgstr "titre de la page"
 
-#: core/models.py:455
+#: core/models.py:461
 msgid "page content"
 msgstr "contenu de la page"
 
@@ -519,7 +549,7 @@ msgstr "Utilisateurs"
 msgid "Pages"
 msgstr "Pages"
 
-#: core/templates/core/base.jinja:31 core/templates/core/user_tools.jinja:36
+#: core/templates/core/base.jinja:31
 msgid "Clubs"
 msgstr "Clubs"
 
@@ -653,6 +683,7 @@ msgid "Back to page"
 msgstr "Retour à la page"
 
 #: core/templates/core/page_hist.jinja:6
+#, python-format
 msgid "You're seeing the history of page %(page_name)s"
 msgstr "Vous consultez l'historique de la page %(page_name)s"
 
@@ -762,12 +793,8 @@ msgstr ""
 msgid "Your username is %(username)s."
 msgstr "Votre nom d'utilisateur est %(username)s."
 
-#: core/templates/core/user_base.jinja:6
-msgid "Infos"
-msgstr "Infos"
-
 #: core/templates/core/user_base.jinja:11
-#: core/templates/core/user_tools.jinja:13
+#: core/templates/core/user_tools.jinja:14
 msgid "Groups"
 msgstr "Groupes"
 
@@ -833,67 +860,71 @@ msgstr "Outils de %(user_name)s"
 msgid "User Tools"
 msgstr "Outils utilisateurs"
 
-#: core/templates/core/user_tools.jinja:10
+#: core/templates/core/user_tools.jinja:11
 msgid "Sith management"
 msgstr "Gestion de Sith"
 
-#: core/templates/core/user_tools.jinja:16
+#: core/templates/core/user_tools.jinja:17
 msgid "Counters management"
 msgstr "Gestion des comptoirs"
 
-#: core/templates/core/user_tools.jinja:22
+#: core/templates/core/user_tools.jinja:23
 msgid "Subscriptions"
 msgstr "Cotisations"
 
-#: core/templates/core/user_tools.jinja:26
+#: core/templates/core/user_tools.jinja:28
 msgid "Counters"
 msgstr "Comptoirs"
 
-#: counter/models.py:20
+#: core/templates/core/user_tools.jinja:47
+msgid "Club account: "
+msgstr "Compte club : "
+
+#: counter/models.py:21
 msgid "account id"
 msgstr "numéro de compte"
 
-#: counter/models.py:24
+#: counter/models.py:25
 msgid "customer"
 msgstr "client"
 
-#: counter/models.py:25
+#: counter/models.py:26
 msgid "customers"
 msgstr "clients"
 
-#: counter/models.py:58
+#: counter/models.py:62
 msgid "purchase price"
 msgstr "prix d'achat"
 
-#: counter/models.py:59
+#: counter/models.py:63
 msgid "selling price"
 msgstr "prix de vente"
 
-#: counter/models.py:60
+#: counter/models.py:64
 msgid "special selling price"
 msgstr "prix de vente spécial"
 
-#: counter/models.py:79 subscription/models.py:29
+#: counter/models.py:83 subscription/models.py:29
 msgid "subscription type"
 msgstr "type d'inscription"
 
-#: counter/models.py:81
+#: counter/models.py:85
 msgid "Bar"
 msgstr "Bar"
 
-#: counter/models.py:81
+#: counter/models.py:85
 msgid "Office"
 msgstr "Bureau"
 
-#: counter/models.py:165
+#: counter/models.py:169
 msgid "bank"
 msgstr "banque"
 
-#: counter/models.py:186
+#: counter/models.py:190
 msgid "unit price"
 msgstr "prix unitaire"
 
-#: counter/models.py:187
+#: counter/models.py:191
 msgid "quantity"
 msgstr "quantité"
 
@@ -1104,11 +1135,11 @@ msgstr "début de la cotisation"
 msgid "subscription end"
 msgstr "fin de la cotisation"
 
-#: subscription/models.py:47
+#: subscription/models.py:44
 msgid "You can not subscribe many time for the same period"
 msgstr "Vous ne pouvez pas cotiser plusieurs fois pour la même période"
 
-#: subscription/models.py:51
+#: subscription/models.py:48
 msgid "You are trying to create a subscription without member"
 msgstr "Vous essayez de créer une cotisation sans membre"
 
@@ -1120,3 +1151,9 @@ msgstr "Un utilisateur avec cette adresse email existe déjà"
 msgid "You must either choose an existing user or create a new one properly"
 msgstr ""
 "Vous devez soit choisir un utilisateur existant, ou en créer un proprement."
+
+#~ msgid "View account"
+#~ msgstr "Voir le compte"
+
+#~ msgid "View account:"
+#~ msgstr "Voir le compte:"