From c3079f4a4196eb001801ff4526ab97ff115b2283 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Fri, 18 May 2018 14:01:31 +0200
Subject: [PATCH] Updated translations
- Prepared for French and Serbian
- Updated Portuguese
- Reformatted XML resources
---
.tx/config | 22 +++++++++++++++++++
app/src/main/AndroidManifest.xml | 2 +-
.../res/layout/dialog_colorchooser_custom.xml | 2 +-
app/src/main/res/layout/widget_network.xml | 4 ++--
.../res/values-de/strings_preferences.xml | 2 --
app/src/main/res/values-fr/strings.xml | 20 +++++++++++++++++
.../res/values-fr/strings_contributors.xml | 20 +++++++++++++++++
.../main/res/values-fr/strings_defaults.xml | 20 +++++++++++++++++
app/src/main/res/values-fr/strings_error.xml | 20 +++++++++++++++++
app/src/main/res/values-fr/strings_format.xml | 20 +++++++++++++++++
app/src/main/res/values-fr/strings_info.xml | 20 +++++++++++++++++
.../main/res/values-fr/strings_messages.xml | 20 +++++++++++++++++
.../res/values-fr/strings_preferences.xml | 20 +++++++++++++++++
.../main/res/values-fr/strings_settings.xml | 20 +++++++++++++++++
app/src/main/res/values-fr/strings_setup.xml | 20 +++++++++++++++++
app/src/main/res/values-fr/strings_status.xml | 20 +++++++++++++++++
.../main/res/values-lt/strings_messages.xml | 2 ++
.../res/values-lt/strings_preferences.xml | 1 -
.../res/values-pt/strings_preferences.xml | 6 +++++
app/src/main/res/values-sr/strings.xml | 20 +++++++++++++++++
.../res/values-sr/strings_contributors.xml | 20 +++++++++++++++++
.../main/res/values-sr/strings_defaults.xml | 20 +++++++++++++++++
app/src/main/res/values-sr/strings_error.xml | 20 +++++++++++++++++
app/src/main/res/values-sr/strings_format.xml | 20 +++++++++++++++++
app/src/main/res/values-sr/strings_info.xml | 20 +++++++++++++++++
.../main/res/values-sr/strings_messages.xml | 20 +++++++++++++++++
.../res/values-sr/strings_preferences.xml | 20 +++++++++++++++++
.../main/res/values-sr/strings_settings.xml | 20 +++++++++++++++++
app/src/main/res/values-sr/strings_setup.xml | 20 +++++++++++++++++
app/src/main/res/values-sr/strings_status.xml | 20 +++++++++++++++++
gradle.properties | 1 -
31 files changed, 474 insertions(+), 8 deletions(-)
create mode 100644 app/src/main/res/values-fr/strings.xml
create mode 100644 app/src/main/res/values-fr/strings_contributors.xml
create mode 100644 app/src/main/res/values-fr/strings_defaults.xml
create mode 100644 app/src/main/res/values-fr/strings_error.xml
create mode 100644 app/src/main/res/values-fr/strings_format.xml
create mode 100644 app/src/main/res/values-fr/strings_info.xml
create mode 100644 app/src/main/res/values-fr/strings_messages.xml
create mode 100644 app/src/main/res/values-fr/strings_preferences.xml
create mode 100644 app/src/main/res/values-fr/strings_settings.xml
create mode 100644 app/src/main/res/values-fr/strings_setup.xml
create mode 100644 app/src/main/res/values-fr/strings_status.xml
create mode 100644 app/src/main/res/values-sr/strings.xml
create mode 100644 app/src/main/res/values-sr/strings_contributors.xml
create mode 100644 app/src/main/res/values-sr/strings_defaults.xml
create mode 100644 app/src/main/res/values-sr/strings_error.xml
create mode 100644 app/src/main/res/values-sr/strings_format.xml
create mode 100644 app/src/main/res/values-sr/strings_info.xml
create mode 100644 app/src/main/res/values-sr/strings_messages.xml
create mode 100644 app/src/main/res/values-sr/strings_preferences.xml
create mode 100644 app/src/main/res/values-sr/strings_settings.xml
create mode 100644 app/src/main/res/values-sr/strings_setup.xml
create mode 100644 app/src/main/res/values-sr/strings_status.xml
diff --git a/.tx/config b/.tx/config
index 4a3d80c9d..e9daa259a 100644
--- a/.tx/config
+++ b/.tx/config
@@ -8,6 +8,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_status.xml
trans.lt = app/src/main/res/values-lt/strings_status.xml
trans.pt = app/src/main/res/values-pt/strings_status.xml
+trans.sr = app/src/main/res/values-sr/strings_status.xml
+trans.fr = app/src/main/res/values-fr/strings_status.xml
[quasseldroid-1.strings_errorxml]
type = ANDROID
@@ -16,6 +18,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_error.xml
trans.lt = app/src/main/res/values-lt/strings_error.xml
trans.pt = app/src/main/res/values-pt/strings_error.xml
+trans.sr = app/src/main/res/values-sr/strings_error.xml
+trans.fr = app/src/main/res/values-fr/strings_error.xml
[quasseldroid-1.strings_defaultsxml]
type = ANDROID
@@ -24,6 +28,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_defaults.xml
trans.lt = app/src/main/res/values-lt/strings_defaults.xml
trans.pt = app/src/main/res/values-pt/strings_defaults.xml
+trans.sr = app/src/main/res/values-sr/strings_defaults.xml
+trans.fr = app/src/main/res/values-fr/strings_defaults.xml
[quasseldroid-1.strings_formatxml]
type = ANDROID
@@ -32,6 +38,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_format.xml
trans.lt = app/src/main/res/values-lt/strings_format.xml
trans.pt = app/src/main/res/values-pt/strings_format.xml
+trans.sr = app/src/main/res/values-sr/strings_format.xml
+trans.fr = app/src/main/res/values-fr/strings_format.xml
[quasseldroid-1.strings_preferencesxml]
type = ANDROID
@@ -40,6 +48,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_preferences.xml
trans.lt = app/src/main/res/values-lt/strings_preferences.xml
trans.pt = app/src/main/res/values-pt/strings_preferences.xml
+trans.sr = app/src/main/res/values-sr/strings_preferences.xml
+trans.fr = app/src/main/res/values-fr/strings_preferences.xml
[quasseldroid-1.strings_messagesxml]
type = ANDROID
@@ -48,6 +58,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_messages.xml
trans.lt = app/src/main/res/values-lt/strings_messages.xml
trans.pt = app/src/main/res/values-pt/strings_messages.xml
+trans.sr = app/src/main/res/values-sr/strings_messages.xml
+trans.fr = app/src/main/res/values-fr/strings_messages.xml
[quasseldroid-1.stringsxml]
type = ANDROID
@@ -56,6 +68,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings.xml
trans.lt = app/src/main/res/values-lt/strings.xml
trans.pt = app/src/main/res/values-pt/strings.xml
+trans.sr = app/src/main/res/values-sr/strings.xml
+trans.fr = app/src/main/res/values-fr/strings.xml
[quasseldroid-1.strings_setupxml]
type = ANDROID
@@ -64,6 +78,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_setup.xml
trans.lt = app/src/main/res/values-lt/strings_setup.xml
trans.pt = app/src/main/res/values-pt/strings_setup.xml
+trans.sr = app/src/main/res/values-sr/strings_setup.xml
+trans.fr = app/src/main/res/values-fr/strings_setup.xml
[quasseldroid-1.strings_contributorsxml]
type = ANDROID
@@ -72,6 +88,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_contributors.xml
trans.lt = app/src/main/res/values-lt/strings_contributors.xml
trans.pt = app/src/main/res/values-pt/strings_contributors.xml
+trans.sr = app/src/main/res/values-sr/strings_contributors.xml
+trans.fr = app/src/main/res/values-fr/strings_contributors.xml
[quasseldroid-1.strings_infoxml]
type = ANDROID
@@ -80,6 +98,8 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_info.xml
trans.lt = app/src/main/res/values-lt/strings_info.xml
trans.pt = app/src/main/res/values-pt/strings_info.xml
+trans.sr = app/src/main/res/values-sr/strings_info.xml
+trans.fr = app/src/main/res/values-fr/strings_info.xml
[quasseldroid-1.strings_settingsxml]
type = ANDROID
@@ -88,4 +108,6 @@ source_lang = en
trans.de = app/src/main/res/values-de/strings_settings.xml
trans.lt = app/src/main/res/values-lt/strings_settings.xml
trans.pt = app/src/main/res/values-pt/strings_settings.xml
+trans.sr = app/src/main/res/values-sr/strings_settings.xml
+trans.fr = app/src/main/res/values-fr/strings_settings.xml
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index c1c016a5a..e813df6c3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -34,8 +34,8 @@
<application
android:name=".Quasseldroid"
android:allowBackup="true"
- android:fullBackupContent="@xml/backup_content"
android:description="@string/app_description"
+ android:fullBackupContent="@xml/backup_content"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
diff --git a/app/src/main/res/layout/dialog_colorchooser_custom.xml b/app/src/main/res/layout/dialog_colorchooser_custom.xml
index c9efe8128..4a8b6c135 100644
--- a/app/src/main/res/layout/dialog_colorchooser_custom.xml
+++ b/app/src/main/res/layout/dialog_colorchooser_custom.xml
@@ -58,10 +58,10 @@
android:digits="0123456789abcdefABCDEF"
android:focusable="true"
android:hint="FF0099CC"
+ android:inputType="textNoSuggestions"
android:textColor="?colorTextPrimary"
android:textColorHint="?colorTextSecondary"
android:textSize="@dimen/md_title_textsize"
- android:inputType="textNoSuggestions"
tools:ignore="HardcodedText" />
</LinearLayout>
diff --git a/app/src/main/res/layout/widget_network.xml b/app/src/main/res/layout/widget_network.xml
index 68f61c04a..00debbaa4 100644
--- a/app/src/main/res/layout/widget_network.xml
+++ b/app/src/main/res/layout/widget_network.xml
@@ -65,7 +65,7 @@
android:paddingStart="16dp"
android:paddingTop="12dp"
android:scaleType="fitEnd"
- app:tint="?attr/colorTextSecondary"
- app:srcCompat="@drawable/ic_chevron_down" />
+ app:srcCompat="@drawable/ic_chevron_down"
+ app:tint="?attr/colorTextSecondary" />
</LinearLayout>
</LinearLayout>
diff --git a/app/src/main/res/values-de/strings_preferences.xml b/app/src/main/res/values-de/strings_preferences.xml
index 4e7d0f140..5686fb940 100644
--- a/app/src/main/res/values-de/strings_preferences.xml
+++ b/app/src/main/res/values-de/strings_preferences.xml
@@ -31,11 +31,9 @@
<string name="preference_theme_entry_gruvbox_light">Gruvbox (Hell)</string>
<string name="preference_theme_entry_gruvbox_dark">Gruvbox (Dunkel)</string>
<string name="preference_theme_entry_dracula">Dracula</string>
-
<string name="preference_input_enter_title">Eingabetaste auf Tastatur</string>
<string name="preference_input_enter_entry_emoji">Emoji-Auswahl</string>
<string name="preference_input_enter_entry_send">Senden</string>
-
<string name="preference_show_lag_title">Latenz anzeigen</string>
<string name="preference_show_lag_summary">Zeigt die Gerät-Core-Latenz in der Statusleiste</string>
diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_contributors.xml b/app/src/main/res/values-fr/strings_contributors.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_contributors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_defaults.xml b/app/src/main/res/values-fr/strings_defaults.xml
new file mode 100644
index 000000000..99253b7ee
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_defaults.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_error.xml b/app/src/main/res/values-fr/strings_error.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_error.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_format.xml b/app/src/main/res/values-fr/strings_format.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_format.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_info.xml b/app/src/main/res/values-fr/strings_info.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_messages.xml b/app/src/main/res/values-fr/strings_messages.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_messages.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_preferences.xml b/app/src/main/res/values-fr/strings_preferences.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_preferences.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_settings.xml b/app/src/main/res/values-fr/strings_settings.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_setup.xml b/app/src/main/res/values-fr/strings_setup.xml
new file mode 100644
index 000000000..4f6d7cf2f
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_setup.xml
@@ -0,0 +1,20 @@
+<!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-fr/strings_status.xml b/app/src/main/res/values-fr/strings_status.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-fr/strings_status.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-lt/strings_messages.xml b/app/src/main/res/values-lt/strings_messages.xml
index d956fee06..5e039d89e 100644
--- a/app/src/main/res/values-lt/strings_messages.xml
+++ b/app/src/main/res/values-lt/strings_messages.xml
@@ -44,11 +44,13 @@
<plurals name="message_netsplit_join">
<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">
<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>
<item quantity="other">Netsplit tarp %1$s ir %2$s: %3$d vartotojų išėjo</item>
</plurals>
</resources>
diff --git a/app/src/main/res/values-lt/strings_preferences.xml b/app/src/main/res/values-lt/strings_preferences.xml
index 71d685195..fb669229f 100644
--- a/app/src/main/res/values-lt/strings_preferences.xml
+++ b/app/src/main/res/values-lt/strings_preferences.xml
@@ -126,7 +126,6 @@
<string name="preference_autocomplete_prefix_title">Siūlyti po simbolio</string>
<string name="preference_autocomplete_prefix_summary">Siūlyti slapyvardžius ir kanalus įvedus @ arba #</string>
-
<string name="preference_backlog_title">Žinučių žurnalas</string>
<string name="preference_page_size_title">Atminties dydis</string>
diff --git a/app/src/main/res/values-pt/strings_preferences.xml b/app/src/main/res/values-pt/strings_preferences.xml
index c86b5e69f..34f61468e 100644
--- a/app/src/main/res/values-pt/strings_preferences.xml
+++ b/app/src/main/res/values-pt/strings_preferences.xml
@@ -126,6 +126,12 @@
<string name="preference_autocomplete_prefix_title">Mostrar após prefixo</string>
<string name="preference_autocomplete_prefix_summary">Sugere alcunhas e canais depois de inserir @ ou #</string>
+ <string name="preference_autocomplete_nicks_title">Preenchimento Automático de Alcunhas</string>
+
+ <string name="preference_autocomplete_buffers_title">Preenchimento Automático de Chats</string>
+
+ <string name="preference_autocomplete_aliases_title">Preenchimento Automático de Comandos</string>
+
<string name="preference_backlog_title">Histórico</string>
diff --git a/app/src/main/res/values-sr/strings.xml b/app/src/main/res/values-sr/strings.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_contributors.xml b/app/src/main/res/values-sr/strings_contributors.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_contributors.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_defaults.xml b/app/src/main/res/values-sr/strings_defaults.xml
new file mode 100644
index 000000000..99253b7ee
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_defaults.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_error.xml b/app/src/main/res/values-sr/strings_error.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_error.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_format.xml b/app/src/main/res/values-sr/strings_format.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_format.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_info.xml b/app/src/main/res/values-sr/strings_info.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_info.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_messages.xml b/app/src/main/res/values-sr/strings_messages.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_messages.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_preferences.xml b/app/src/main/res/values-sr/strings_preferences.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_preferences.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_settings.xml b/app/src/main/res/values-sr/strings_settings.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_settings.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_setup.xml b/app/src/main/res/values-sr/strings_setup.xml
new file mode 100644
index 000000000..4f6d7cf2f
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_setup.xml
@@ -0,0 +1,20 @@
+<!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/app/src/main/res/values-sr/strings_status.xml b/app/src/main/res/values-sr/strings_status.xml
new file mode 100644
index 000000000..393cae785
--- /dev/null
+++ b/app/src/main/res/values-sr/strings_status.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?><!--
+ Quasseldroid - Quassel client for Android
+
+ Copyright (c) 2018 Janne Koschinski
+ Copyright (c) 2018 The Quassel Project
+
+ This program is free software: you can redistribute it and/or modify it
+ under the terms of the GNU General Public License version 3 as published
+ by the Free Software Foundation.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License along
+ with this program. If not, see <http://www.gnu.org/licenses/>.
+ -->
+
+<resources></resources>
diff --git a/gradle.properties b/gradle.properties
index 4e40cd829..3b3e30e92 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -14,7 +14,6 @@
#
# You should have received a copy of the GNU General Public License along
# with this program. If not, see <http://www.gnu.org/licenses/>.
-
# Project-wide Gradle settings.
# IDE (e.g. Android Studio) users:
# Gradle settings configured through the IDE *will override*
--
GitLab