# This patch file was generated by NetBeans IDE
# Following Index: paths are relative to: /Users/ze/NetBeansProjects/GlotPress/trunk/gp-includes
# This patch can be applied using context Tools: Patch action on respective folder.
# It uses platform neutral UTF-8 encoding and \n newlines.
# Above lines and this line are ignored by the patching process.
Index: locales.php
--- locales.php Base (BASE)
+++ locales.php Locally Modified (Based On LOCAL)
@@ -164,7 +164,7 @@
 		$be->country_code = 'by';
 		$be->slug = 'be';
 		$be->nplurals = 3;
-		$be->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$be->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 		$bg = new GP_Locale();
 		$bg->english_name = 'Bulgarian';
@@ -236,7 +236,7 @@
 		$bs->wp_locale = 'bs_BA';
 		$bs->slug = 'bs';
 		$bs->nplurals = 3;
-		$bs->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$bs->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 		$ca = new GP_Locale();
 		$ca->english_name = 'Catalan';
@@ -305,7 +305,7 @@
 		$csb->country_code = '';
 		$csb->slug = 'csb';
 		$csb->nplurals = 3;
-		$csb->plural_expression = 'n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2';
+		$csb->plural_expression = 'n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2';
 
 		$cu = new GP_Locale();
 		$cu->english_name = 'Church Slavic';
@@ -593,7 +593,7 @@
 		$hr->wp_locale = 'hr';
 		$hr->slug = 'hr';
 		$hr->nplurals = 3;
-		$hr->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$hr->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 		$hu = new GP_Locale();
 		$hu->english_name = 'Hungarian';
@@ -771,7 +771,7 @@
 		$lt->country_code = 'lt';
 		$lt->slug = 'lt';
 		$lt->nplurals = 3;
-		$lt->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$lt->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 		$lv = new GP_Locale();
 		$lv->english_name = 'Latvian';
@@ -793,7 +793,7 @@
 		$mk->wp_locale = 'mk_MK';
 		$mk->slug = 'mk';
 		$mk->nplurals = 2;
-		$mk->plural_expression = 'n==1 or n%10==1 ? 0 : 1';
+		$mk->plural_expression = 'n==1 || n%10==1 ? 0 : 1';
 
 		$ml = new GP_Locale();
 		$ml->english_name = 'Malayalam';
@@ -908,7 +908,7 @@
 		$pl->wp_locale = 'pl_PL';
 		$pl->slug = 'pl';
 		$pl->nplurals = 3;
-		$pl->plural_expression = '(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$pl->plural_expression = '(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 
 		$pt_br = new GP_Locale();
@@ -939,7 +939,7 @@
 		$ro->wp_locale = 'ro_RO';
 		$ro->slug = 'ro';
 		$ro->nplurals = 3;
-		$ro->plural_expression = '(n==1 ? 0 : (n==0 or (n%100 > 0 && n%100 < 20)) ? 1 : 2);';
+		$ro->plural_expression = '(n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < 20)) ? 1 : 2);';
 
 		$ru_ua = new GP_Locale();
 		$ru_ua->english_name = 'Ukrainian Russian';
@@ -950,7 +950,7 @@
 		$ru_ua->wp_locale = 'ru_UA';
 		$ru_ua->slug = 'ru-ua';
 		$ru_ua->nplurals = 3;
-		$ru_ua->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$ru_ua->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 		$ru = new GP_Locale();
 		$ru->english_name = 'Russian';
@@ -961,7 +961,7 @@
 		$ru->wp_locale = 'ru_RU';
 		$ru->slug = 'ru';
 		$ru->nplurals = 3;
-		$ru->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
+		$ru->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
 
 		$sc = new GP_Locale();
 		$sc->english_name = 'Sardinian';
@@ -1009,7 +1009,7 @@
 		$sl->wp_locale = 'sl_SI';
 		$sl->slug = 'sl';
 		$sl->nplurals = 4;
-		$sl->plural_expression = '(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 or n%100==4 ? 2 : 3)';
+		$sl->plural_expression = '(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3)';
 
 		$sq = new GP_Locale();
 		$sq->english_name = 'Albanian';
@@ -1029,7 +1029,7 @@
 		$sr->wp_locale = 'sr_RS';
 		$sr->slug = 'sr';
 		$sr->nplurals = 4;
-		$sr->plural_expression = 'n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2';
+		$sr->plural_expression = 'n==1? 3 : n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2';
 
 		$su = new GP_Locale();
 		$su->english_name = 'Sundanese';
@@ -1144,7 +1144,7 @@
 		$uk->wp_locale = 'uk';
 		$uk->slug = 'uk';
 		$uk->nplurals = 3;
-		$uk->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 or n%100>=20) ? 1 : 2)';
\ No newline at end of file
+		$uk->plural_expression = '(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2)';
\ No newline at end of file
 
 		$ur = new GP_Locale();
 		$ur->english_name = 'Urdu';