diff --git a/ultrasonic/lint-baseline.xml b/ultrasonic/lint-baseline.xml
index d4b7fda1..d74e6655 100644
--- a/ultrasonic/lint-baseline.xml
+++ b/ultrasonic/lint-baseline.xml
@@ -106,7 +106,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="128"
+            line="132"
             column="5"/>
     </issue>
 
@@ -117,7 +117,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="145"
+            line="149"
             column="5"/>
     </issue>
 
@@ -128,7 +128,7 @@
         errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="146"
+            line="150"
             column="5"/>
     </issue>
 
@@ -381,7 +381,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="109"
+            line="112"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -393,7 +393,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="109"
+            line="112"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -409,7 +409,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="109"
+            line="112"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -429,7 +429,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="80"
+            line="108"
             column="13"/>
     </issue>
 
@@ -440,7 +440,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="122"
+            line="126"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -452,7 +452,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="122"
+            line="125"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -468,7 +468,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="120"
+            line="125"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -488,7 +488,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="90"
+            line="121"
             column="13"/>
     </issue>
 
@@ -499,7 +499,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="127"
+            line="131"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -511,7 +511,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="127"
+            line="130"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -527,7 +527,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="125"
+            line="130"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -547,7 +547,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="95"
+            line="126"
             column="13"/>
     </issue>
 
@@ -558,7 +558,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="128"
+            line="132"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -570,7 +570,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="128"
+            line="131"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -586,7 +586,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="126"
+            line="131"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -604,6 +604,10 @@
             file="src/main/res/values-ru/strings.xml"
             line="128"
             column="13"/>
+        <location
+            file="src/main/res/values-zh-rCN/strings.xml"
+            line="127"
+            column="13"/>
     </issue>
 
     <issue
@@ -613,7 +617,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="129"
+            line="133"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -625,7 +629,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="129"
+            line="132"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -641,7 +645,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="127"
+            line="132"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -661,7 +665,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="96"
+            line="128"
             column="13"/>
     </issue>
 
@@ -672,7 +676,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="130"
+            line="134"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -684,7 +688,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="130"
+            line="133"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -700,7 +704,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="128"
+            line="133"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -720,7 +724,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="97"
+            line="129"
             column="13"/>
     </issue>
 
@@ -731,7 +735,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="135"
+            line="139"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -743,7 +747,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="135"
+            line="138"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -759,7 +763,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="133"
+            line="138"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -779,7 +783,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="100"
+            line="134"
             column="13"/>
     </issue>
 
@@ -790,7 +794,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="141"
+            line="145"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -802,7 +806,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="141"
+            line="144"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -818,7 +822,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="139"
+            line="144"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -838,7 +842,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="106"
+            line="140"
             column="13"/>
     </issue>
 
@@ -849,7 +853,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="154"
+            line="158"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -861,7 +865,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="154"
+            line="157"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -877,7 +881,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="152"
+            line="157"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -895,6 +899,10 @@
             file="src/main/res/values-ru/strings.xml"
             line="154"
             column="13"/>
+        <location
+            file="src/main/res/values-zh-rCN/strings.xml"
+            line="153"
+            column="13"/>
     </issue>
 
     <issue
@@ -904,7 +912,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="155"
+            line="159"
             column="13"/>
     </issue>
 
@@ -915,7 +923,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="156"
+            line="160"
             column="13"/>
     </issue>
 
@@ -926,7 +934,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="172"
+            line="176"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -938,7 +946,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="170"
+            line="173"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -954,7 +962,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="168"
+            line="173"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -974,7 +982,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="131"
+            line="169"
             column="13"/>
     </issue>
 
@@ -985,7 +993,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="224"
+            line="228"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -997,7 +1005,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="222"
+            line="225"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -1013,7 +1021,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="220"
+            line="225"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -1031,6 +1039,10 @@
             file="src/main/res/values-ru/strings.xml"
             line="222"
             column="13"/>
+        <location
+            file="src/main/res/values-zh-rCN/strings.xml"
+            line="219"
+            column="13"/>
     </issue>
 
     <issue
@@ -1040,7 +1052,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="293"
+            line="297"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -1052,7 +1064,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="289"
+            line="294"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -1068,7 +1080,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="287"
+            line="294"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -1080,7 +1092,7 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="289"
+            line="291"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
@@ -1088,7 +1100,7 @@
             column="13"/>
         <location
             file="src/main/res/values-zh-rCN/strings.xml"
-            line="213"
+            line="287"
             column="13"/>
     </issue>
 
@@ -1099,7 +1111,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="296"
+            line="300"
             column="13"/>
         <location
             file="src/main/res/values-cs/strings.xml"
@@ -1111,7 +1123,7 @@
             column="13"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="292"
+            line="297"
             column="13"/>
         <location
             file="src/main/res/values-fr/strings.xml"
@@ -1127,7 +1139,7 @@
             column="13"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="290"
+            line="297"
             column="13"/>
         <location
             file="src/main/res/values-pl/strings.xml"
@@ -1139,12 +1151,16 @@
             column="13"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="292"
+            line="294"
             column="13"/>
         <location
             file="src/main/res/values-ru/strings.xml"
             line="292"
             column="13"/>
+        <location
+            file="src/main/res/values-zh-rCN/strings.xml"
+            line="290"
+            column="13"/>
     </issue>
 
     <issue
@@ -1154,7 +1170,7 @@
         errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="390"
+            line="397"
             column="13"/>
     </issue>
 
@@ -1165,47 +1181,47 @@
         errorLine2="             ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
         <location
             file="src/main/res/values/strings.xml"
-            line="469"
+            line="476"
             column="14"/>
         <location
             file="src/main/res/values-cs/strings.xml"
             line="450"
             column="14"/>
-        <location
-            file="src/main/res/values-de/strings.xml"
-            line="391"
-            column="14"/>
         <location
             file="src/main/res/values-es/strings.xml"
-            line="463"
+            line="472"
             column="14"/>
         <location
             file="src/main/res/values-fr/strings.xml"
-            line="463"
+            line="461"
             column="14"/>
         <location
             file="src/main/res/values-hu/strings.xml"
-            line="458"
+            line="456"
             column="14"/>
         <location
             file="src/main/res/values-nl/strings.xml"
-            line="460"
+            line="472"
             column="14"/>
         <location
             file="src/main/res/values-pl/strings.xml"
-            line="404"
+            line="403"
             column="14"/>
         <location
             file="src/main/res/values-pt/strings.xml"
-            line="391"
+            line="390"
             column="14"/>
         <location
             file="src/main/res/values-pt-rBR/strings.xml"
-            line="463"
+            line="465"
             column="14"/>
         <location
             file="src/main/res/values-ru/strings.xml"
-            line="475"
+            line="473"
+            column="14"/>
+        <location
+            file="src/main/res/values-zh-rCN/strings.xml"
+            line="454"
             column="14"/>
     </issue>
 
@@ -1242,94 +1258,6 @@
             column="6"/>
     </issue>
 
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-it/strings.xml"
-            line="312"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-de/strings.xml"
-            line="323"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-pl/strings.xml"
-            line="323"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-cs/strings.xml"
-            line="326"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-hu/strings.xml"
-            line="340"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyDashes"
-        message="Replace &quot;--&quot; with an &quot;em dash&quot; character (—, &amp;#8212;) ?"
-        errorLine1="    &lt;string name=&quot;util.no_time&quot;>-:--&lt;/string>"
-        errorLine2="                                ^">
-        <location
-            file="src/main/res/values-nl/strings.xml"
-            line="340"
-            column="33"/>
-    </issue>
-
-    <issue
-        id="TypographyEllipsis"
-        message="Replace &quot;...&quot; with ellipsis character (…, &amp;#8230;) ?"
-        errorLine1="    &lt;string name=&quot;parser.reading&quot;>Bezig met uitlezen van server...&lt;/string>"
-        errorLine2="                                  ^">
-        <location
-            file="src/main/res/values-nl/strings.xml"
-            line="127"
-            column="35"/>
-    </issue>
-
-    <issue
-        id="TypographyEllipsis"
-        message="Replace &quot;...&quot; with ellipsis character (…, &amp;#8230;) ?"
-        errorLine1="    &lt;string name=&quot;service.connecting&quot;>Bezig met verbinden met server; even geduld...&lt;/string>"
-        errorLine2="                                      ^">
-        <location
-            file="src/main/res/values-nl/strings.xml"
-            line="152"
-            column="39"/>
-    </issue>
-
     <issue
         id="IconDuplicates"
         message="The following unrelated icon files have identical contents: list_pressed_holo_dark.9.png, list_pressed_holo_light.9.png">
@@ -1368,7 +1296,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src/main/res/layout/share_details.xml"
-            line="22"
+            line="30"
             column="10"/>
     </issue>
 
@@ -2138,7 +2066,7 @@
         errorLine2="         ~~~~~~~~">
         <location
             file="src/main/res/layout/share_details.xml"
-            line="22"
+            line="30"
             column="10"/>
     </issue>