Merge branch 'master' into loginTextfieldDesign_master

CHANGELOG.md

@@ -13,6 +13,7 @@ Types of changes can be: Added/Changed/Deprecated/Removed/Fixed/Security
 - improve conversation list design and dark/light theming (@AndyScherzinger)
 - introduce new dark/light toolbar/searchbar design (@AndyScherzinger)
 - improve login screen design (@AndyScherzinger)
+- improve content/toolbar alignments (@AndyScherzinger)
 
 ### Fixed
 - @ in username is allowed for phonebook sync

app/build.gradle

@@ -40,8 +40,8 @@ android {
 
         // mayor.minor.hotfix.increment (for increment: 1-50=Alpha / 51-89=RC / 90-99=stable)
         // xx   .xxx  .xx    .xx
-        versionCode 120000005
-        versionName "12.0.0 Alpha 05"
+        versionCode 120000006
+        versionName "12.0.0 Alpha 06"
 
         flavorDimensions "default"
         renderscriptTargetApi 19

app/src/main/java/com/nextcloud/talk/controllers/ConversationInfoController.kt

@@ -30,7 +30,6 @@ import android.view.MenuItem
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ProgressBar
-import android.widget.TextView
 import androidx.appcompat.widget.SwitchCompat
 import androidx.emoji.widget.EmojiTextView
 import androidx.recyclerview.widget.RecyclerView
@@ -70,10 +69,13 @@ import com.nextcloud.talk.utils.DateUtils
 import com.nextcloud.talk.utils.DisplayUtils
 import com.nextcloud.talk.utils.bundle.BundleKeys
 import com.nextcloud.talk.utils.preferences.preferencestorage.DatabaseStorageModule
-import com.nextcloud.talk.utils.ui.MaterialPreferenceCategoryWithRightLink
 import com.yarolegovich.lovelydialog.LovelySaveStateHandler
 import com.yarolegovich.lovelydialog.LovelyStandardDialog
-import com.yarolegovich.mp.*
+import com.yarolegovich.mp.MaterialChoicePreference
+import com.yarolegovich.mp.MaterialPreferenceCategory
+import com.yarolegovich.mp.MaterialPreferenceScreen
+import com.yarolegovich.mp.MaterialStandardPreference
+import com.yarolegovich.mp.MaterialSwitchPreference
 import eu.davidea.flexibleadapter.FlexibleAdapter
 import eu.davidea.flexibleadapter.common.SmoothScrollLinearLayoutManager
 import eu.davidea.flexibleadapter.items.AbstractFlexibleItem
@@ -110,7 +112,9 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
     @BindView(R.id.display_name_text)
     lateinit var conversationDisplayName: EmojiTextView
     @BindView(R.id.participants_list_category)
-    lateinit var participantsListCategory: MaterialPreferenceCategoryWithRightLink
+    lateinit var participantsListCategory: MaterialPreferenceCategory
+    @BindView(R.id.addParticipantsAction)
+    lateinit var addParticipantsAction: MaterialStandardPreference;
     @BindView(R.id.recycler_view)
     lateinit var recyclerView: RecyclerView
     @BindView(R.id.deleteConversationAction)
@@ -121,9 +125,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
     lateinit var ownOptionsCategory: MaterialPreferenceCategory
     @BindView(R.id.muteCalls)
     lateinit var muteCalls: MaterialSwitchPreference
-    @BindView(R.id.mpc_action)
-    lateinit var actionTextView: TextView;
-
     @set:Inject
     lateinit var ncApi: NcApi
     @set:Inject
@@ -200,7 +201,7 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
             saveStateHandler = LovelySaveStateHandler()
         }
 
-        actionTextView.visibility = View.GONE
+        addParticipantsAction.visibility = View.GONE
     }
 
     private fun setupWebinaryView() {
@@ -350,24 +351,6 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
             recyclerView.adapter = adapter
 
             adapter!!.addListener(this)
-            actionTextView.setOnClickListener {
-                val bundle = Bundle()
-                val existingParticipantsId = arrayListOf<String>()
-
-                recyclerViewItems.forEach {
-                    val userItem = it as UserItem
-                    existingParticipantsId.add(userItem.model.userId)
-                }
-
-                bundle.putBoolean(BundleKeys.KEY_ADD_PARTICIPANTS, true);
-                bundle.putStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS, existingParticipantsId)
-                bundle.putString(BundleKeys.KEY_TOKEN, conversation!!.token)
-
-                getRouter().pushController((RouterTransaction.with(ContactsController(bundle))
-                        .pushChangeHandler(HorizontalChangeHandler())
-                        .popChangeHandler(HorizontalChangeHandler())));
-
-            }
         }
     }
 
@@ -430,6 +413,25 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
 
     }
 
+    @OnClick(R.id.addParticipantsAction)
+    internal fun addParticipants() {
+        val bundle = Bundle()
+        val existingParticipantsId = arrayListOf<String>()
+
+        recyclerViewItems.forEach {
+            val userItem = it as UserItem
+            existingParticipantsId.add(userItem.model.userId)
+        }
+
+        bundle.putBoolean(BundleKeys.KEY_ADD_PARTICIPANTS, true);
+        bundle.putStringArrayList(BundleKeys.KEY_EXISTING_PARTICIPANTS, existingParticipantsId)
+        bundle.putString(BundleKeys.KEY_TOKEN, conversation!!.token)
+
+        getRouter().pushController((RouterTransaction.with(ContactsController(bundle))
+                .pushChangeHandler(HorizontalChangeHandler())
+                .popChangeHandler(HorizontalChangeHandler())))
+    }
+
     @OnClick(R.id.leaveConversationAction)
     internal fun leaveConversation() {
         workerData?.let {
@@ -475,9 +477,9 @@ class ConversationInfoController(args: Bundle) : BaseController(args), FlexibleA
                         val conversationCopy = conversation
 
                         if (conversationCopy!!.canModerate(conversationUser)) {
-                            actionTextView.visibility = View.VISIBLE
+                            addParticipantsAction.visibility = View.VISIBLE
                         } else {
-                            actionTextView.visibility = View.GONE
+                            addParticipantsAction.visibility = View.GONE
                         }
 
                         if (isAttached && (!isBeingDestroyed || !isDestroyed)) {

app/src/main/java/com/nextcloud/talk/controllers/ProfileController.java

@@ -297,6 +297,11 @@ public class ProfileController extends BaseController {
                 });
     }
 
+    @Override
+    protected String getTitle() {
+        return getResources().getString(R.string.nc_profile_personal_info_title);
+    }
+
     private void showUserProfile() {
         if (getActivity() == null) {
             return;

app/src/main/java/com/nextcloud/talk/utils/ui/MaterialPreferenceCategoryWithRightLink.java

@@ -1,165 +0,0 @@
-/*
- * Nextcloud Talk application
- *
- * @author Mario Danic
- * Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * at your option) any later version.
- *
- * 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/>.
- */
-
-package com.nextcloud.talk.utils.ui;
-
-import android.content.Context;
-import android.content.res.TypedArray;
-import android.text.TextUtils;
-import android.util.AttributeSet;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.FrameLayout;
-import android.widget.TextView;
-
-import com.nextcloud.talk.R;
-import com.yarolegovich.mp.util.Utils;
-
-import androidx.annotation.ColorInt;
-import androidx.annotation.ColorRes;
-import androidx.cardview.widget.CardView;
-import androidx.core.content.ContextCompat;
-
-public class MaterialPreferenceCategoryWithRightLink extends CardView {
-
-    private ViewGroup container;
-    private TextView title;
-    private TextView action;
-
-    public MaterialPreferenceCategoryWithRightLink(Context context) {
-        super(context);
-        init(null);
-    }
-
-    public MaterialPreferenceCategoryWithRightLink(Context context, AttributeSet attrs) {
-        super(context, attrs);
-        init(attrs);
-    }
-
-    public MaterialPreferenceCategoryWithRightLink(Context context, AttributeSet attrs, int defStyleAttr) {
-        super(context, attrs, defStyleAttr);
-        init(attrs);
-    }
-
-    private void init(AttributeSet attrs) {
-        int titleColor = -1;
-        String titleText = "";
-        String actionText = "";
-        if (attrs != null) {
-            TypedArray ta = getContext().obtainStyledAttributes(attrs, R.styleable.MaterialPreferenceCategory);
-            try {
-                if (ta.hasValue(R.styleable.MaterialPreferenceCategory_mpc_title)) {
-                    titleText = ta.getString(R.styleable.MaterialPreferenceCategory_mpc_title);
-                }
-
-                if (ta.hasValue(R.styleable.MaterialPreferenceCategory_mpc_action)) {
-                    actionText = ta.getString(R.styleable.MaterialPreferenceCategory_mpc_action);
-                }
-
-                titleColor = ta.getColor(R.styleable.MaterialPreferenceCategory_mpc_title_color, -1);
-            } finally {
-                ta.recycle();
-            }
-        }
-
-        inflate(getContext(), R.layout.category_with_right_action, this);
-
-        FrameLayout.LayoutParams params = new FrameLayout.LayoutParams(
-                ViewGroup.LayoutParams.MATCH_PARENT,
-                ViewGroup.LayoutParams.WRAP_CONTENT);
-        params.setMargins(0, 0, 0, Utils.dpToPixels(getContext(), 4));
-
-        setUseCompatPadding(true);
-
-        setRadius(0);
-
-        container = (ViewGroup) findViewById(R.id.mpc_container);
-        title = (TextView) findViewById(R.id.mpc_title);
-        action = findViewById(R.id.mpc_action);
-
-        if (!TextUtils.isEmpty(titleText)) {
-            title.setVisibility(View.VISIBLE);
-            title.setText(titleText);
-        }
-
-        if (!TextUtils.isEmpty(actionText)) {
-            action.setVisibility(View.VISIBLE);
-            action.setText(actionText);
-        }
-
-        if (titleColor != -1) {
-            title.setTextColor(titleColor);
-        }
-    }
-
-    public void setAction(String actionText) {
-        action.setText(actionText);
-    }
-
-    public void setTitle(String titleText) {
-        title.setVisibility(View.VISIBLE);
-        title.setText(titleText);
-    }
-
-    public void setTitleColor(@ColorInt int color) {
-        title.setTextColor(color);
-    }
-
-    public void setTitleColorRes(@ColorRes int colorRes) {
-        title.setTextColor(ContextCompat.getColor(getContext(), colorRes));
-    }
-
-    @Override
-    public void addView(View child) {
-        if (container != null) {
-            container.addView(child);
-        } else {
-            super.addView(child);
-        }
-    }
-
-    @Override
-    public void addView(View child, int index) {
-        if (container != null) {
-            container.addView(child, index);
-        } else {
-            super.addView(child, index);
-        }
-    }
-
-    @Override
-    public void addView(View child, ViewGroup.LayoutParams params) {
-        if (container != null) {
-            container.addView(child, params);
-        } else {
-            super.addView(child, params);
-        }
-    }
-
-    @Override
-    public void addView(View child, int index, ViewGroup.LayoutParams params) {
-        if (container != null) {
-            container.addView(child, index, params);
-        } else {
-            super.addView(child, index, params);
-        }
-    }
-
-}

app/src/main/res/drawable/ic_account_plus.xml

@@ -0,0 +1,30 @@
+<!--
+  Nextcloud Android client application
+
+  Copyright (C) 2020 Nextcloud.
+
+  This program is free software; you can redistribute it and/or
+  modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+  License as published by the Free Software Foundation; either
+  version 3 of the License, or any later version.
+
+  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 AFFERO GENERAL PUBLIC LICENSE for more details.
+
+  You should have received a copy of the GNU Affero General Public
+  License along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+  Icon provided by Android Material Library in Apache License 2.0
+-->
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#666666"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM6,10L6,7L4,7v3L1,10v2h3v3h2v-3h3v-2L6,10zM15,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>

app/src/main/res/layout/activity_main.xml

@@ -50,7 +50,6 @@
             android:layout_height="?attr/actionBarSize"
             android:background="@color/appbar"
             android:theme="?attr/actionBarPopupTheme"
-            app:contentInsetStartWithNavigation="16dp"
             app:layout_scrollFlags="enterAlwaysCollapsed|noScroll"
             app:navigationIconTint="@color/fontAppbar"
             app:popupTheme="@style/appActionBarPopupMenu"

app/src/main/res/layout/category_with_right_action.xml

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ 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/>.
-  -->
-
-<merge xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools">
-
-    <LinearLayout
-        android:id="@+id/mpc_container"
-        style="@style/PreferenceContainer"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:orientation="vertical">
-
-        <RelativeLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <TextView
-                android:id="@+id/mpc_title"
-                style="@style/PreferenceHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:visibility="gone"
-                tools:text="Title"/>
-
-            <TextView
-                android:id="@+id/mpc_action"
-                style="@style/PreferenceHeader"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_alignParentEnd="true"
-                android:visibility="gone"
-                tools:text="Add" />
-
-        </RelativeLayout>
-
-    </LinearLayout>
-
-</merge>

app/src/main/res/layout/controller_conversation_info.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -51,7 +53,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:animateLayoutChanges="true"
-                android:visibility="gone">
+                android:visibility="gone"
+                apc:cardBackgroundColor="@color/bg_default"
+                apc:cardElevation="0dp"
+                tools:visibility="visible">
 
                 <RelativeLayout
                     android:layout_width="match_parent"
@@ -63,7 +68,8 @@
                         android:layout_height="wrap_content"
                         android:layout_below="@id/avatar_image"
                         android:layout_centerHorizontal="true"
-                        android:layout_marginTop="@dimen/margin_between_elements" />
+                        android:layout_marginTop="@dimen/margin_between_elements"
+                        tools:text="Jane Doe" />
 
                     <com.facebook.drawee.view.SimpleDraweeView
                         android:id="@+id/avatar_image"
@@ -80,7 +86,10 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/conversation_info_name"
-                android:visibility="gone">
+                android:visibility="gone"
+                apc:cardBackgroundColor="@color/bg_default"
+                apc:cardElevation="0dp"
+                tools:visibility="visible">
 
                 <com.yarolegovich.mp.MaterialStandardPreference
                     android:id="@+id/favoriteConversationAction"
@@ -94,16 +103,25 @@
 
             </com.yarolegovich.mp.MaterialPreferenceCategory>
 
-            <com.nextcloud.talk.utils.ui.MaterialPreferenceCategoryWithRightLink
+            <com.yarolegovich.mp.MaterialPreferenceCategory
                 android:id="@+id/participants_list_category"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@+id/webinar_settings"
                 android:visibility="gone"
+                apc:cardBackgroundColor="@color/bg_default"
+                apc:cardElevation="0dp"
                 apc:mpc_title="@string/nc_participants"
-                apc:mpc_action="@string/nc_add"
-                apc:mpc_title_color="@color/textColorMaxContrast"
-                tools:ignore="UnknownIdInLayout">
+                tools:ignore="UnknownIdInLayout"
+                tools:visibility="visible">
+
+                <com.yarolegovich.mp.MaterialStandardPreference
+                    android:id="@+id/addParticipantsAction"
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    apc:mp_icon="@drawable/ic_account_plus"
+                    apc:mp_icon_tint="@color/grey_600"
+                    apc:mp_title="@string/nc_participants_add" />
 
                 <androidx.recyclerview.widget.RecyclerView
                     android:id="@+id/recycler_view"
@@ -111,14 +129,17 @@
                     android:layout_height="wrap_content"
                     tools:listitem="@layout/rv_item_contact" />
 
-            </com.nextcloud.talk.utils.ui.MaterialPreferenceCategoryWithRightLink>
+            </com.yarolegovich.mp.MaterialPreferenceCategory>
 
             <com.yarolegovich.mp.MaterialPreferenceCategory
                 android:id="@+id/ownOptions"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/participants_list_category"
-                android:visibility="gone">
+                android:visibility="gone"
+                apc:cardBackgroundColor="@color/bg_default"
+                apc:cardElevation="0dp"
+                tools:visibility="visible">
 
                 <com.yarolegovich.mp.MaterialStandardPreference
                     android:id="@+id/leaveConversationAction"
@@ -143,14 +164,16 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/otherRoomOptions"
-                android:visibility="gone" />
+                android:visibility="gone"
+                tools:visibility="gone" />
 
             <include
                 layout="@layout/webinar_info_item"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/notification_settings"
-                android:visibility="gone" />
+                android:visibility="gone"
+                tools:visibility="visible" />
         </RelativeLayout>
     </ScrollView>
 </RelativeLayout>

app/src/main/res/layout/controller_settings.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017 Mario Danic
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -28,7 +30,9 @@
         android:id="@+id/message_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:animateLayoutChanges="true">
+        android:animateLayoutChanges="true"
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp">
 
         <TextView
             android:id="@+id/message_text"
@@ -40,7 +44,9 @@
     <com.yarolegovich.mp.MaterialPreferenceCategory
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:animateLayoutChanges="true">
+        android:animateLayoutChanges="true"
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp">
 
         <RelativeLayout
             android:id="@+id/avatarContainer"
@@ -118,8 +124,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_settings_appearance"
-        apc:mpc_title_color="@color/textColorMaxContrast">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_settings_appearance">
 
         <com.yarolegovich.mp.MaterialChoicePreference
             android:id="@+id/settings_theme"
@@ -138,8 +145,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_settings_notification_sounds"
-        apc:mpc_title_color="@color/textColorMaxContrast">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_settings_notification_sounds">
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_call_sound"
@@ -170,8 +178,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_settings_privacy"
-        apc:mpc_title_color="@color/textColorMaxContrast">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_settings_privacy">
 
         <com.yarolegovich.mp.MaterialChoicePreference
             android:id="@+id/settings_screen_lock_timeout"
@@ -218,7 +227,7 @@
             apc:mp_key="@string/nc_settings_link_previews_key"
             apc:mp_summary="@string/nc_settings_link_previews_desc"
             apc:mp_title="@string/nc_settings_link_previews_title" />
-        
+
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/settings_phone_book_integration"
             android:layout_width="match_parent"
@@ -227,7 +236,7 @@
             apc:mp_key="@string/nc_settings_phone_book_integration_key"
             apc:mp_summary="@string/nc_settings_phone_book_integration_desc"
             apc:mp_title="@string/nc_settings_phone_book_integration_title" />
-        
+
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/settings_read_privacy"
             android:layout_width="match_parent"
@@ -241,8 +250,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_settings_proxy_title"
-        apc:mpc_title_color="@color/textColorMaxContrast">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_settings_proxy_title">
 
         <com.yarolegovich.mp.MaterialChoicePreference
             android:id="@+id/settings_proxy_choice"
@@ -252,7 +262,7 @@
             apc:mp_entry_descriptions="@array/proxy_type_descriptions"
             apc:mp_key="@string/nc_settings_proxy_type_key"
             apc:mp_show_value="onRight"
-            apc:mp_title="@string/nc_settings_proxy_type_title"></com.yarolegovich.mp.MaterialChoicePreference>
+            apc:mp_title="@string/nc_settings_proxy_type_title" />
 
         <com.yarolegovich.mp.MaterialEditTextPreference
             android:id="@+id/settings_proxy_host_edit"
@@ -302,8 +312,9 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_about"
-        apc:mpc_title_color="@color/textColorMaxContrast">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_about">
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_privacy"
@@ -315,21 +326,21 @@
             android:id="@+id/settings_source_code"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            apc:mp_title="@string/nc_get_source_code"></com.yarolegovich.mp.MaterialStandardPreference>
+            apc:mp_title="@string/nc_get_source_code" />
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_licence"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             apc:mp_summary="@string/nc_license_summary"
-            apc:mp_title="@string/nc_license_title"></com.yarolegovich.mp.MaterialStandardPreference>
+            apc:mp_title="@string/nc_license_title" />
 
         <com.yarolegovich.mp.MaterialStandardPreference
             android:id="@+id/settings_version"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             apc:mp_summary="v0.1"
-            apc:mp_title="@string/nc_app_name"></com.yarolegovich.mp.MaterialStandardPreference>
+            apc:mp_title="@string/nc_app_name" />
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 

app/src/main/res/layout/conversation_privacy_toggle.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -19,11 +21,15 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/call_header_layout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/double_margin_between_elements"
+    android:layout_marginStart="@dimen/standard_margin"
+    android:layout_marginTop="@dimen/standard_half_margin"
+    android:layout_marginEnd="@dimen/standard_margin"
+    android:layout_marginBottom="@dimen/standard_half_margin"
     android:orientation="vertical">
 
     <RelativeLayout
@@ -33,13 +39,13 @@
 
         <ImageView
             android:id="@+id/public_call_link"
-            android:layout_width="@dimen/small_item_height"
-            android:layout_height="@dimen/small_item_height"
+            android:layout_width="@dimen/avatar_size"
+            android:layout_height="@dimen/avatar_size"
             android:layout_centerVertical="true"
-            android:layout_marginEnd="8dp"
+            android:layout_marginEnd="@dimen/standard_margin"
             android:contentDescription="@null"
             android:src="@drawable/ic_public_black_24px"
-            android:tint="@color/colorPrimary" />
+            app:tint="@color/colorPrimary" />
 
         <TextView
             android:layout_width="match_parent"
@@ -49,7 +55,7 @@
             android:ellipsize="middle"
             android:singleLine="true"
             android:text="@string/nc_public_call"
-            android:textAppearance="?android:attr/textAppearanceListItem"
+            android:textAppearance="@style/ListItem"
             tools:text="@string/nc_public_call" />
 
     </RelativeLayout>
@@ -60,7 +66,8 @@
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
         android:minHeight="@dimen/small_item_height"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="gone">
 
         <TextView
             android:layout_width="match_parent"

app/src/main/res/layout/dialog_attachment.xml

@@ -21,6 +21,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bg_bottom_sheet"
     android:orientation="vertical"
     android:paddingBottom="8dp">
 

app/src/main/res/layout/join_conversation_via_link.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -19,22 +21,25 @@
   -->
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:id="@+id/joinConversationViaLinkRelativeLayout"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:layout_margin="@dimen/double_margin_between_elements"
+    android:layout_marginStart="@dimen/standard_margin"
+    android:layout_marginTop="@dimen/standard_half_margin"
+    android:layout_marginEnd="@dimen/standard_margin"
+    android:layout_marginBottom="@dimen/standard_half_margin"
     android:orientation="vertical">
 
     <ImageView
         android:id="@+id/joinConversationViaLinkImageView"
-        android:layout_width="@dimen/small_item_height"
-        android:layout_height="@dimen/small_item_height"
+        android:layout_width="@dimen/avatar_size"
+        android:layout_height="@dimen/avatar_size"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/standard_margin"
         android:contentDescription="@null"
         android:src="@drawable/ic_public_black_24px"
-        android:tint="@color/colorPrimary" />
+        app:tint="@color/colorPrimary" />
 
     <TextView
         android:layout_width="match_parent"
@@ -44,7 +49,6 @@
         android:ellipsize="middle"
         android:singleLine="true"
         android:text="@string/nc_join_via_link"
-        android:textAppearance="?android:attr/textAppearanceListItem"
-        tools:text="@string/nc_join_via_link" />
+        android:textAppearance="@style/ListItem" />
 
 </RelativeLayout>

app/src/main/res/layout/notification_settings_item.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -24,13 +26,13 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-
     <com.yarolegovich.mp.MaterialPreferenceCategory
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_notification_settings"
-        apc:mpc_title_color="@color/textColorMaxContrast">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_notification_settings">
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/conversation_info_priority_conversation"
@@ -49,7 +51,7 @@
             apc:mp_entry_values="@array/message_notification_levels_entry_values"
             apc:mp_key="message_notification_level"
             apc:mp_show_value="onBottom"
-            apc:mp_title="@string/nc_plain_old_messages"></com.yarolegovich.mp.MaterialChoicePreference>
+            apc:mp_title="@string/nc_plain_old_messages" />
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/muteCalls"

app/src/main/res/layout/rv_item_contact.xml

@@ -3,8 +3,8 @@
   ~
   ~ @author Mario Danic
   ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger
   ~ Copyright (C) 2017 Mario Danic
-  ~ Copyright (C) 2017 Andy Scherzinger
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -24,8 +24,11 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="@dimen/rv_item_view_height"
-    android:layout_margin="@dimen/margin_between_elements"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/standard_margin"
+    android:layout_marginTop="@dimen/standard_half_margin"
+    android:layout_marginEnd="@dimen/standard_margin"
+    android:layout_marginBottom="@dimen/standard_half_margin"
     android:orientation="vertical">
 
     <ImageView
@@ -34,9 +37,10 @@
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:contentDescription="@string/selected_list_item"
         android:src="@drawable/ic_check_black_24dp"
-        android:tint="@color/colorPrimary"
-        android:visibility="gone" />
+        app:tint="@color/colorPrimary" />
 
     <androidx.emoji.widget.EmojiTextView
         android:id="@+id/name_text"
@@ -46,16 +50,16 @@
         android:layout_toStartOf="@id/checkedImageView"
         android:layout_toEndOf="@id/simple_drawee_view"
         android:ellipsize="end"
+        android:lines="1"
         android:textAppearance="@style/ListItem"
-        tools:text="Contact item text" />
+        tools:text="Jane Doe" />
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/simple_drawee_view"
-        android:layout_width="@dimen/small_item_height"
-        android:layout_height="@dimen/small_item_height"
+        android:layout_width="@dimen/avatar_size"
+        android:layout_height="@dimen/avatar_size"
         android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/double_margin_between_elements"
-        android:layout_marginEnd="@dimen/margin_between_elements"
+        android:layout_marginEnd="@dimen/standard_margin"
         app:roundAsCircle="true" />
 
 </RelativeLayout>

app/src/main/res/layout/rv_item_conversation.xml

@@ -4,7 +4,7 @@
   ~ @author Mario Danic
   ~ @author Andy Scherzinger
   ~ Copyright (C) 2017 Mario Danic
-  ~ Copyright (C) 2017 Andy Scherzinger
+  ~ Copyright (C) 2017-2021 Andy Scherzinger
   ~
   ~ This program is free software: you can redistribute it and/or modify
   ~ it under the terms of the GNU General Public License as published by
@@ -23,9 +23,8 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="64dp"
-    android:layout_margin="8dp">
-
+    android:layout_height="72dp"
+    android:layout_margin="@dimen/standard_margin">
 
     <FrameLayout
         android:id="@+id/frame_layout"
@@ -59,7 +58,7 @@
         android:layout_height="match_parent"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
-        android:layout_marginStart="@dimen/margin_between_elements"
+        android:layout_marginStart="@dimen/standard_margin"
         android:background="?android:attr/selectableItemBackground"
         android:scaleType="center"
         android:src="@drawable/ic_more_horiz_black_24dp" />

app/src/main/res/layout/rv_item_notification_sound.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -20,21 +22,26 @@
 
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
-    android:layout_height="48dp"
-    android:layout_margin="@dimen/double_margin_between_elements"
+    android:layout_height="wrap_content"
+    android:layout_marginStart="@dimen/standard_margin"
+    android:layout_marginTop="@dimen/standard_half_margin"
+    android:layout_marginEnd="@dimen/standard_margin"
+    android:layout_marginBottom="@dimen/standard_half_margin"
     android:animateLayoutChanges="true"
     android:orientation="vertical">
 
-
     <ImageView
         android:id="@+id/checkedImageView"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentEnd="true"
         android:layout_centerVertical="true"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:contentDescription="@string/selected_list_item"
         android:src="@drawable/ic_check_black_24dp"
-        android:tint="@color/colorPrimary" />
+        app:tint="@color/colorPrimary" />
 
     <TextView
         android:id="@+id/notificationNameTextView"
@@ -44,14 +51,16 @@
         android:layout_toStartOf="@id/checkedImageView"
         android:layout_toEndOf="@id/simpleDraweeView"
         android:ellipsize="end"
-        android:textAppearance="?android:attr/textAppearanceListItem" />
+        android:lines="1"
+        android:textAppearance="@style/ListItem"
+        tools:text="Ringy Gone" />
 
     <com.facebook.drawee.view.SimpleDraweeView
         android:id="@+id/simpleDraweeView"
-        android:layout_width="@dimen/small_item_height"
-        android:layout_height="@dimen/small_item_height"
+        android:layout_width="@dimen/avatar_size"
+        android:layout_height="@dimen/avatar_size"
         android:layout_centerVertical="true"
-        android:layout_marginEnd="8dp"
+        android:layout_marginEnd="@dimen/standard_margin"
         app:roundAsCircle="true" />
 
 </RelativeLayout>

app/src/main/res/layout/rv_item_title_header.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -22,17 +24,19 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/bg_default"
     android:orientation="vertical">
 
     <TextView
         android:id="@+id/title_text_view"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginStart="16dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="16dp"
-        android:layout_marginBottom="8dp"
+        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginTop="@dimen/standard_half_margin"
+        android:layout_marginEnd="@dimen/standard_margin"
+        android:layout_marginBottom="@dimen/standard_half_margin"
         android:textColor="@color/colorPrimary"
+        android:textStyle="bold"
         tools:text="A" />
 
     <View

app/src/main/res/layout/user_info_details_table_item.xml

@@ -40,7 +40,7 @@
         android:id="@+id/user_info_edit_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="@dimen/standard_margin"
+        android:layout_marginStart="@dimen/standard_double_margin"
         android:layout_marginEnd="@dimen/standard_margin"
         android:autofillHints="none"
         android:ellipsize="end"

app/src/main/res/layout/webinar_info_item.xml

@@ -2,6 +2,8 @@
   ~ Nextcloud Talk application
   ~
   ~ @author Mario Danic
+  ~ @author Andy Scherzinger
+  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
   ~ Copyright (C) 2017-2019 Mario Danic <mario@lovelyhq.com>
   ~
   ~ This program is free software: you can redistribute it and/or modify
@@ -20,18 +22,19 @@
 
 <com.yarolegovich.mp.MaterialPreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:apc="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/webinar_settings"
     android:layout_width="match_parent"
     android:layout_height="wrap_content">
 
-
     <com.yarolegovich.mp.MaterialPreferenceCategory
         android:id="@+id/conversation_info_webinar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:animateLayoutChanges="true"
-        apc:mpc_title="@string/nc_webinar"
-        apc:mpc_title_color="@color/colorPrimary">
+        apc:cardBackgroundColor="@color/bg_default"
+        apc:cardElevation="0dp"
+        apc:mpc_title="@string/nc_webinar">
 
         <com.yarolegovich.mp.MaterialSwitchPreference
             android:id="@+id/conversation_info_lobby"
@@ -51,7 +54,8 @@
             apc:mp_icon="@drawable/ic_timer_black_24dp"
             apc:mp_icon_tint="@color/grey_600"
             apc:mp_summary="@string/nc_manual"
-            apc:mp_title="@string/nc_start_time" />
+            apc:mp_title="@string/nc_start_time"
+            tools:visibility="visible" />
 
     </com.yarolegovich.mp.MaterialPreferenceCategory>
 

app/src/main/res/values-cs-rCZ/strings.xml

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Smazat konverzaci</string>
     <string name="nc_delete">Smazat</string>
     <string name="nc_delete_conversation_default">Potvrďte, že chcete odebrat tuto konverzaci.</string>
+    <string name="nc_delete_conversation_one2one">Pokud konverzaci smažete, bude také smazána pro %1$s.</string>
     <string name="nc_delete_conversation_more">Pokud konverzaci smažete, bude smazána také pro všechny její ostatní účastníky.</string>
 
     <string name="nc_new_conversation">Nová konverzace</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">Příchozí hovor od</string>
     <string name="nc_nick_guest">Host</string>
     <string name="nc_public_call">Nová veřejná konverzace</string>
+    <string name="nc_public_call_explanation">Veřejné konverzace umožňují zvát osoby zvenčí prostřednictvím k tomu vytvořeného odkazu.</string>
     <string name="nc_call_timeout">Žádná odezva po 45 sekundách, ťukněte, pokud chcete zkusit znovu</string>
     <string name="nc_call_reconnecting">Znovunavazování spojení…</string>
     <string name="nc_offline">Jste bez připojení – zkontrolujte svou konektivitu</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">Ztišit hovory</string>
     <string name="nc_mute_calls_desc">Příchozí hovory budou ztišeny</string>
     <string name="nc_important_conversation">Důležitá konverzace</string>
+    <string name="nc_important_conversation_desc">Upozornění v této konverzaci budou ignorovat režim Nerušit</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Omlouváme se, něco se pokazilo!</string>
+    <string name="nc_failed_signaling_settings">Cílový server nepodporuje připojování se k veřejným konverzacím prostřednictvím mobilních telefonů. Můžete se pokusit připojit ke konverzaci prostřednictvím webového prohlížeče.</string>
     <string name="nc_all_ok_operation">OK, vše hotovo!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Název konverzace</string>
@@ -313,14 +318,47 @@
     <string name="nc_upload_confirm_send_single">Odeslat tento soubor k %1$s?</string>
     <string name="nc_upload_in_progess">nahrávání</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Najít kontakty se stejným telefonním číslem a přidat zkratku Talk do systémové aplikace pro kontakty</string>
+    <string name="nc_settings_phone_book_integration_title">Propojení telefonních čísel</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Telefonní číslo</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Můžete si nastavit své telefonní číslo a tak vás budou moci ostatní uživatelé najít</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Neplatné telefonní číslo</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Nastavení telefonního čísla úspěšné</string>
+    <string name="no_phone_book_integration_due_to_permissions">Není možné propojit telefonní čísla, protože chybí potřebná oprávnění</string>
     <string name="nc_phone_book_integration_chat_via">Rozhovor prostřednictvím %s</string>
     <string name="nc_phone_book_integration_account_not_found">Účet nenalezen</string>
    
+    <string name="avatar">Profilový obrázek</string>
+    <string name="account_icon">Ikona účtu</string>
+    <string name="userinfo_no_info_headline">Osobní údaje nejsou nastaveny</string>
+    <string name="userinfo_no_info_text">Přidejte jméno, obrázek a kontaktní údaje na svou profilovou stránku.</string>
+    <string name="userinfo_error_text">Nepodařilo se získat osobní údaje uživatele.</string>
+    <string name="user_info_phone">Telefonní číslo</string>
+    <string name="user_info_address">Adresa</string>
+    <string name="user_info_website">Webová stránka</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Celé jméno</string>
+    <string name="file_list_folder">složka</string>
+    <string name="file_list_loading">Načítání…</string>
+    <string name="edit">Upravit</string>
+    <string name="save">Uložit</string>
+    <string name="upload_new_avatar_from_device">Nahrát nový profilový obrázek ze zařízení</string>
+    <string name="choose_avatar_from_cloud">Vybrat profilový obrázek z cloudu</string>
+    <string name="delete_avatar">Vymazat profilový obrázek</string>
+    <string name="scope_private_title">Soukromé</string>
+    <string name="scope_private_description">Viditelné pouze lidem, se kterými nalezena shoda začleněním přes telefonní číslo prostřednictvím Talk na mobilním telefonu</string>
+    <string name="lock_symbol">Uzamknout symbol</string>
+    <string name="scope_local_title">Místní</string>
+    <string name="scope_local_description">Viditelné pouze lidem na této instanci a hostům</string>
+    <string name="scope_federated_title">Federované</string>
+    <string name="scope_federated_description">Synchronizovat pouze s důvěryhodnými servery</string>
+    <string name="scope_published_title">Zveřejněno</string>
+    <string name="scope_published_description">Synchronizovat s důvěryhodnými servery a globálním a veřejným adresářem kontaktů</string>
+    <string name="scope_toggle">Přepnout pohled</string>
+    
     <!-- App Bar -->
     <string name="appbar_search_in">Hledat v %s</string>
 
     <string name="nc_action_open_main_menu">Otevřít hlavní nabídku</string>
-    </resources>
+    <string name="failed_to_save">Nepodařilo se uložit %1$s</string>
+</resources>

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

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Unterhaltung löschen</string>
     <string name="nc_delete">Löschen</string>
     <string name="nc_delete_conversation_default">Bitte bestätigen Sie, dass Sie diese Unterhaltung entfernen möchten.</string>
+    <string name="nc_delete_conversation_one2one">Wenn Sie diese Unterhaltung entfernen, so wird diese auch für %1$s entfernt.</string>
     <string name="nc_delete_conversation_more">Wenn Sie diese Unterhaltung löschen, dann wird diese auch für alle anderen Teilnehmer gelöscht.</string>
 
     <string name="nc_new_conversation">Neue Unterhaltung</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">Eingehender Anruf von</string>
     <string name="nc_nick_guest">Gast</string>
     <string name="nc_public_call">Neue öffentliche Unterhaltung</string>
+    <string name="nc_public_call_explanation">Zu öffentlichen Unterhaltungen können Personen über einen speziellen Link eingeladen werden.</string>
     <string name="nc_call_timeout">Keine Antwort nach 45 Sekunden, klicken Sie um es erneut zu versuchen</string>
     <string name="nc_call_reconnecting">Verbinde erneut…</string>
     <string name="nc_offline">Aktuell offline, bitte die Verbindung prüfen</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">Anrufe stummschalten</string>
     <string name="nc_mute_calls_desc">Eingehende Anrufe werden stummgeschaltet</string>
     <string name="nc_important_conversation">Wichtige Unterhaltung</string>
+    <string name="nc_important_conversation_desc">Benachrichtigungen in dieser Unterhaltung überschreiben Nicht-Stören-Einstellungen</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Leider ist etwas schiefgelaufen!</string>
+    <string name="nc_failed_signaling_settings">Der Zielserver erlaubt es nicht öffentlichen Unterhaltungen mit Mobiltelefonen beizutreten. Sie können versuchen der Unterhaltung mit einem Internetbrowser beizutreten.</string>
     <string name="nc_all_ok_operation">OK, alles erledigt!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Name der Unterhaltung</string>
@@ -314,14 +319,47 @@
     <string name="nc_upload_confirm_send_single">Diese Datei an %1$s senden?</string>
     <string name="nc_upload_in_progess">Wird hochgeladen</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Abgleich von Kontakten basierend auf der Telefonnummer zur Integration der Talk-Verknüpfung im Telefonbuch</string>
+    <string name="nc_settings_phone_book_integration_title">Rufnummernintegration</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Telefonnummer</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Sie können Ihre Telefonnummer so einstellen, dass andere Benutzer Sie finden können.</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Ungültige Telefonnummer</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Telefonnummerneingabe erfolgreich</string>
+    <string name="no_phone_book_integration_due_to_permissions">Keine Rufnummernintegration aufgrund fehlender Berechtigungen</string>
     <string name="nc_phone_book_integration_chat_via">Chatten über %s</string>
     <string name="nc_phone_book_integration_account_not_found">Konto nicht gefunden</string>
    
+    <string name="avatar">Avatar</string>
+    <string name="account_icon">Konto-Icon</string>
+    <string name="userinfo_no_info_headline">Keine persönlichen Infos eingestellt</string>
+    <string name="userinfo_no_info_text">Fügen Sie Name, Bild und Kontaktdaten auf Ihrer Profilseite hinzu.</string>
+    <string name="userinfo_error_text">Failed to retrieve personal user information.</string>
+    <string name="user_info_phone">Telefonnummer</string>
+    <string name="user_info_address">Adresse</string>
+    <string name="user_info_website">Internetseite</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Vollständiger Name</string>
+    <string name="file_list_folder">Ordner</string>
+    <string name="file_list_loading">Lade …</string>
+    <string name="edit">Bearbeiten</string>
+    <string name="save">Speichern</string>
+    <string name="upload_new_avatar_from_device">Neuen Avatar vom Gerät hochladen</string>
+    <string name="choose_avatar_from_cloud">Avatar aus der Cloud auswählen</string>
+    <string name="delete_avatar">Avatar löschen</string>
+    <string name="scope_private_title">Privat</string>
+    <string name="scope_private_description">Nur sichtbar für Personen, die über Rufnummernintegration von Talk on mobile abgeglichen wurden.</string>
+    <string name="lock_symbol">Schloss-Symbol</string>
+    <string name="scope_local_title">Lokal</string>
+    <string name="scope_local_description">Nur für Personen dieser Instanz und Gäste sichtbar</string>
+    <string name="scope_federated_title">Federated</string>
+    <string name="scope_federated_description">Nur mit vertrauenswürdigen Servern synchronisieren</string>
+    <string name="scope_published_title">Veröffentlicht</string>
+    <string name="scope_published_description">Mit vertrauenswürdigen Servern und dem globalen sowie öffentlichen Adressbuch synchronisieren</string>
+    <string name="scope_toggle">Bereich umschalten</string>
+    
     <!-- App Bar -->
     <string name="appbar_search_in">Suche in %s</string>
 
     <string name="nc_action_open_main_menu">Hauptmenü öffnen</string>
-    </resources>
+    <string name="failed_to_save">Speichern von %1$s fehlgeschlagen</string>
+</resources>

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

@@ -307,7 +307,32 @@
     <string name="nc_upload_confirm_send_single">Fitxategi hau bidali %1$s(r)i?</string>
     <string name="nc_upload_in_progess">igotzen</string>
 
+    <string name="nc_settings_phone_book_integration_title">Telefono zenbaki integrazioa</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Telefono zenbakia</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Zure telefono zenbakia ezarri dezakezu beste erabiltzaile batzuek aurkitu ahal izateko</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Telefono-zenbaki baliogabea</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Telefono zenbakia ondo ezarri da</string>
+    <string name="avatar">Avatarra</string>
+    <string name="account_icon">Kontuaren ikonoa</string>
+    <string name="userinfo_no_info_headline">Ez da informazio pertsonalik ezarri</string>
+    <string name="userinfo_no_info_text">Gehitu izena, irudia eta kontaktuko xehetasunak zure profilaren orrian</string>
+    <string name="user_info_phone">Telefono zenbakia</string>
+    <string name="user_info_address">Helbidea</string>
+    <string name="user_info_website">Webgunea</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Izen osoa</string>
+    <string name="file_list_folder">karpeta</string>
+    <string name="file_list_loading">Kargatzen…</string>
+    <string name="edit">Editatu</string>
+    <string name="save">Gorde</string>
+    <string name="scope_private_title">Pribatua</string>
+    <string name="scope_local_title">Lokala</string>
+    <string name="scope_local_description">Soilik instantzia honetako erabiltzaile eta gonbidatuentzat ikusgai</string>
+    <string name="scope_federated_title">Federatua</string>
+    <string name="scope_federated_description">Sinkronizatu zerbitzari fidagarriekin soilik</string>
+    <string name="scope_published_title">Argitaratuta</string>
+    <string name="scope_published_description">Sinkronizatu zerbitzari fidagarriekin eta helbide liburu publiko eta globalarekin</string>
+    <!-- App Bar -->
+    <string name="appbar_search_in">Bilatu %s(e)n</string>
+
     </resources>

app/src/main/res/values-hu-rHU/strings.xml

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Beszélgetés törlése</string>
     <string name="nc_delete">Törlés</string>
     <string name="nc_delete_conversation_default">Erősítse meg szándékát, hogy eltávolítja a beszélgetést.</string>
+    <string name="nc_delete_conversation_one2one">Ha törli a beszélgetést, akkor %1$s számára is törölve lesz.</string>
     <string name="nc_delete_conversation_more">Ha törli a beszélgetést, akkor az összes többi résztvevő számára is törölve lesz.</string>
 
     <string name="nc_new_conversation">Új beszélgetés</string>
@@ -165,6 +166,10 @@
     <string name="nc_microphone_permission_permanently_denied">A hanghívás engedélyezéséhez a rendszerbeállításokban meg kell adnia a „Mikrofon” engedélyt.</string>
     <string name="nc_permissions_settings">Beállítások megnyitása</string>
 
+    <!-- Call -->
+    <string name="nc_call_voice">%s hanghívás</string>
+    <string name="nc_call_video">%s videohívás</string>
+    <string name="nc_call_unknown">%s hívás</string>
     <string name="nc_call_incoming">BEJÖVŐ</string>
     <string name="nc_call_ringing">CSENG</string>
     <string name="nc_connecting_call">Kapcsolódás…</string>
@@ -172,6 +177,7 @@
     <string name="nc_incoming_call">Bejövő hívás tőle:</string>
     <string name="nc_nick_guest">Vendég</string>
     <string name="nc_public_call">Új nyilvános beszélgetés</string>
+    <string name="nc_public_call_explanation">A nyilvános beszélgetések lehetővé teszik, hogy egy speciálisan előállított hivatkozással külső embereket hívjon meg.</string>
     <string name="nc_call_timeout">Nincs válasz 45 másodpercen belül, koppintson az újrapróbálkozáshoz</string>
     <string name="nc_call_reconnecting">Újrakapcsolódás…</string>
     <string name="nc_offline">Jelenleg offline, ellenőrizze a kapcsolatát</string>
@@ -190,8 +196,11 @@
     <string name="nc_mute_calls">Hívások némítása</string>
     <string name="nc_mute_calls_desc">A bejövő hívások némítva lesznek</string>
     <string name="nc_important_conversation">Fontos beszélgetés</string>
+    <string name="nc_important_conversation_desc">E beszélgetés értesítései felülírják a Ne zavarjanak beállításokat</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Bocsánat, valami hiba történt!</string>
+    <string name="nc_failed_signaling_settings">A célkiszolgáló nem támogatja a mobiltelefonon történő nyilvános beszélgetéseket. Próbáljon meg webböngészőn keresztül csatlakozni a beszélgetéshez.</string>
     <string name="nc_all_ok_operation">Rendben, minden kész!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Beszélgetésnév</string>
@@ -270,6 +279,8 @@
     <string name="nc_file_browser_back">Vissza</string>
     <string name="nc_file_browser_refresh">Frissítés</string>
     <string name="nc_last_modified">%1$s | Utoljára módosítva: %2$s</string>
+    <string name="nc_file_browser_reshare_forbidden">Nincs jogosultsága ennek a fájlnak az újramegosztására</string>
+
     <!-- Lobby -->
     <string name="nc_webinar">Webinár</string>
     <string name="nc_lobby">Váró</string>
@@ -301,13 +312,54 @@
 
     <!-- Upload -->
     <string name="nc_upload_local_file">Helyi fájl feltöltése</string>
+    <string name="nc_upload_from_cloud">Megosztotta: %s</string>
     <string name="nc_upload_failed">A feltöltés sikertelen</string>
     <string name="nc_upload_choose_local_files">Válasszon fájlokat</string>
     <string name="nc_upload_confirm_send_multiple">Fájlok küldése ide: %1$s</string>
     <string name="nc_upload_confirm_send_single">Ennek a fájlnak küldése ide: %1$s</string>
     <string name="nc_upload_in_progess">feltöltés</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Párosítsa a névjegyeket telefonszám alapján, hogy integrálja a Beszélgetéseket a rendszer Névjegyek alkalmazásba</string>
+    <string name="nc_settings_phone_book_integration_title">Telefonszám integráció</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Telefonszám</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Beállíthatja telefonszámát, hogy a többi felhasználó megtalálja Önt</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">A telefonszám formátuma hibás</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Telefonszám beállítása sikeresen megtörtént</string>
-    </resources>
+    <string name="no_phone_book_integration_due_to_permissions">Nincs telefonszám integráció hiányzó engedélyek miatt</string>
+    <string name="nc_phone_book_integration_chat_via">Csevegés %s segítségével</string>
+    <string name="nc_phone_book_integration_account_not_found">A fiók nem található</string>
+   
+    <string name="avatar">Avatár</string>
+    <string name="account_icon">Fiók ikon</string>
+    <string name="userinfo_no_info_headline">Nincs személyes információ beállítva</string>
+    <string name="userinfo_no_info_text">Adja meg a nevét, profilképét és kapcsolati adatait a profil oldalán.</string>
+    <string name="userinfo_error_text">Nem sikerült beolvasni a személyes felhasználói adatokat.</string>
+    <string name="user_info_phone">Telefonszám</string>
+    <string name="user_info_address">Cím</string>
+    <string name="user_info_website">Weboldal</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Teljes név</string>
+    <string name="file_list_folder">mappa</string>
+    <string name="file_list_loading">Betöltés…</string>
+    <string name="edit">Szerkesztés</string>
+    <string name="save">Mentés</string>
+    <string name="upload_new_avatar_from_device">Töltsön fel új avatart az eszközről</string>
+    <string name="choose_avatar_from_cloud">Válassza ki az avatart a felhőből</string>
+    <string name="delete_avatar">Avatár törlése</string>
+    <string name="scope_private_title">Privát</string>
+    <string name="scope_private_description">Csak azok láthatják, akiknek a mobileszközön keresztül történő telefonszám integrációja történt</string>
+    <string name="lock_symbol">Zár szimbólum</string>
+    <string name="scope_local_title">Helyi</string>
+    <string name="scope_local_description">Csak az ilyen példányban lévő személyek és a vendégek láthatják</string>
+    <string name="scope_federated_title">Egyesített</string>
+    <string name="scope_federated_description">Csak megbízható kiszolgálókkal szinkronizáljon</string>
+    <string name="scope_published_title">Közzétett</string>
+    <string name="scope_published_description">Szinkronizáljon megbízható kiszolgálókkal, valamint a globális és nyilvános címjegyzékkel</string>
+    <string name="scope_toggle">Hatókör váltása</string>
+    
+    <!-- App Bar -->
+    <string name="appbar_search_in">Keresés itt: %s</string>
+
+    <string name="nc_action_open_main_menu">Főmenü megnyitása</string>
+    <string name="failed_to_save">Sikertelen mentés: %1$s</string>
+</resources>

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

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Elimina conversazione</string>
     <string name="nc_delete">Elimina</string>
     <string name="nc_delete_conversation_default">Conferma la tua intenzione di rimuovere la conversazione.</string>
+    <string name="nc_delete_conversation_one2one">Se elimini la conversazione, sarà eliminata anche per %1$s.</string>
     <string name="nc_delete_conversation_more">Se elimini la conversazione, sarà eliminata anche per tutti i partecipanti.</string>
 
     <string name="nc_new_conversation">Nuova conversazione</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">Chiamata in ingresso da</string>
     <string name="nc_nick_guest">Ospite</string>
     <string name="nc_public_call">Nuova conversazione pubblica</string>
+    <string name="nc_public_call_explanation">Le conversazioni pubbliche ti consentono di invitare persone esterne tramite un collegamento appositamente generato.</string>
     <string name="nc_call_timeout">Nessuna risposta in 45 secondi, tocca per provare ancora</string>
     <string name="nc_call_reconnecting">Riconnessione in corso...</string>
     <string name="nc_offline">Attualmente non in linea, controlla la tua connettività</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">Silenzia le chiamate</string>
     <string name="nc_mute_calls_desc">Le chiamate in ingresso saranno silenziate</string>
     <string name="nc_important_conversation">Conversazione importante</string>
+    <string name="nc_important_conversation_desc">Le notifiche in questa conversazione ignoreranno l\'impostazione Non disturbare</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Spiacenti, qualcosa non ha funzionato!</string>
+    <string name="nc_failed_signaling_settings">Il server di destinazione non supporta la partecipazione a stanze pubbliche tramite cellulare. Puoi provare a unirti alla conversazioni tramite un browser web.</string>
     <string name="nc_all_ok_operation">OK, tutto fatto!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Nome della conversazione</string>
@@ -314,14 +319,47 @@
     <string name="nc_upload_confirm_send_single">Inviare questo file a %1$s?</string>
     <string name="nc_upload_in_progess">caricamento</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Verifica i contatti in base al numero di telefono per integrare il collegamento di Talk nell\'app contatti di sistema</string>
+    <string name="nc_settings_phone_book_integration_title">Integrazione numero di telefono</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Numero di telefono</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Puoi impostare il tuo numero di telefono in modo che gli altri utenti ti trovino</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Numero di telefono non valido</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Numero di telefono impostato correttamente</string>
+    <string name="no_phone_book_integration_due_to_permissions">Nessuna integrazione del numero di telefono a causa di autorizzazioni mancanti</string>
     <string name="nc_phone_book_integration_chat_via">Chat tramite %s</string>
     <string name="nc_phone_book_integration_account_not_found">Account non trovato</string>
    
+    <string name="avatar">Avatar</string>
+    <string name="account_icon">Icona dell\'account</string>
+    <string name="userinfo_no_info_headline">Nessuna informazione personale impostata</string>
+    <string name="userinfo_no_info_text">Aggiungi nome, immagine e dettagli di contatto sulla tua pagina di profilo.</string>
+    <string name="userinfo_error_text">Impossibile ottenere le informazioni personali dell\'utente.</string>
+    <string name="user_info_phone">Numero di telefono</string>
+    <string name="user_info_address">Indirizzo</string>
+    <string name="user_info_website">Sito web</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Nome completo</string>
+    <string name="file_list_folder">cartella</string>
+    <string name="file_list_loading">Caricamento...</string>
+    <string name="edit">Modifica</string>
+    <string name="save">Salva</string>
+    <string name="upload_new_avatar_from_device">Carica nuovo avatar dal dispositivo</string>
+    <string name="choose_avatar_from_cloud">Scegli avatar dalla rete</string>
+    <string name="delete_avatar">Elimina avatar</string>
+    <string name="scope_private_title">Privato</string>
+    <string name="scope_private_description">Visibile solo alle persone trovate con l\'integrazione del numero di telefono via Talk su mobile</string>
+    <string name="lock_symbol">Simbolo lucchetto</string>
+    <string name="scope_local_title">Locale</string>
+    <string name="scope_local_description">Visibile solo alle persone in questa istanza e agli ospiti</string>
+    <string name="scope_federated_title">Federato</string>
+    <string name="scope_federated_description">Sincronizza solo con server fidati</string>
+    <string name="scope_published_title">Pubblicato</string>
+    <string name="scope_published_description">Sincronizza con server fidati e la rubrica globale e pubblica</string>
+    <string name="scope_toggle">Cambio di ambito</string>
+    
     <!-- App Bar -->
     <string name="appbar_search_in">Cerca in %s</string>
 
     <string name="nc_action_open_main_menu">Apri menu principale</string>
-    </resources>
+    <string name="failed_to_save">Salvataggio di %1$s fallito</string>
+</resources>

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

@@ -84,7 +84,7 @@
     <string name="nc_settings_other_notifications_ringtone">Powiadomienia</string>
     <string name="nc_settings_no_ringtone">Bez dźwięku</string>
     <string name="nc_settings_vibrate">Wibracja</string>
-    <string name="nc_settings_vibrate_desc">Telefon będzie wibrować, pod warunkiem że nie zostanie wyciszony</string>
+    <string name="nc_settings_vibrate_desc">Telefon będzie wibrować pod warunkiem, że nie zostanie wyciszony</string>
     <string name="nc_settings_appearance">Wygląd</string>
     <string name="nc_settings_theme_title">Motyw</string>
     <string name="nc_settings_theme_key">motyw</string>
@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Usuń rozmowę</string>
     <string name="nc_delete">Usuń</string>
     <string name="nc_delete_conversation_default">Potwierdź zamiar usunięcia rozmowy.</string>
+    <string name="nc_delete_conversation_one2one">Jeśli usuniesz rozmowę, zostanie ona również usunięta dla %1$s.</string>
     <string name="nc_delete_conversation_more">Jeśli usuniesz rozmowę, zostanie ona również usunięta dla wszystkich pozostałych uczestników.</string>
 
     <string name="nc_new_conversation">Nowa rozmowa</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">Połączenie przychodzące od </string>
     <string name="nc_nick_guest">Gość</string>
     <string name="nc_public_call">Nowa rozmowa publiczna</string>
+    <string name="nc_public_call_explanation">Rozmowy publiczne pozwalają zapraszać ludzi z zewnątrz poprzez specjalnie przygotowany link.</string>
     <string name="nc_call_timeout">Brak odpowiedzi przez 45 sekund, stuknij aby spróbować ponownie</string>
     <string name="nc_call_reconnecting">Ponowne łączenie…</string>
     <string name="nc_offline">Obecnie jesteś w offline, sprawdź swoją łączność</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">Wycisz połączenia</string>
     <string name="nc_mute_calls_desc">Połączenia przychodzące zostaną wyciszone</string>
     <string name="nc_important_conversation">Ważna rozmowa</string>
+    <string name="nc_important_conversation_desc">Powiadomienia w tej rozmowie ignorują ustawienia \"Nie przeszkadzać\"</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Przepraszamy, coś poszło nie tak!</string>
+    <string name="nc_failed_signaling_settings">Serwer docelowy nie obsługuje połączeń dla rozmów publicznych przez telefony komórkowe. Możesz spróbować dołączyć do rozmowy przez przeglądarkę internetową.</string>
     <string name="nc_all_ok_operation">OK, wszystko gotowe!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Nazwa rozmowy</string>
@@ -314,14 +319,47 @@
     <string name="nc_upload_confirm_send_single">Wysłać ten plik do %1$s?</string>
     <string name="nc_upload_in_progess">wysyłanie</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Dopasuj kontakty na podstawie numeru telefonu, aby zintegrować skrót Talk z aplikacją kontaktów systemowych</string>
+    <string name="nc_settings_phone_book_integration_title">Integracja numeru telefonu</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Numer telefonu</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Możesz ustawić numer telefonu, inni użytkownicy będą mogli go znaleźć</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Nieprawidłowy numer telefonu</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Numer telefonu ustawiony pomyślnie</string>
+    <string name="no_phone_book_integration_due_to_permissions">Brak integracji numeru telefonu z powodu braku uprawnień</string>
     <string name="nc_phone_book_integration_chat_via">Rozmawiaj przez %s</string>
     <string name="nc_phone_book_integration_account_not_found">Nie znaleziono konta</string>
    
+    <string name="avatar">Awatar</string>
+    <string name="account_icon">Ikona konta</string>
+    <string name="userinfo_no_info_headline">Brak informacji osobistych</string>
+    <string name="userinfo_no_info_text">Dodaj nazwę, zdjęcie profilowe i dane kontaktowe do swojego profilu.</string>
+    <string name="userinfo_error_text">Nie udało się pobrać osobistych informacji o użytkowniku.</string>
+    <string name="user_info_phone">Numer telefonu</string>
+    <string name="user_info_address">Adres</string>
+    <string name="user_info_website">Strona WWW</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Pełna nazwa</string>
+    <string name="file_list_folder">katalog</string>
+    <string name="file_list_loading">Ładowanie…</string>
+    <string name="edit">Edytuj</string>
+    <string name="save">Zapisz</string>
+    <string name="upload_new_avatar_from_device">Wyślij nowy awatar z urządzenia</string>
+    <string name="choose_avatar_from_cloud">Wybierz awatar z chmury</string>
+    <string name="delete_avatar">Usuń awatar</string>
+    <string name="scope_private_title">Prywatne</string>
+    <string name="scope_private_description">Widoczne tylko dla osób dopasowanych poprzez integrację numeru telefonu za pomocą Talk na telefonie komórkowym</string>
+    <string name="lock_symbol">Symbol zamknięcia</string>
+    <string name="scope_local_title">Lokalne</string>
+    <string name="scope_local_description">Widoczne tylko dla osób w tej instancji i gości</string>
+    <string name="scope_federated_title">Sfederowane</string>
+    <string name="scope_federated_description">Synchronizuj tylko z zaufanymi serwerami</string>
+    <string name="scope_published_title">Opublikowane</string>
+    <string name="scope_published_description">Synchronizuj z zaufanymi serwerami oraz globalną i publiczną książką adresową</string>
+    <string name="scope_toggle">Przełącznik zakresu</string>
+    
     <!-- App Bar -->
     <string name="appbar_search_in">Szukaj w %s</string>
 
     <string name="nc_action_open_main_menu">Otwórz menu główne</string>
-    </resources>
+    <string name="failed_to_save">Nie udało się zapisać %1$s</string>
+</resources>

app/src/main/res/values-pt-rBR/strings.xml

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Excluir conversa</string>
     <string name="nc_delete">Excluir</string>
     <string name="nc_delete_conversation_default">Confirme sua intensão de remover a conversa.</string>
+    <string name="nc_delete_conversation_one2one">Se você excluir a conversa, ela também será excluída por %1$s.</string>
     <string name="nc_delete_conversation_more">Se você excluir a conversa, ela também será excluída para todos os outros participantes.</string>
 
     <string name="nc_new_conversation">Nova conversa</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">Chamada de</string>
     <string name="nc_nick_guest">Convidado</string>
     <string name="nc_public_call">Nova conversa pública</string>
+    <string name="nc_public_call_explanation">As conversas públicas permitem que você convide pessoas de fora por meio de um link especialmente criado.</string>
     <string name="nc_call_timeout">45 segundos sem resposta, toque para retentar</string>
     <string name="nc_call_reconnecting">Reconectando...</string>
     <string name="nc_offline">Offline no momento, cheque sua conectividade</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">Silenciar chamadas</string>
     <string name="nc_mute_calls_desc">Chamadas recebidas serão silenciadas</string>
     <string name="nc_important_conversation">Conversa importante</string>
+    <string name="nc_important_conversation_desc">As notificações nesta conversa substituirão as configurações de Não perturbe</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Desculpe, alguma coisa deu errada!</string>
+    <string name="nc_failed_signaling_settings">O servidor de destino não oferece suporte para ingressar em conversas públicas por meio de telefones celulares. Você pode tentar entrar na conversa por meio do navegador da web.</string>
     <string name="nc_all_ok_operation">OK, tudo pronto!</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">Nome de conversação</string>
@@ -314,14 +319,47 @@
     <string name="nc_upload_confirm_send_single">Enviar este arquivo para %1$s?</string>
     <string name="nc_upload_in_progess">enviando</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Combine os contatos com base no número de telefone para integrar o atalho do Bate Papo no aplicativo de contatos do sistema</string>
+    <string name="nc_settings_phone_book_integration_title">Integração de número de telefone</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Número do telefone</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Você pode definir seu número de telefone para que outros usuários possam encontrar você</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Número de telefone inválido</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Número de telefone definido com sucesso</string>
+    <string name="no_phone_book_integration_due_to_permissions">Sem integração de número de telefone devido à falta de permissões</string>
     <string name="nc_phone_book_integration_chat_via">Bate-papo via %s</string>
     <string name="nc_phone_book_integration_account_not_found">Conta não encontrada</string>
    
+    <string name="avatar">Avatar</string>
+    <string name="account_icon">Ícone de conta</string>
+    <string name="userinfo_no_info_headline">Nenhuma informação pessoal definida</string>
+    <string name="userinfo_no_info_text">Adicione nome, foto e detalhes de contato em sua página de perfil.</string>
+    <string name="userinfo_error_text">Falha ao recuperar informações pessoais do usuário.</string>
+    <string name="user_info_phone">Número do Telefone</string>
+    <string name="user_info_address">Endereço</string>
+    <string name="user_info_website">Website</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Nome completo</string>
+    <string name="file_list_folder">pasta</string>
+    <string name="file_list_loading">Carregando...</string>
+    <string name="edit">Editar</string>
+    <string name="save">Salvar</string>
+    <string name="upload_new_avatar_from_device">Carregar novo avatar do dispositivo</string>
+    <string name="choose_avatar_from_cloud">Escolha o avatar da nuvem</string>
+    <string name="delete_avatar">Excluir avatar</string>
+    <string name="scope_private_title">Privado</string>
+    <string name="scope_private_description">Visível apenas para pessoas que se correspondem por integração do número de telefone por meio do Bate Papo no celular</string>
+    <string name="lock_symbol">Símbolo de cadeado</string>
+    <string name="scope_local_title">Local</string>
+    <string name="scope_local_description">Visível apenas para pessoas nesta instância e convidados</string>
+    <string name="scope_federated_title">Federada</string>
+    <string name="scope_federated_description">Sincronizar apenas com servidores confiáveis </string>
+    <string name="scope_published_title">Publicado</string>
+    <string name="scope_published_description">Sincronize com servidores confiáveis ​​e com o catálogo de endereço público e global</string>
+    <string name="scope_toggle">Alternância de escopo</string>
+    
     <!-- App Bar -->
     <string name="appbar_search_in">Procurar em 1%s</string>
 
     <string name="nc_action_open_main_menu">Abrir menu principal</string>
-    </resources>
+    <string name="failed_to_save">Falha ao salvar %1$s</string>
+</resources>

app/src/main/res/values-pt-rPT/strings.xml

@@ -1,189 +0,0 @@
-<!--
-  ~ Nextcloud Talk application
-  ~
-  ~ @author Mario Danic
-  ~ @author Andy Scherzinger
-  ~ Copyright (C) 2021 Andy Scherzinger <info@andy-scherzinger.de>
-  ~ Copyright (C) 2017-2018 Mario Danic <mario@lovelyhq.com>
-  ~
-  ~ This program is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by
-  ~ the Free Software Foundation, either version 3 of the License, or
-  ~ at your option) any later version.
-  ~
-  ~ 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 xmlns:tools="http://schemas.android.com/tools">
-    <!-- Common -->
-    <string name="nc_yes">Sim</string>
-    <string name="nc_no">Não</string>
-    <!-- Bottom Navigation -->
-    <string name="nc_settings">Definições</string>
-
-    <!-- Server selection -->
-    <string name="nc_server_url">Endereço do servidor</string>
-    <string name="nc_server_import_account_plain">Importar conta</string>
-    <string name="nc_server_import_accounts_plain">Importar contas</string>
-    <string name="nc_server_import_account">Importar conta da aplicação %1$s</string>
-    <string name="nc_server_import_accounts">Importar contas da aplicação %1$s</string>
-    <string name="nc_server_failed_to_import_account">Não foi possível importar a conta selecionada</string>
-    <string name="nc_get_from_provider">Ainda não tem um servidor?\nClique aqui para obter um de um fornecedor</string>
-
-    <!-- Account verification -->
-    <string name="nc_push_disabled">Notificações \"push\" desativadas</string>
-    <string name="nc_capabilities_failed">Não foi possível obter as capacidades, a abortar</string>
-    <string name="nc_display_name_not_fetched">Não foi possível obter o nome a exibir, a abortar</string>
-    <string name="nc_nextcloud_talk_app_not_installed">Aplicação %1$s não instalada no servidor, a abortar</string>
-    <string name="nc_display_name_not_stored">Não foi possível guardar o nome a exibir, a abortar</string>
-
-    <string name="nc_never">Nunca aderiu</string>
-    <string name="nc_search">Pesquisar</string>
-
-    <string name="nc_certificate_dialog_title">Confira o certificado</string>
-    <string name="nc_certificate_error">A sua configuração de SSL impediu a ligação</string>
-
-    <!-- Settings -->
-    <string name="nc_settings_proxy_title">Proxy</string>
-    <string name="nc_settings_proxy_type_title">Tipo de proxy</string>
-    <string name="nc_settings_proxy_host_title">Anfitrião de proxy</string>
-    <string name="nc_settings_proxy_port_title">Porta do proxy</string>
-    <string name="nc_settings_use_credentials_title">Usar credenciais</string>
-    <string name="nc_settings_switch_account">Mudar entre contas</string>
-    <string name="nc_settings_reauthorize">Voltar a autorizar</string>
-    <string name="nc_client_cert_setup">Configurar certificado de cliente</string>
-    <string name="nc_client_cert_change">Alterar certificado de cliente</string>
-    <string name="nc_settings_remove">Remover</string>
-    <string name="nc_settings_remove_account">Remover conta</string>
-    <string name="nc_settings_add_account">Adicionar uma nova conta</string>
-    <string name="nc_add">Adicionar</string>
-    <string name="nc_settings_no_ringtone">Sem som</string>
-    <string name="nc_settings_theme_title">Tema</string>
-    <string name="nc_settings_theme_light">Claro</string>
-    <string name="nc_settings_theme_dark">Escuro</string>
-    <string name="nc_settings_screen_lock_title">Bloqueio de ecrã</string>
-    <string name="nc_none">Nenhum</string>
-    <string name="nc_settings_screen_security_title">Segurança de ecrã</string>
-    <string name="nc_settings_incognito_keyboard_title">Teclado incógnito</string>
-    <string name="nc_screen_lock_timeout_30">30 segundos</string>
-    <string name="nc_screen_lock_timeout_60">1 minuto</string>
-    <string name="nc_screen_lock_timeout_300">5 minutos</string>
-    <string name="nc_screen_lock_timeout_600">10 minutos</string>
-    <string name="nc_screen_lock_timeout_thirty">30</string>
-    <string name="nc_screen_lock_timeout_sixty">60</string>
-    <string name="nc_screen_lock_timeout_three_hundred">300</string>
-    <string name="nc_screen_lock_timeout_six_hundred">600</string>
-
-    <string name="nc_biometric_unlock">Desbloquear %1$s</string>
-    <string name="nc_cancel">Cancelar</string>
-
-    <string name="nc_no_proxy">Sem proxy</string>
-    <string name="nc_username">Nome de utilizador</string>
-    <string name="nc_password">Palavra-passe</string>
-    <string name="nc_conversation_link">Hiperligação de conversação</string>
-    <string name="nc_new_password">Nova palavra-passe</string>
-    <string name="nc_wrong_password">Palavra-passe errada</string>
-    <string name="nc_about">Sobre</string>
-    <string name="nc_privacy">Privacidade</string>
-    <string name="nc_get_source_code">Obter código fonte</string>
-    <string name="nc_license_title">Licença</string>
-    <string name="nc_license_summary">GNU - Licença Pública Geral, Versão 3</string>
-
-    <string name="nc_select_an_account">Selecionar uma conta</string>
-
-    <!-- Conversation menu -->
-    <string name="nc_start_conversation">Iniciar uma conversação</string>
-    <string name="nc_configure_room">Configurar conversação</string>
-    <string name="nc_leave">Sair da conversação</string>
-    <string name="nc_rename">Renomear conversação</string>
-    <string name="nc_set_password">Definir uma palavra-passe</string>
-    <string name="nc_change_password">Alterar palavra-passe</string>
-    <string name="nc_clear_password">Limpar palavra-passe</string>
-    <string name="nc_share_link">Partilhar hiperligação</string>
-    <string name="nc_share_link_via">Partilhar hiperligação via</string>
-    <string name="nc_delete_call">Eliminar conversação</string>
-    <string name="nc_delete">Eliminar</string>
-    <string name="nc_new_conversation">Nova conversação</string>
-    <string name="nc_join_via_web">Aderir via Web</string>
-    <string name="nc_add_to_favorites">Adicionar aos favoritos</string>
-    <string name="nc_remove_from_favorites">Remover dos favoritos</string>
-
-    <string name="nc_contacts_done">Concluir </string>
-
-    <string name="nc_permissions_settings">Abrir definições</string>
-
-    <string name="nc_connecting_call">A ligar...</string>
-    <string name="nc_incoming_call">Chamada a receber de</string>
-    <string name="nc_nick_guest">Convidado</string>
-    <string name="nc_public_call">Nova conversação pública</string>
-    <string name="nc_notification_channel_calls">Canal de notificação de chamadas</string>
-    <string name="nc_notification_channel_messages">Canal de notificação de mensagens</string>
-    <string name="nc_notification_channel_calls_description">Mostra as chamadas a receber</string>
-    <string name="nc_notification_settings">Definições de notificação</string>
-    <string name="nc_plain_old_messages">Mensagens</string>
-    <string name="nc_notify_me_always">Notificar sempre</string>
-    <string name="nc_notify_me_mention">Notificar quando mencionado</string>
-    <string name="nc_notify_me_never">Nunca notificar</string>
-    <string name="nc_mute_calls">Silenciar chamadas</string>
-    <!-- Bottom sheet menu -->
-    <string name="nc_failed_to_perform_operation">Desculpe, ocorreu algo de errado!</string>
-    <string name="nc_all_ok_operation">Ok, tudo concluído!</string>
-    <string name="nc_ok">ACEITAR</string>
-    <string name="nc_call_name">Nome da conversação</string>
-    <string name="nc_proceed">Prosseguir</string>
-    <string name="nc_call_name_is_same">O nome que inseriu é o mesmo que o existente</string>
-    <string name="nc_wrong_link">A hiperligação de conversação não é válida</string>
-    <string name="nc_share_text">Junte-se à conversação em %1$s/index.php/call/%2$s</string>
-    <string name="nc_share_subject">%1$s convite</string>
-    <string name="nc_share_text_pass">\nPalavra-passe: %1$s</string>
-
-    <string name="nc_configure_cert_auth">Selecionar certificado de autenticação</string>
-    <string name="nc_change_cert_auth">Alterar certificado de autenticação</string>
-
-    <!-- Moderation -->
-    <string name="nc_demote">Relegar de moderador</string>
-    <string name="nc_promote">Promover a moderador</string>
-    <string name="nc_remove_participant">Remover participante</string>
-
-    <!-- Chat -->
-    <string name="nc_hint_enter_a_message">Insira uma mensagem...</string>
-    <string name="nc_date_header_yesterday">Ontem</string>
-    <string name="nc_date_header_today">Hoje</string>
-    <string name="nc_conversation_menu_voice_call">Chamada de voz</string>
-    <string name="nc_conversation_menu_video_call">Chamada de vídeo</string>
-    <string name="nc_conversation_menu_conversation_info">Informação da conversação</string>
-    <string name="nc_no_messages_yet">Ainda sem mensagens</string>
-    <!-- When translating to German, please use non-formal variant -->
-    <string name="nc_formatted_message_you">Eu: %1$s</string>
-
-    <string name="nc_endless_cancel">Cancelado pelo utilizador.</string>
-    <string name="nc_description_send_message_button">Enviar mensagem</string>
-
-    <string name="nc_hello">Olá</string>
-
-    <string name="nc_groups">Grupos</string>
-    <string name="nc_participants">Participantes</string>
-
-    <string name="nc_owner">Proprietário</string>
-    <string name="nc_moderator">Moderador</string>
-    <string name="nc_user">Utilizador</string>
-    <string name="nc_guest">Convidado</string>
-    <string name="nc_following_link">Utilizador a seguir uma hiperligação pública</string>
-
-    <!-- Browser component -->
-    <string name="nc_file_browser">Navegador de ficheiro\"</string>
-    <string name="nc_select_files">Selecionar ficheiros</string>
-    <string name="nc_file_browser_back">Anterior</string>
-    <string name="nc_file_browser_refresh">Atualizar</string>
-    <string name="nc_last_modified">%1$s | Última modificação: %2$s</string>
-    <string name="nc_not_defined_error">Erro desconhecido</string>
-    <string name="nc_general_settings">Geral</string>
-    <string name="nc_copy_message">Copiar</string>
-    <string name="nc_reply">Resposta</string>
-    </resources>

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

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">Görüşmeyi sil</string>
     <string name="nc_delete">Sil</string>
     <string name="nc_delete_conversation_default">Lütfen görüşmeyi silmek istediğinizi onaylayın.</string>
+    <string name="nc_delete_conversation_one2one">Görüşmeyi silerseniz %1$s için de silinecek.</string>
     <string name="nc_delete_conversation_more">Görüşmeyi silerseniz tüm diğer katılımcılar için de silinecek.</string>
 
     <string name="nc_new_conversation">Yeni görüşme</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">Gelen görüşme çağrısı</string>
     <string name="nc_nick_guest">Konuk</string>
     <string name="nc_public_call">Herkese açık görüşme ekle</string>
+    <string name="nc_public_call_explanation">Herkese açık görüşmelere dışarıdan kişiler özel oluşturulmuş bir bağlantı ile katılabilir.</string>
     <string name="nc_call_timeout">45 saniye içinde yanıt alınamadı, yeniden denemek için dokunun</string>
     <string name="nc_call_reconnecting">Bağlantı yeniden kuruluyor …</string>
     <string name="nc_offline">Şu anda çevrimdışı, lütfen bağlantınızı denetleyin</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">Bildirimleri kapat</string>
     <string name="nc_mute_calls_desc">Gelen çağrılar sessize alınacak</string>
     <string name="nc_important_conversation">Önemli görüşme</string>
+    <string name="nc_important_conversation_desc">Bu görüşmedeki bildirimler Rahatsız Etmeyin ayarlarını değiştirecek</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">Maalesef bir şeyler ters gitti!</string>
+    <string name="nc_failed_signaling_settings">Hedef sunucu cep telefonları üzerinden herkese açık görüşmelere katılmayı desteklemiyor. Görüşmeye web tarayıcı kullanarak katılmayı deneyebilirsiniz.</string>
     <string name="nc_all_ok_operation">Hepsi tamam!</string>
     <string name="nc_ok">Tamam</string>
     <string name="nc_call_name">Görüşme adı</string>
@@ -274,6 +279,8 @@
     <string name="nc_file_browser_back">Geri</string>
     <string name="nc_file_browser_refresh">Yenile</string>
     <string name="nc_last_modified">%1$s | Son değişiklik: %2$s</string>
+    <string name="nc_file_browser_reshare_forbidden">Bu dosyayı paylaşma izniniz yok</string>
+
     <!-- Lobby -->
     <string name="nc_webinar">Web sunumu</string>
     <string name="nc_lobby">Giriş</string>
@@ -305,16 +312,54 @@
 
     <!-- Upload -->
     <string name="nc_upload_local_file">Yerel dosya yükle</string>
+    <string name="nc_upload_from_cloud">%1$s üzerinden paylaş</string>
     <string name="nc_upload_failed">Yüklenemedi</string>
     <string name="nc_upload_choose_local_files">Dosyaları seçin</string>
     <string name="nc_upload_confirm_send_multiple">Bu dosyalar %1$s alıcısına gönderilsin mi?</string>
     <string name="nc_upload_confirm_send_single">Bu dosya %1$s alıcısına gönderilsin mi?</string>
     <string name="nc_upload_in_progess">yükleniyor</string>
 
+    <string name="nc_settings_phone_book_integration_desc">Kişileri telefon numaralarına göre eşleştirerek sistem kişiler uygulamasında Talk kısa yolunu görüntüler</string>
+    <string name="nc_settings_phone_book_integration_title">Telefon numarası bütünleştirmesi</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">Telefon numarası</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">Telefon numaranızı ayarlayarak diğer kullanıcıların sizi bulmasını sağlayabilirsiniz</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">Telefon numarası geçersiz</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">Telefon numarası ayarlandı</string>
+    <string name="no_phone_book_integration_due_to_permissions">İzinler eksik olduğundan telefon numarası bütünleştirmesi yok</string>
     <string name="nc_phone_book_integration_chat_via">%s ile sohbet</string>
     <string name="nc_phone_book_integration_account_not_found">Hesap bulunamadı</string>
    
-    </resources>
+    <string name="avatar">Avatar</string>
+    <string name="account_icon">Hesap simgesi</string>
+    <string name="userinfo_no_info_headline">Herhangi bir kişisel bilgi ayarlanmamış</string>
+    <string name="userinfo_no_info_text">Profil sayfanızdan ad, görsel ve iletişim bilgilerinizi ekleyin.</string>
+    <string name="userinfo_error_text">Kullanıcının kişisel bilgileri alınamadı</string>
+    <string name="user_info_phone">Telefon numarası</string>
+    <string name="user_info_address">Adres</string>
+    <string name="user_info_website">Web sitesi</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">Tam ad</string>
+    <string name="file_list_folder">klasör</string>
+    <string name="file_list_loading">Yükleniyor…</string>
+    <string name="edit">Düzenle</string>
+    <string name="save">Kaydet</string>
+    <string name="upload_new_avatar_from_device">Aygıttan yeni avatar yükle</string>
+    <string name="choose_avatar_from_cloud">Buluttan avatar seç</string>
+    <string name="delete_avatar">Avatarı sil</string>
+    <string name="scope_private_title">Kişisel</string>
+    <string name="scope_private_description">Yalnız mobil aygıt üzerinde Talk telefon numarası bütünleştirmesi ile eşleşen kişiler görebilir</string>
+    <string name="lock_symbol">Kilit simgesi</string>
+    <string name="scope_local_title">Yerel</string>
+    <string name="scope_local_description">Yalnız bu kopyadaki kişiler ve konuklar görebilir</string>
+    <string name="scope_federated_title">Birleşmiş</string>
+    <string name="scope_federated_description">Yalnız güvenilen sunucular ile eşitlensin</string>
+    <string name="scope_published_title">Yayınlanmış</string>
+    <string name="scope_published_description">Genel ve herkese açık adres defteri ile ve güvenilen sunucularla eşitlensin</string>
+    <string name="scope_toggle">Ölçeği değiştir</string>
+    
+    <!-- App Bar -->
+    <string name="appbar_search_in">%s içinde arama</string>
+
+    <string name="nc_action_open_main_menu">Ana menüyü aç</string>
+    <string name="failed_to_save">%1$s kaydedilemedi</string>
+</resources>

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

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">删除会话</string>
     <string name="nc_delete">删除</string>
     <string name="nc_delete_conversation_default">请确认你移除此会话的意图</string>
+    <string name="nc_delete_conversation_one2one">如果你删除了会话，它也会从%1$s 处被删除。</string>
     <string name="nc_delete_conversation_more">如果你删除了该会话，它也会被从其他所有与会者那里删除。</string>
 
     <string name="nc_new_conversation">新的会话</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">来电</string>
     <string name="nc_nick_guest">来宾</string>
     <string name="nc_public_call">新的公共会话</string>
+    <string name="nc_public_call_explanation">公共对话可以让你通过一个特别制作的链接邀请外面的人。</string>
     <string name="nc_call_timeout">45秒内无响应，点击以重试</string>
     <string name="nc_call_reconnecting">重新连接 ...</string>
     <string name="nc_offline">当前离线，请检查您的连接</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">通话静音</string>
     <string name="nc_mute_calls_desc">来电将被静音</string>
     <string name="nc_important_conversation">重要会话</string>
+    <string name="nc_important_conversation_desc">此会话中的通知将覆盖免打扰设置</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">抱歉，有地方出错了！</string>
+    <string name="nc_failed_signaling_settings">目标服务器不支持通过移动电话加入公共对话。你可以尝试通过浏览器加入对话。</string>
     <string name="nc_all_ok_operation">OK，已完成！</string>
     <string name="nc_ok">OK</string>
     <string name="nc_call_name">会话名称</string>
@@ -275,6 +280,8 @@
     <string name="nc_file_browser_back">返回</string>
     <string name="nc_file_browser_refresh">刷新</string>
     <string name="nc_last_modified">%1$s 我上一次更改： %2$s</string>
+    <string name="nc_file_browser_reshare_forbidden">你不被允许重新共享此文件</string>
+
     <!-- Lobby -->
     <string name="nc_webinar">网络研讨会</string>
     <string name="nc_lobby">休息室</string>
@@ -306,16 +313,54 @@
 
     <!-- Upload -->
     <string name="nc_upload_local_file">上传本地文件</string>
+    <string name="nc_upload_from_cloud">分享来源：%1$s</string>
     <string name="nc_upload_failed">抱歉，上传失败</string>
     <string name="nc_upload_choose_local_files">选择文件</string>
     <string name="nc_upload_confirm_send_multiple">将这些文件发送到 %1$s？</string>
     <string name="nc_upload_confirm_send_single">将此文件发送到 %1$s？</string>
     <string name="nc_upload_in_progess">上传中</string>
 
+    <string name="nc_settings_phone_book_integration_desc">根据电话号码匹配联系人，以集成 Talk 快捷方式到系统联系人应用</string>
+    <string name="nc_settings_phone_book_integration_title">电话号码集成 </string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">电话号码 </string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">你可以设置你的电话号码，这样其他用户能够找到你 </string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">无效电话号码</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">成功设置电话号码</string>
+    <string name="no_phone_book_integration_due_to_permissions">由于缺少权限，没有电话集成 </string>
     <string name="nc_phone_book_integration_chat_via">通过 %s 聊天</string>
     <string name="nc_phone_book_integration_account_not_found">未找到账户</string>
    
-    </resources>
+    <string name="avatar">头像</string>
+    <string name="account_icon">账户图标</string>
+    <string name="userinfo_no_info_headline">未设置个人信息</string>
+    <string name="userinfo_no_info_text">在你的个人资料页上添加姓名、图片和联系方式。</string>
+    <string name="userinfo_error_text">未能检索个人用户信息</string>
+    <string name="user_info_phone">电话号码  </string>
+    <string name="user_info_address">地址</string>
+    <string name="user_info_website">网站</string>
+    <string name="user_info_twitter">推特账户</string>
+    <string name="user_info_displayname">全名</string>
+    <string name="file_list_folder">文件夹</string>
+    <string name="file_list_loading">加载中…</string>
+    <string name="edit">编辑</string>
+    <string name="save">保存</string>
+    <string name="upload_new_avatar_from_device">从设备上传新头像</string>
+    <string name="choose_avatar_from_cloud">从云端选择头像</string>
+    <string name="delete_avatar">删除头像</string>
+    <string name="scope_private_title">私有</string>
+    <string name="scope_private_description">只对通过手机上 Talk 应用的电话号码整合功能匹配的人可见 </string>
+    <string name="lock_symbol">锁定头像</string>
+    <string name="scope_local_title">本地</string>
+    <string name="scope_local_description">仅对该实例用户和来宾可见 </string>
+    <string name="scope_federated_title">联合云 </string>
+    <string name="scope_federated_description">只同步到受信任的服务器 </string>
+    <string name="scope_published_title">已发布</string>
+    <string name="scope_published_description">同步到受信任的服务器、全局和公共地址簿</string>
+    <string name="scope_toggle">范围切换</string>
+    
+    <!-- App Bar -->
+    <string name="appbar_search_in">搜索位置 %s</string>
+
+    <string name="nc_action_open_main_menu">打开主菜单</string>
+    <string name="failed_to_save">未能保存 %1$s</string>
+</resources>

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

@@ -148,6 +148,7 @@
     <string name="nc_delete_call">刪除對話</string>
     <string name="nc_delete">刪除</string>
     <string name="nc_delete_conversation_default">請確認是否要清除目前的對話。</string>
+    <string name="nc_delete_conversation_one2one">如果您刪除對話，它也將會從 %1$s 處刪除。</string>
     <string name="nc_delete_conversation_more">如果您刪除了此對話，它也將會從所有其他參與者處刪除。</string>
 
     <string name="nc_new_conversation">新對話</string>
@@ -176,6 +177,7 @@
     <string name="nc_incoming_call">來電中...。</string>
     <string name="nc_nick_guest">訪客</string>
     <string name="nc_public_call">新的公開對話</string>
+    <string name="nc_public_call_explanation">公開對話讓您可通過特製的連結邀請外部人士。</string>
     <string name="nc_call_timeout">在45秒內無回應，請點按以重試</string>
     <string name="nc_call_reconnecting">正在重新連接…</string>
     <string name="nc_offline">當前離線，請檢查您的連接</string>
@@ -194,8 +196,11 @@
     <string name="nc_mute_calls">靜音來電</string>
     <string name="nc_mute_calls_desc">來電將被靜音</string>
     <string name="nc_important_conversation">重要對話</string>
+    <string name="nc_important_conversation_desc">此對話中的通告將覆蓋\"請勿打擾\"設置</string>
+
     <!-- Bottom sheet menu -->
     <string name="nc_failed_to_perform_operation">發生錯誤了 ：(</string>
+    <string name="nc_failed_signaling_settings">目標伺服器不支持通過流動電話加入公共對話。您可以嘗試通過網絡瀏覽器加入對話。</string>
     <string name="nc_all_ok_operation">完成</string>
     <string name="nc_ok">確定</string>
     <string name="nc_call_name">對話名稱</string>
@@ -314,14 +319,47 @@
     <string name="nc_upload_confirm_send_single">將此檔案發送到 %1$s？</string>
     <string name="nc_upload_in_progess">上傳中</string>
 
+    <string name="nc_settings_phone_book_integration_desc">根據電話號碼匹配聯絡人以將 Talk 快捷方式集成到電話簿中</string>
+    <string name="nc_settings_phone_book_integration_title">電話號碼整合</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_title">電話號碼</string>
+    <string name="nc_settings_phone_book_integration_phone_number_dialog_description">設置您的電話號碼，以便其他用戶可以找到您</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_invalid">電話號碼無效</string>
     <string name="nc_settings_phone_book_integration_phone_number_dialog_success">電話號碼設置成功</string>
+    <string name="no_phone_book_integration_due_to_permissions">由於缺少權限而無法集成電話號碼</string>
     <string name="nc_phone_book_integration_chat_via">透過 %s 聊天</string>
     <string name="nc_phone_book_integration_account_not_found">找不到賬戶</string>
    
+    <string name="avatar">頭像</string>
+    <string name="account_icon">賬戶圖示</string>
+    <string name="userinfo_no_info_headline">未設定個人資訊</string>
+    <string name="userinfo_no_info_text">在您的個人檔案中新增名字、頭像和聯絡資訊</string>
+    <string name="userinfo_error_text">無法檢索個人用戶資訊。</string>
+    <string name="user_info_phone">電話號碼</string>
+    <string name="user_info_address">地址</string>
+    <string name="user_info_website">網站</string>
+    <string name="user_info_twitter">Twitter</string>
+    <string name="user_info_displayname">全名</string>
+    <string name="file_list_folder">資料夾</string>
+    <string name="file_list_loading">加載中...</string>
+    <string name="edit">編輯</string>
+    <string name="save">儲存</string>
+    <string name="upload_new_avatar_from_device">從裝置上傳新頭像</string>
+    <string name="choose_avatar_from_cloud">從雲中選擇頭像</string>
+    <string name="delete_avatar">刪除頭像</string>
+    <string name="scope_private_title">私人</string>
+    <string name="scope_private_description">僅對透過 Talk 在手提電話上通過電話號碼整合進行匹配的人可見</string>
+    <string name="lock_symbol">鎖符號</string>
+    <string name="scope_local_title">近端</string>
+    <string name="scope_local_description">僅對此安裝的人和來賓可見</string>
+    <string name="scope_federated_title">已聯盟</string>
+    <string name="scope_federated_description">僅同步至受信任的伺服器</string>
+    <string name="scope_published_title">已發佈</string>
+    <string name="scope_published_description">同步到受信任的伺服器以及全域與公開的通訊錄</string>
+    <string name="scope_toggle">切換範圍</string>
+    
     <!-- App Bar -->
     <string name="appbar_search_in">%s內搜尋</string>
 
     <string name="nc_action_open_main_menu">打開主選項單</string>
-    </resources>
+    <string name="failed_to_save">儲存 %1$s 失敗</string>
+</resources>

app/src/main/res/values/dimens.xml

@@ -24,7 +24,6 @@
 
     <dimen name="item_height">72dp</dimen>
     <dimen name="small_item_height">48dp</dimen>
-    <dimen name="rv_item_view_height">48dp</dimen>
 
     <!-- Custom transition dimensions -->
     <dimen name="margin_between_elements">8dp</dimen>

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

@@ -158,6 +158,8 @@
 
     <string name="nc_select_an_account">Select an account</string>
 
+    <string name="nc_profile_personal_info_title">Personal Info</string>
+
     <!-- Conversation menu -->
     <string name="nc_start_conversation">Start a conversation</string>
     <string name="nc_configure_room">Configure conversation</string>
@@ -292,6 +294,7 @@
     <string name="nc_limit_hit">%s characters limit has been hit</string>
     <string name="nc_groups">Groups</string>
     <string name="nc_participants">Participants</string>
+    <string name="nc_participants_add">Add participants</string>
 
     <string name="nc_owner">Owner</string>
     <string name="nc_moderator">Moderator</string>
@@ -363,7 +366,7 @@
     <string name="userinfo_no_info_text">Add name, picture and contact details on your profile page.</string>
     <string name="userinfo_error_text">Failed to retrieve personal user information.</string>
     <string name="user_info_phone">Phone number</string>
-    <string name="user_info_email">E-mail</string>
+    <string name="user_info_email">Email</string>
     <string name="user_info_address">Address</string>
     <string name="user_info_website">Website</string>
     <string name="user_info_twitter">Twitter</string>
@@ -394,4 +397,5 @@
     <string name="tooManyUnreadMessages" translatable="false">999+</string>
     <string name="nc_action_open_main_menu">Open main menu</string>
     <string name="failed_to_save">Failed to save %1$s</string>
+    <string name="selected_list_item">selected</string>
 </resources>

app/src/main/res/values/styles.xml

@@ -44,7 +44,8 @@
     </style>
 
     <style name="ListItem" parent="BottomSheet.ListItem.TextAppearance">
-        <item name="android:textColor">@color/nc_incoming_text_default</item>
+        <item name="android:textColor">@color/conversation_item_header</item>
+        <item name="android:textSize">16sp</item>
     </style>
 
     <style name="ChipIncomingTextAppearance" parent="TextAppearance.MaterialComponents.Chip">