summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorLauri Ojansivu <x@xet7.org>2019-04-24 13:51:00 +0300
committerLauri Ojansivu <x@xet7.org>2019-04-24 13:51:00 +0300
commit2d966863e3125ffb1c53517a64af9f7249c5c4c0 (patch)
tree653dc1e6212476d93c1ce2c3712a77da9236c38e /i18n
parenta66632f76716222aa48981030fa04b1d812e8c8f (diff)
parent259ff3436f3eecf78b748e238e98bfda6817cc44 (diff)
downloadwekan-2d966863e3125ffb1c53517a64af9f7249c5c4c0.tar.gz
wekan-2d966863e3125ffb1c53517a64af9f7249c5c4c0.tar.bz2
wekan-2d966863e3125ffb1c53517a64af9f7249c5c4c0.zip
Merge branch 'Akuket-edge' into edge
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.i18n.json3
-rw-r--r--i18n/fr.i18n.json5
2 files changed, 5 insertions, 3 deletions
diff --git a/i18n/en.i18n.json b/i18n/en.i18n.json
index bb84dc66..3f35fca2 100644
--- a/i18n/en.i18n.json
+++ b/i18n/en.i18n.json
@@ -691,5 +691,6 @@
"swimlaneDeletePopup-title": "Delete Swimlane ?",
"swimlane-delete-pop": "All actions will be removed from the activity feed and you won't be able to recover the swimlane. There is no undo.",
"restore-all": "Restore all",
- "delete-all": "Delete all"
+ "delete-all": "Delete all",
+ "loading": "Loading, please wait."
}
diff --git a/i18n/fr.i18n.json b/i18n/fr.i18n.json
index ec20794c..dcac54e2 100644
--- a/i18n/fr.i18n.json
+++ b/i18n/fr.i18n.json
@@ -688,5 +688,6 @@
"swimlaneDeletePopup-title": "Supprimer le couloir ?",
"swimlane-delete-pop": "Toutes les actions vont être supprimées du suivi d'activités et vous ne pourrez plus utiliser ce couloir. Cette action est irréversible.",
"restore-all": "Tout supprimer",
- "delete-all": "Tout restaurer"
-} \ No newline at end of file
+ "delete-all": "Tout restaurer",
+ "loading": "Chargement, merci de patienter."
+}