Merge branch 'dev'

13 files changed, 15 insertions, 22 deletions

diff --git a/view/de-de/hmessages.po b/view/de-de/hmessages.po
index 8af9dce6b..4eaec3629 100644
--- a/view/de-de/hmessages.po
+++ b/view/de-de/hmessages.po
@@ -35,7 +35,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: de\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/es-es/hmessages.po b/view/es-es/hmessages.po
index f2c1ccf79..3b42394b1 100644
--- a/view/es-es/hmessages.po
+++ b/view/es-es/hmessages.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: es_ES\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/es-es/hstrings.php b/view/es-es/hstrings.php
index 2024504a1..a459e10dd 100644
--- a/view/es-es/hstrings.php
+++ b/view/es-es/hstrings.php
@@ -2,10 +2,10 @@
 
 if(! function_exists("string_plural_select_es_es")) {
 function string_plural_select_es_es($n){
-	return ($n != 1);;
+	return ($n != 1 ? 1 : 0);
 }}
 App::$rtl = 0;
-App::$strings["plural_function_code"] = "(n != 1)";
+App::$strings["plural_function_code"] = "(n != 1 ? 1 : 0)";
 App::$strings["Can view my channel stream and posts"] = "Pueden verse la actividad y publicaciones de mi canal";
 App::$strings["Can send me their channel stream and posts"] = "Se me pueden enviar entradas y contenido de un canal";
 App::$strings["Can view my default channel profile"] = "Puede verse mi perfil de canal predeterminado.";
diff --git a/view/fr/hmessages.po b/view/fr/hmessages.po
index c5263c2df..0c89da139 100644
--- a/view/fr/hmessages.po
+++ b/view/fr/hmessages.po
@@ -22,7 +22,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: fr\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/he/hmessages.po b/view/he/hmessages.po
index 991b7f64f..837dfabd0 100644
--- a/view/he/hmessages.po
+++ b/view/he/hmessages.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
diff --git a/view/it/hmessages.po b/view/it/hmessages.po
index 94911bc20..8c1dc08d7 100644
--- a/view/it/hmessages.po
+++ b/view/it/hmessages.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: it\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/nb-no/hmessages.po b/view/nb-no/hmessages.po
index bcb926d90..0f7f2e8c5 100644
--- a/view/nb-no/hmessages.po
+++ b/view/nb-no/hmessages.po
@@ -16,7 +16,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nb_NO\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:239
 msgid "parent"
diff --git a/view/nl/hmessages.po b/view/nl/hmessages.po
index c98121122..c672e534e 100644
--- a/view/nl/hmessages.po
+++ b/view/nl/hmessages.po
@@ -18,7 +18,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: nl\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../Zotlabs/Access/Permissions.php:56
 msgid "Can view my channel stream and posts"
diff --git a/view/pt-br/hmessages.po b/view/pt-br/hmessages.po
index 029642f9b..2645cc9bd 100644
--- a/view/pt-br/hmessages.po
+++ b/view/pt-br/hmessages.po
@@ -25,7 +25,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: pt_BR\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=(n > 1 ? 1 : 0);\n"
 
 #: ../../include/dba/dba_driver.php:50
 #, php-format
diff --git a/view/sv/hmessages.po b/view/sv/hmessages.po
index 4486a8630..249dbd8be 100644
--- a/view/sv/hmessages.po
+++ b/view/sv/hmessages.po
@@ -17,7 +17,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: sv\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1 ? 1 : 0);\n"
 
 #: ../../include/dba/dba_driver.php:142
 #, php-format
diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css
index ddf3d1295..f2c1b7a48 100644
--- a/view/theme/redbasic/css/style.css
+++ b/view/theme/redbasic/css/style.css
@@ -872,10 +872,6 @@ div.jGrowl div.jGrowl-notification {
 	margin-left: 20px;
 }
 
-.reshared-content img {
-	width: 100%;
-}
-
 .shared_header img {
 	border-radius: $radius;
 	margin-right: 10px;
@@ -884,21 +880,19 @@ div.jGrowl div.jGrowl-notification {
 .tag1 {
     font-size : 0.9em !important;
   }
+
 .tag2 {
     font-size : 1.0em !important;
   }
 
-
 .tag3 {
     font-size : 1.1em !important;
   }
 
-
 .tag4 {
     font-size : 1.2em !important;
   }
 
-
 .tag5 {
     font-size : 1.3em !important;
   }
@@ -918,12 +912,10 @@ div.jGrowl div.jGrowl-notification {
     font-size : 1.6em !important;
   }
 
-
 .tag9 {
     font-size : 1.7em !important;
   }
 
-
 .tag10 {
     font-size : 1.8em !important;
   }
diff --git a/view/theme/redbasic/schema/Focus-Light.php b/view/theme/redbasic/schema/Focus-Light.php
index 14ee130d9..8a542d1b8 100644
--- a/view/theme/redbasic/schema/Focus-Light.php
+++ b/view/theme/redbasic/schema/Focus-Light.php
@@ -3,10 +3,11 @@
 	if (! $nav_bg)
 		$nav_bg = "#f8f9fa";
 	if (! $nav_icon_colour)
-		$nav_icon_colour = "rgba(0, 0, 0, 0.5);";
+		$nav_icon_colour = "rgba(0, 0, 0, 0.5)";
 	if (! $nav_active_icon_colour)
 		$nav_active_icon_colour = "rgba(0, 0, 0, 0.7)";
 	if (! $radius)
 		$radius = "4px";
 	if (! $banner_colour)
 		$banner_colour = "rgba(0, 0, 0, 0.7)";
+
diff --git a/view/tpl/activity_filter_widget.tpl b/view/tpl/activity_filter_widget.tpl
index 1eb11c10f..7d10100ba 100644
--- a/view/tpl/activity_filter_widget.tpl
+++ b/view/tpl/activity_filter_widget.tpl
@@ -17,7 +17,7 @@
 		</form>
 	</div>
 	<script>
-		$("#cid-filter").name_autocomplete(baseurl + '/acl', 'a', true, function(data) {
+		$("#cid-filter").contact_autocomplete(baseurl + '/acl', 'a', true, function(data) {
 			$("#cid").val(data.id);
 		});
 	</script>