Merge branch 'master' into Share

app/build.gradle

@@ -46,8 +46,8 @@ android {
 
         // mayor.minor.hotfix.increment (for increment: 01-50=Alpha / 51-89=RC / 90-99=stable)
         // xx   .xxx  .xx    .xx
-        versionCode 170200001
-        versionName "17.20.0 Alpha 01"
+        versionCode 170200002
+        versionName "17.20.0 Alpha 02"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

app/src/main/res/values-gl/strings.xml

@@ -456,6 +456,7 @@
     <string name="scope_toggle_description">Cambiar o nivel de privacidade de %1$s</string>
     <string name="scroll_to_bottom">Desprazarse ata o final</string>
     <string name="secondsAgo">segundos atrás</string>
+    <string name="see_similar_system_messages">Ver %1$s mensaxes similares</string>
     <string name="selected_list_item">Seleccionado</string>
     <string name="send_to">Enviar a</string>
     <string name="send_to_forbidden">Non ten permiso para compartir contido nesta parola</string>

app/src/main/res/values-zh-rTW/strings.xml

@@ -456,6 +456,7 @@
     <string name="scope_toggle_description">變更 %1$s 的隱私層級</string>
     <string name="scroll_to_bottom">捲動至底部</string>
     <string name="secondsAgo">秒前</string>
+    <string name="see_similar_system_messages">檢視 %1$s 則類似的訊息</string>
     <string name="selected_list_item">已選擇</string>
     <string name="send_to">傳送至</string>
     <string name="send_to_forbidden">您不被允許在此聊天中分享內容</string>