diff options
author | Martin Kraft <martinkraft@gmail.com> | 2018-05-25 11:25:40 -0400 |
---|---|---|
committer | Martin Kraft <martinkraft@gmail.com> | 2018-05-25 11:25:40 -0400 |
commit | baf697e348e329ad6b5c5bba1db8e0a53fcb8a13 (patch) | |
tree | 88acbcb69382817eb07f8c331beb195d014cdfa4 /i18n | |
parent | a51b2367a34d5cbefe720232b35ccf0d1aa63c98 (diff) | |
parent | 58abb4204e2e5d7c82312ed18a3d4d1a3a5f1962 (diff) | |
download | chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.tar.gz chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.tar.bz2 chat-baf697e348e329ad6b5c5bba1db8e0a53fcb8a13.zip |
Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/i18n/en.json b/i18n/en.json index 9a39c60ba..37a199582 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -3791,10 +3791,6 @@ "translation": "Invalid Comment Trigger Notify Prop for user." }, { - "id": "app.import.validate_user_import_data.notify_props_desktop_duration_invalid.error", - "translation": "Invalid Desktop Duration Notify Prop value for user." - }, - { "id": "app.import.validate_user_import_data.notify_props_desktop_invalid.error", "translation": "Invalid Desktop Notify Prop value for user." }, |