-
- Downloads
Merge branch 'master' into files_encryption
Conflicts: apps/user_ldap/l10n/nn_NO.php core/l10n/es.php core/l10n/et_EE.php core/l10n/ja_JP.php core/l10n/nn_NO.php l10n/ca/core.po l10n/ca/files_external.po l10n/ca/settings.po l10n/cy_GB/core.po l10n/cy_GB/files.po l10n/cy_GB/files_encryption.po l10n/cy_GB/files_external.po l10n/cy_GB/files_sharing.po l10n/cy_GB/files_trashbin.po l10n/cy_GB/lib.po l10n/cy_GB/settings.po l10n/de_DE/core.po l10n/es/core.po l10n/et_EE/core.po l10n/et_EE/files.po l10n/et_EE/settings.po l10n/et_EE/user_ldap.po l10n/gl/core.po l10n/it/core.po l10n/ja_JP/core.po l10n/ja_JP/settings.po l10n/nn_NO/core.po l10n/nn_NO/user_ldap.po l10n/pt_BR/core.po l10n/templates/core.pot l10n/templates/files.pot l10n/templates/files_encryption.pot l10n/templates/files_external.pot l10n/templates/files_sharing.pot l10n/templates/files_trashbin.pot l10n/templates/files_versions.pot l10n/templates/lib.pot l10n/templates/settings.pot l10n/templates/user_ldap.pot l10n/templates/user_webdavauth.pot l10n/zh_TW/files_sharing.po settings/l10n/et_EE.php
Showing
- 3rdparty 1 addition, 1 deletion3rdparty
- apps/files/l10n/et_EE.php 2 additions, 2 deletionsapps/files/l10n/et_EE.php
- apps/files_encryption/l10n/cy_GB.php 7 additions, 0 deletionsapps/files_encryption/l10n/cy_GB.php
- apps/files_external/l10n/ca.php 1 addition, 0 deletionsapps/files_external/l10n/ca.php
- apps/files_external/l10n/cy_GB.php 1 addition, 0 deletionsapps/files_external/l10n/cy_GB.php
- apps/user_ldap/l10n/et_EE.php 2 additions, 2 deletionsapps/user_ldap/l10n/et_EE.php
- apps/user_ldap/l10n/nn_NO.php 2 additions, 0 deletionsapps/user_ldap/l10n/nn_NO.php
- core/l10n/ca.php 3 additions, 0 deletionscore/l10n/ca.php
- core/l10n/cy_GB.php 4 additions, 1 deletioncore/l10n/cy_GB.php
- core/l10n/de_DE.php 1 addition, 0 deletionscore/l10n/de_DE.php
- core/l10n/es.php 11 additions, 10 deletionscore/l10n/es.php
- core/l10n/et_EE.php 12 additions, 11 deletionscore/l10n/et_EE.php
- core/l10n/gl.php 1 addition, 0 deletionscore/l10n/gl.php
- core/l10n/it.php 1 addition, 0 deletionscore/l10n/it.php
- core/l10n/ja_JP.php 7 additions, 6 deletionscore/l10n/ja_JP.php
- core/l10n/nn_NO.php 90 additions, 7 deletionscore/l10n/nn_NO.php
- core/l10n/pt_BR.php 1 addition, 0 deletionscore/l10n/pt_BR.php
- l10n/ca/core.po 45 additions, 40 deletionsl10n/ca/core.po
- l10n/ca/files_external.po 14 additions, 8 deletionsl10n/ca/files_external.po
- l10n/ca/settings.po 42 additions, 55 deletionsl10n/ca/settings.po
Loading
Please register or sign in to comment