Merge branch 'master' into modeswitch

Author: cassidyjames

data/com.github.writeas.writeas-gtk.appdata.xml

@@ -69,7 +69,7 @@
     <content_attribute id="language-humor">none</content_attribute>
     <content_attribute id="language-discrimination">none</content_attribute>
     <content_attribute id="social-chat">none</content_attribute>
-    <content_attribute id="social-info">none</content_attribute>
+    <content_attribute id="social-info">moderate</content_attribute>
     <content_attribute id="social-audio">none</content_attribute>
     <content_attribute id="social-location">none</content_attribute>
     <content_attribute id="social-contacts">none</content_attribute>

src/window.vala

@@ -133,7 +133,8 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
         set_titlebar(header);
 
         var publish_button = new Gtk.Button.from_icon_name("document-send",
-                Gtk.IconSize.SMALL_TOOLBAR);
+                Gtk.IconSize.LARGE_TOOLBAR);
+        publish_button.tooltip_text = _("Publish to Write.as on the web");
         publish_button.clicked.connect(() => {
             canvas.buffer.text += "\n\n" + publish();
 
@@ -157,7 +158,7 @@ public class WriteAs.MainWindow : Gtk.ApplicationWindow {
 
         var fonts = new Gtk.MenuButton();
         fonts.tooltip_text = _("Change document font");
-        fonts.image = new Gtk.Image.from_icon_name("font-x-generic", Gtk.IconSize.SMALL_TOOLBAR);
+        fonts.image = new Gtk.Image.from_icon_name("font-x-generic", Gtk.IconSize.LARGE_TOOLBAR);
         fonts.popup = new Gtk.Menu();
         header.pack_start(fonts);