conflicts: merge develop

This commit is contained in:
Paula Quispe
2021-12-02 11:58:33 -04:00
45 changed files with 1433 additions and 1141 deletions

View File

@@ -19175,12 +19175,6 @@ msgstr "Cookie Lifetime (Seconds)"
msgid "The maximun limit of columns for a database table is 255, you already have them defined!"
msgstr "The maximun limit of columns for a database table is 255, you already have them defined!"
# TRANSLATION
# LABEL/ID_MCRYPT_SUPPORT
#: LABEL/ID_MCRYPT_SUPPORT
msgid "Mcrypt Support"
msgstr "Mcrypt Support"
# TRANSLATION
# LABEL/ID_MEDIA
#: LABEL/ID_MEDIA