diff options
| author | Étienne Loks <etienne.loks@proxience.com> | 2013-07-16 22:41:06 +0000 | 
|---|---|---|
| committer | Étienne Loks <etienne.loks@proxience.com> | 2013-07-16 22:41:06 +0000 | 
| commit | 23e4ba7b12751cf481015e68e1336dd5bb1042f0 (patch) | |
| tree | 38a537996a64d3b75b5cd5403c65886a5f57e137 | |
| parent | bfe42b078e8268ec0ce6c0d142987385777f4513 (diff) | |
| parent | 238d4988e4eaf738a753e0d068008ef9d7664387 (diff) | |
| download | Ishtar-23e4ba7b12751cf481015e68e1336dd5bb1042f0.tar.bz2 Ishtar-23e4ba7b12751cf481015e68e1336dd5bb1042f0.zip  | |
Merge branch 'master' of lysithea.proxience.net:/home/proxience/git/ishtar
5 files changed, 7 insertions, 7 deletions
diff --git a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po index 08eb68c41..e456b0d52 100644 --- a/archaeological_context_records/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_context_records/locale/fr/LC_MESSAGES/django.po @@ -188,7 +188,7 @@ msgstr "Recherche"  #: ishtar_menu.py:34  msgid "Creation" -msgstr "Création" +msgstr "Ajout"  #: ishtar_menu.py:38 ishtar_menu.py:54  msgid "Modification" diff --git a/archaeological_files/locale/fr/LC_MESSAGES/django.po b/archaeological_files/locale/fr/LC_MESSAGES/django.po index 851e67f2b..0aa38a549 100644 --- a/archaeological_files/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_files/locale/fr/LC_MESSAGES/django.po @@ -136,7 +136,7 @@ msgstr "Recherche"  #: ishtar_menu.py:35  msgid "Creation" -msgstr "Création" +msgstr "Ajout"  #: ishtar_menu.py:38 ishtar_menu.py:55  msgid "Modification" diff --git a/archaeological_finds/locale/fr/LC_MESSAGES/django.po b/archaeological_finds/locale/fr/LC_MESSAGES/django.po index cecdb97fe..a441e2807 100644 --- a/archaeological_finds/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_finds/locale/fr/LC_MESSAGES/django.po @@ -169,7 +169,7 @@ msgstr "Recherche"  #: ishtar_menu.py:33 ishtar_menu.py:48  msgid "Creation" -msgstr "Création" +msgstr "Ajout"  #: ishtar_menu.py:37 ishtar_menu.py:53  msgid "Modification" diff --git a/archaeological_operations/locale/fr/LC_MESSAGES/django.po b/archaeological_operations/locale/fr/LC_MESSAGES/django.po index 94b05a01c..1a647285d 100644 --- a/archaeological_operations/locale/fr/LC_MESSAGES/django.po +++ b/archaeological_operations/locale/fr/LC_MESSAGES/django.po @@ -309,7 +309,7 @@ msgstr "Recherche"  #: ishtar_menu.py:33  msgid "Creation" -msgstr "Création" +msgstr "Ajout"  #: ishtar_menu.py:37 ishtar_menu.py:58 ishtar_menu.py:76  msgid "Modification" diff --git a/ishtar_common/locale/fr/LC_MESSAGES/django.po b/ishtar_common/locale/fr/LC_MESSAGES/django.po index d6cd9f86d..62f47672a 100644 --- a/ishtar_common/locale/fr/LC_MESSAGES/django.po +++ b/ishtar_common/locale/fr/LC_MESSAGES/django.po @@ -245,7 +245,7 @@ msgstr "Administration"  #: ishtar_menu.py:31  msgid "Creation" -msgstr "Création" +msgstr "Ajout"  #: ishtar_menu.py:34  msgid "Modification" @@ -540,7 +540,7 @@ msgstr "Non"  #: wizards.py:836  #, python-format  msgid "[%(app_name)s] Account creation/modification" -msgstr "[%(app_name)s] Création - modification du compte" +msgstr "[%(app_name)s] Ajout - modification du compte"  #: templates/account_activation_email.txt:3  #, python-format @@ -1309,7 +1309,7 @@ msgstr "Ce lien est valide pour %(expiration_days)s jours."  #: templates/registration/activation_email_subject.txt:1  msgid "Account activation on" -msgstr "Création du compte sur" +msgstr "Activation du compte sur"  #: templates/registration/login.html:16  msgid "Forgot password?"  | 
