diff --git a/front/php/templates/language/en_us.json b/front/php/templates/language/en_us.json index 7f33fe73..3e555201 100755 --- a/front/php/templates/language/en_us.json +++ b/front/php/templates/language/en_us.json @@ -631,4 +631,4 @@ "test_event_icon": "fa-vial-circle-check", "test_event_tooltip": "Save your changes at first before you test your settings." } -} \ No newline at end of file +} diff --git a/front/php/templates/language/fr_fr.json b/front/php/templates/language/fr_fr.json index 942cd6c7..ac78aa19 100755 --- a/front/php/templates/language/fr_fr.json +++ b/front/php/templates/language/fr_fr.json @@ -631,4 +631,4 @@ "test_event_icon": "", "test_event_tooltip": "" } -} \ No newline at end of file +} diff --git a/front/php/templates/language/merge_translations.py b/front/php/templates/language/merge_translations.py old mode 100644 new mode 100755