From f4a1036c7bc741626209ae8f10001d4667eeba3a Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 18 May 2018 15:29:18 +0200
Subject: [PATCH] Fix builds
---
app/src/main/res/layout/widget_alias.xml | 47 ++++++++-----------
.../main/res/values-lt/strings_messages.xml | 7 +--
2 files changed, 24 insertions(+), 30 deletions(-)
diff --git a/app/src/main/res/layout/widget_alias.xml b/app/src/main/res/layout/widget_alias.xml
index a2a17d1a6..4863c476d 100644
--- a/app/src/main/res/layout/widget_alias.xml
+++ b/app/src/main/res/layout/widget_alias.xml
@@ -23,37 +23,30 @@
android:layout_height="wrap_content"
android:background="?attr/backgroundMenuItem"
android:minHeight="48dp"
+ android:orientation="vertical"
android:paddingBottom="8dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingTop="8dp">
- <LinearLayout
- android:layout_width="0dip"
+ <TextView
+ android:id="@+id/alias"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_gravity="center"
- android:layout_weight="1"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/alias"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|start"
- android:fontFamily="sans-serif-medium"
- android:singleLine="true"
- android:textColor="?attr/colorTextPrimary"
- android:textSize="13sp"
- tools:text="#quasseldroid" />
-
- <TextView
- android:id="@+id/expansion"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical|start"
- android:singleLine="true"
- android:textColor="?attr/colorTextSecondary"
- android:textSize="12sp"
- tools:text="Quasseldroid is an Android client for #quassel ♥ justJanne's much improved version: https://dl.kuschku.de/releases/quasseldroid/ ♥ http://github.com/sandsmark/Quasseldroid ♥ Quasseldroid on play https://market.android.com/details?id=com.iskrembilen.quasseldroid ♥ Sign up for beta: https://plus.google.com/communities/104094956084217666662" />
- </LinearLayout>
+ android:layout_gravity="center_vertical|start"
+ android:fontFamily="sans-serif-medium"
+ android:singleLine="true"
+ android:textColor="?attr/colorTextPrimary"
+ android:textSize="13sp"
+ tools:text="#quasseldroid" />
+
+ <TextView
+ android:id="@+id/expansion"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_vertical|start"
+ android:singleLine="true"
+ android:textColor="?attr/colorTextSecondary"
+ android:textSize="12sp"
+ tools:text="Quasseldroid is an Android client for #quassel ♥ justJanne's much improved version: https://dl.kuschku.de/releases/quasseldroid/ ♥ http://github.com/sandsmark/Quasseldroid ♥ Quasseldroid on play https://market.android.com/details?id=com.iskrembilen.quasseldroid ♥ Sign up for beta: https://plus.google.com/communities/104094956084217666662" />
</LinearLayout>
diff --git a/app/src/main/res/values-lt/strings_messages.xml b/app/src/main/res/values-lt/strings_messages.xml
index 5e039d89e..84d891c39 100644
--- a/app/src/main/res/values-lt/strings_messages.xml
+++ b/app/src/main/res/values-lt/strings_messages.xml
@@ -17,7 +17,7 @@
with this program. If not, see <http://www.gnu.org/licenses/>.
-->
-<resources>
+<resources xmlns:tools="http://schemas.android.com/tools">
<string name="message_type_join">Prisijungimas</string>
<string name="message_type_part">Atsijungimas</string>
<string name="message_type_quit">Išėjimas</string>
@@ -41,13 +41,14 @@
<string name="message_format_kick_2">%1$s buvo išspirtas %2$s%3$s (%4$s)</string>
<string name="message_format_kill_1">%1$s buvo nužudytas %2$s%3$s</string>
<string name="message_format_kill_2">%1$s buvo nužudytas %2$s%3$s (%4$s)</string>
- <plurals name="message_netsplit_join">
+ <!-- Transifex’ quantity handling is different from Android’s. Issue opened on 2018-05-18 -->
+ <plurals name="message_netsplit_join" tools:ignore="UnusedQuantity">
<item quantity="one">Netsplit tarp %1$s ir %2$s baigėsi: %3$d vartotojas prisijungė</item>
<item quantity="few">Netsplit tarp %1$s ir %2$s baigėsi: %3$d vartotojai prisijungė</item>
<item quantity="many">Netsplit tarp %1$s ir %2$s baigėsi: %3$d vartotojų prisijungė</item>
<item quantity="other">Netsplit tarp %1$s ir %2$s baigėsi: %3$d vartotojų prisijungė</item>
</plurals>
- <plurals name="message_netsplit_quit">
+ <plurals name="message_netsplit_quit" tools:ignore="UnusedQuantity">
<item quantity="one">Netsplit tarp %1$s ir %2$s: %3$d vartotojas išėjo</item>
<item quantity="few">Netsplit tarp %1$s ir %2$s: %3$d vartotojai išėjo</item>
<item quantity="many">Netsplit tarp %1$s ir %2$s: %3$d vartotojų išėjo</item>
--
GitLab