aboutsummaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorZakaria BOUZIANE2015-03-10 12:04:25 +0100
committerZakaria BOUZIANE2015-03-10 12:04:25 +0100
commite3cd779d28af135dc32b25ba249be48ebf6658bf (patch)
tree5f59356149e5eb58f7bf9459db5c2229a0d278ca /config
parent8d9281dcc994ad76092b4878b26801507915f16a (diff)
parentdc6fc17f5ea46c871154e398037fab3bb741504e (diff)
downloadchouette-core-e3cd779d28af135dc32b25ba249be48ebf6658bf.tar.bz2
Merged code
Diffstat (limited to 'config')
-rw-r--r--config/locales/iev.en.yml4
-rw-r--r--config/locales/iev.fr.yml4
-rw-r--r--config/locales/imports.yml14
3 files changed, 10 insertions, 12 deletions
diff --git a/config/locales/iev.en.yml b/config/locales/iev.en.yml
new file mode 100644
index 000000000..d7b7088bf
--- /dev/null
+++ b/config/locales/iev.en.yml
@@ -0,0 +1,4 @@
+en:
+ iev:
+ failure: "Impossible to access IEV service"
+ \ No newline at end of file
diff --git a/config/locales/iev.fr.yml b/config/locales/iev.fr.yml
new file mode 100644
index 000000000..5a7070c90
--- /dev/null
+++ b/config/locales/iev.fr.yml
@@ -0,0 +1,4 @@
+fr:
+ iev:
+ failure: "Impossible d'accéder au service IEV"
+ \ No newline at end of file
diff --git a/config/locales/imports.yml b/config/locales/imports.yml
index e49263520..f9356aa4a 100644
--- a/config/locales/imports.yml
+++ b/config/locales/imports.yml
@@ -15,12 +15,7 @@ en:
warning: ""
show:
report: "Report"
- not_yet_started: "On queue"
imported_file: "Imported file"
- completed: "[ Completed ]"
- failed: "[ Failed ]"
- pending: "[ In the treatment queue ]"
- processing: "[ In progress... ]"
graph:
files:
title_zip: "Import results for files in zip"
@@ -112,12 +107,7 @@ fr:
warning: ""
show:
report: "Rapport"
- not_yet_started: "En file d'attente"
imported_file: "Fichier importé"
- completed: "[ Terminé ]"
- failed: "[ Echoué ]"
- pending: "[ En file d'attente ]"
- processing: "[ En progression... ]"
graph:
files:
title_zip: "Résultat d'import des fichiers du zip"
@@ -151,8 +141,8 @@ fr:
saved: "Sauvé"
save_error: "Sauvegarde en erreur"
statuses:
- created: "En attente ..."
- scheduled: "En cours ..."
+ created: "En file d'attente..."
+ scheduled: "En cours..."
terminated: "Achevé"
canceled: "Annulé"
aborted: "Echoué"