Merge remote-tracking branch 'origin/master'
Conflicts: lib/tpl/default/mediamanager.css
Showing
- inc/html.php 104 additions, 53 deletionsinc/html.php
- inc/lang/de-informal/lang.php 9 additions, 8 deletionsinc/lang/de-informal/lang.php
- inc/lang/de/lang.php 9 additions, 8 deletionsinc/lang/de/lang.php
- inc/lang/el/lang.php 43 additions, 2 deletionsinc/lang/el/lang.php
- inc/lang/en/lang.php 14 additions, 10 deletionsinc/lang/en/lang.php
- inc/lang/eo/lang.php 42 additions, 1 deletioninc/lang/eo/lang.php
- inc/lang/fi/lang.php 41 additions, 1 deletioninc/lang/fi/lang.php
- inc/lang/fr/lang.php 5 additions, 7 deletionsinc/lang/fr/lang.php
- inc/lang/no/adminplugins.txt 1 addition, 1 deletioninc/lang/no/adminplugins.txt
- inc/lang/no/lang.php 53 additions, 3 deletionsinc/lang/no/lang.php
- inc/lang/no/newpage.txt 1 addition, 1 deletioninc/lang/no/newpage.txt
- inc/lang/no/norev.txt 2 additions, 2 deletionsinc/lang/no/norev.txt
- inc/lang/no/subscr_digest.txt 20 additions, 0 deletionsinc/lang/no/subscr_digest.txt
- inc/lang/no/subscr_form.txt 3 additions, 0 deletionsinc/lang/no/subscr_form.txt
- inc/lang/no/subscr_list.txt 17 additions, 0 deletionsinc/lang/no/subscr_list.txt
- inc/lang/no/subscr_single.txt 23 additions, 0 deletionsinc/lang/no/subscr_single.txt
- inc/lang/no/updateprofile.txt 1 addition, 1 deletioninc/lang/no/updateprofile.txt
- inc/lang/no/uploadmail.txt 1 addition, 0 deletionsinc/lang/no/uploadmail.txt
- inc/lang/pt/lang.php 5 additions, 6 deletionsinc/lang/pt/lang.php
- inc/lang/ru/lang.php 5 additions, 8 deletionsinc/lang/ru/lang.php
Loading
Please register or sign in to comment