Skip to content

Commit

Permalink
Merge branch 'master' into feature/integrate-uikit
Browse files Browse the repository at this point in the history
  • Loading branch information
dengenxp committed Sep 1, 2016
2 parents ecd0ffd + 5158142 commit 32c1677
Show file tree
Hide file tree
Showing 707 changed files with 26,263 additions and 26,044 deletions.
5 changes: 2 additions & 3 deletions language/afrikaans.php
Expand Up @@ -26,6 +26,8 @@

$LANG_CHARSET = 'iso-8859-1';

$LANG_ISO639_1 = 'af';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2399,6 +2401,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/afrikaans_utf-8.php
Expand Up @@ -26,6 +26,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'af';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2399,6 +2401,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/bosnian.php
Expand Up @@ -30,6 +30,8 @@

$LANG_CHARSET = 'iso-8859-2';

$LANG_ISO639_1 = 'bs';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2403,6 +2405,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/bosnian_utf-8.php
Expand Up @@ -30,6 +30,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'bs';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2403,6 +2405,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/bulgarian.php
Expand Up @@ -26,6 +26,8 @@

$LANG_CHARSET = 'Windows-1251';

$LANG_ISO639_1 = 'bg';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2399,6 +2401,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/bulgarian_utf-8.php
Expand Up @@ -26,6 +26,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'bg';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2399,6 +2401,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/catalan.php
Expand Up @@ -24,6 +24,8 @@

$LANG_CHARSET = 'iso-8859-1';

$LANG_ISO639_1 = 'ca';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2397,6 +2399,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/catalan_utf-8.php
Expand Up @@ -24,6 +24,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'ca';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2397,6 +2399,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/chinese_simplified_utf-8.php
Expand Up @@ -29,6 +29,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'zh-Hans';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2402,6 +2404,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/chinese_traditional_utf-8.php
Expand Up @@ -29,6 +29,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'zh-Hant';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2402,6 +2404,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/croatian.php
Expand Up @@ -26,6 +26,8 @@

$LANG_CHARSET = 'iso-8859-2';

$LANG_ISO639_1 = 'hr';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2399,6 +2401,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/croatian_utf-8.php
Expand Up @@ -28,6 +28,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'hr';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2401,6 +2403,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/czech.php
Expand Up @@ -25,6 +25,8 @@

$LANG_CHARSET = 'iso-8859-2';

$LANG_ISO639_1 = 'cs';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2398,6 +2400,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/czech_utf-8.php
Expand Up @@ -25,6 +25,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'cs';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2398,6 +2400,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/danish.php
Expand Up @@ -25,6 +25,8 @@

$LANG_CHARSET = 'iso-8859-1';

$LANG_ISO639_1 = 'da';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2398,6 +2400,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/danish_utf-8.php
Expand Up @@ -25,6 +25,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'da';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2398,6 +2400,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
7 changes: 3 additions & 4 deletions language/dutch.php
Expand Up @@ -32,6 +32,8 @@

$LANG_CHARSET = 'iso-8859-1';

$LANG_ISO639_1 = 'nl';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -329,7 +331,7 @@
73 => 'Taal',
74 => 'Pas het portaal aan uw wensen aan!',
75 => 'Email thema\'s voor',
76 => 'Indien u een thema uit de onderstaande lijst selecteert, ontvang u alle artikelen die hierin wordt geplaatst aan het eind van de dag thuis. Kies alleen de thema\'s waarin u bent geïnteresseerd!',
76 => 'Indien u een thema uit de onderstaande lijst selecteert, ontvang u alle artikelen die hierin wordt geplaatst aan het eind van de dag thuis. Kies alleen de thema\'s waarin u bent geïnteresseerd!',
77 => 'Foto',
78 => 'Voeg een afbeelding toe van u zelf!',
79 => 'Aanvinken om uw afbeelding te verwijderen',
Expand Down Expand Up @@ -2405,6 +2407,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>
5 changes: 2 additions & 3 deletions language/dutch_utf-8.php
Expand Up @@ -32,6 +32,8 @@

$LANG_CHARSET = 'utf-8';

$LANG_ISO639_1 = 'nl';

###############################################################################
# Array Format:
# $LANGXX[YY]: $LANG - variable name
Expand Down Expand Up @@ -2405,6 +2407,3 @@
'page_navigation_max_pages' => 'This field must be between 2 - 21',
'hash' => 'This field must be a hash function supported by your version of PHP'
);


?>

0 comments on commit 32c1677

Please sign in to comment.