Merge branch 'release/1.0.22'

app/build.gradle

@@ -7,8 +7,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 22
-        versionCode 193
-        versionName '1.0.21'
+        versionCode 194
+        versionName '1.0.22'
     }
 
     compileOptions {

app/src/main/java/com/xabber/android/data/LogManager.java

@@ -38,8 +38,6 @@ public class LogManager implements OnLoadListener {
         log = debugable && SettingsManager.debugLog();
     }
 
-    ;
-
     private final static LogManager instance;
 
     static {

app/src/main/java/com/xabber/android/data/OnCloseListener.java

@@ -26,5 +26,5 @@ public interface OnCloseListener extends BaseManagerInterface {
      * <p/>
      * This function will be call from UI thread.
      */
-    public void onClose();
+    void onClose();
 }

app/src/main/java/com/xabber/android/data/OnErrorListener.java

@@ -26,5 +26,5 @@ interface OnErrorListener extends BaseUIListener {
      *
      * @param resourceId String with error description.
      */
-    public void onError(int resourceId);
+    void onError(int resourceId);
 }

app/src/main/java/com/xabber/android/data/OnTimerListener.java

@@ -26,7 +26,7 @@ package com.xabber.android.data;
  */
 public interface OnTimerListener extends BaseManagerInterface {
 
-    public final static int DELAY = 1000;
+    int DELAY = 1000;
 
     /**
      * Called after at least {@link #DELAY} milliseconds.

app/src/main/java/com/xabber/android/data/OnUnloadListener.java

@@ -28,6 +28,6 @@ public interface OnUnloadListener extends BaseManagerInterface {
      * WILL BE CALLED FROM BACKGROUND THREAD. DON'T CHANGE OR ACCESS
      * APPLICATION'S DATA HERE!
      */
-    public void onUnload();
+    void onUnload();
 
 }

app/src/main/java/com/xabber/android/data/account/AccountManager.java

@@ -398,17 +398,20 @@ public class AccountManager implements OnLoadListener, OnWipeListener {
         }
 
 
-        boolean useCustomHost = false;
-
+        boolean useCustomHost = application.getResources().getBoolean(R.bool.account_use_custom_host_default);
         if (accountType.getProtocol() == AccountProtocol.gtalk) {
             useCustomHost = true;
         }
 
+        boolean useCompression = application.getResources().getBoolean(R.bool.account_use_compression_default);
+
+        ArchiveMode archiveMode = ArchiveMode.valueOf(application.getString(R.string.account_archive_mode_default_value));
+
         accountItem = addAccount(accountType.getProtocol(), useCustomHost, host, port, serverName, userName,
                 storePassword, password, resource, getNextColorIndex(), 0, StatusMode.available,
                 SettingsManager.statusText(), true, true, tlsRequired ? TLSMode.required : TLSMode.enabled,
-                false, useOrbot ? ProxyType.orbot : ProxyType.none, "localhost", 8080,
-                "", "", syncable, null, null, ArchiveMode.available, registerNewAccount);
+                useCompression, useOrbot ? ProxyType.orbot : ProxyType.none, "localhost", 8080,
+                "", "", syncable, null, null, archiveMode, registerNewAccount);
         if (accountItem == null) {
             throw new NetworkException(R.string.ACCOUNT_REGISTER_FAILED);
         }

app/src/main/java/com/xabber/android/data/account/CommonState.java

@@ -54,6 +54,6 @@ public enum CommonState {
     /**
      * There is at least one account with received roster.
      */
-    online;
+    online
 
 }

app/src/main/java/com/xabber/android/data/account/OAuthProvider.java

@@ -29,7 +29,7 @@ interface OAuthProvider extends BaseManagerInterface {
     /**
      * @return Supported protocol.
      */
-    public AccountProtocol getAccountProtocol();
+    AccountProtocol getAccountProtocol();
 
     /**
      * Gets refresh token using Request Access Token.
@@ -40,7 +40,7 @@ interface OAuthProvider extends BaseManagerInterface {
      * @return refresh token or <code>null</code> if auth failed.
      * @throws NetworkException
      */
-    public String requestRefreshToken(String code) throws NetworkException;
+    String requestRefreshToken(String code) throws NetworkException;
 
     /**
      * Requests password renew from server based on refreshToken.
@@ -51,7 +51,7 @@ interface OAuthProvider extends BaseManagerInterface {
      * @return <code>null</code> on authorization fail.
      * @throws NetworkException
      */
-    public OAuthResult requestAccessToken(String refreshToken)
+    OAuthResult requestAccessToken(String refreshToken)
             throws NetworkException;
 
     /**

app/src/main/java/com/xabber/android/data/account/OnAccountChangedListener.java

@@ -30,5 +30,5 @@ public interface OnAccountChangedListener extends BaseUIListener {
      *
      * @param accounts
      */
-    public void onAccountsChanged(Collection<String> accounts);
+    void onAccountsChanged(Collection<String> accounts);
 }

app/src/main/java/com/xabber/android/data/connection/ConnectionThread.java

@@ -472,7 +472,7 @@ public class ConnectionThread implements
         Throwable e1 = ((XMPPException) e).getWrappedThrowable();
         if (!(e1 instanceof SSLException))
             return;
-        Throwable e2 = ((SSLException) e1).getCause();
+        Throwable e2 = e1.getCause();
         if (!(e2 instanceof CertificateException))
             return;
         runOnUiThread(new Runnable() {

app/src/main/java/com/xabber/android/data/connection/DNSManager.java

@@ -102,7 +102,7 @@ public class DNSManager {
             }
             for (Resolver check : resolver.getResolvers())
                 if (check instanceof SimpleResolver) {
-                    ((SimpleResolver) check).setTimeout(30);
+                    check.setTimeout(30);
                 } else {
                     LogManager.i(this, "Not simple resolver!!!?" + check);
                 }

app/src/main/java/com/xabber/android/data/connection/NetworkState.java

@@ -25,6 +25,6 @@ public enum NetworkState {
 
     suspended,
 
-    unavailable;
+    unavailable
 
 }

app/src/main/java/com/xabber/android/data/connection/Target.java

@@ -81,9 +81,7 @@ public class Target implements Comparable<Target> {
             return false;
         if (priority != other.priority)
             return false;
-        if (weight != other.weight)
-            return false;
-        return true;
+        return weight == other.weight;
     }
 
     @Override

app/src/main/java/com/xabber/android/data/entity/AbstractAccountTable.java

@@ -29,9 +29,9 @@ import android.provider.BaseColumns;
  */
 public abstract class AbstractAccountTable extends AbstractTable {
 
-    public static interface Fields extends BaseColumns {
+    public interface Fields extends BaseColumns {
 
-        public static final String ACCOUNT = "account";
+        String ACCOUNT = "account";
 
     }
 

app/src/main/java/com/xabber/android/data/entity/AbstractEntityTable.java

@@ -23,9 +23,9 @@ import android.database.Cursor;
  */
 public abstract class AbstractEntityTable extends AbstractAccountTable {
 
-    public static interface Fields extends AbstractAccountTable.Fields {
+    public interface Fields extends AbstractAccountTable.Fields {
 
-        public static final String USER = "user";
+        String USER = "user";
 
     }
 

app/src/main/java/com/xabber/android/data/extension/archive/MatchMode.java

@@ -27,6 +27,6 @@ public enum MatchMode {
 
     bare,
 
-    exect;
+    exect
 
 }

app/src/main/java/com/xabber/android/data/extension/capability/ClientSoftware.java

@@ -47,7 +47,7 @@ public enum ClientSoftware {
     private final static Pattern GTALK_NODE = Pattern
             .compile("(?iu).*mail\\.google\\.com.*client.*");
 
-    private ClientSoftware(String regularExpression) {
+    ClientSoftware(String regularExpression) {
         this.regularExpression = Pattern.compile(regularExpression);
     }
 

app/src/main/java/com/xabber/android/data/extension/otr/OTRManager.java

@@ -653,4 +653,20 @@ public class OTRManager implements OtrEngineHost, OtrEngineListener,
         // since this is not supported, we don't need to do anything
     }
 
+    public void onContactUnAvailable(String account, String user) {
+        Session session = sessions.get(account, user);
+
+        if (session == null) {
+            return;
+        }
+
+        if (session.getSessionStatus() == SessionStatus.ENCRYPTED) {
+            try {
+                LogManager.i(this, "onContactUnAvailable. Refresh session for " + user);
+                session.refreshSession();
+            } catch (OtrException e) {
+                LogManager.exception(this, e);
+            }
+        }
+    }
 }

app/src/main/java/com/xabber/android/data/extension/ssn/SessionState.java

@@ -30,6 +30,6 @@ public enum SessionState {
      * Data form of type "form" with a "renegotiate" field whose value is "1"
      * has been sent.
      */
-    renegotiation;
+    renegotiation
 
 }

app/src/main/java/com/xabber/android/data/extension/vcard/OnVCardListener.java

@@ -31,7 +31,7 @@ public interface OnVCardListener extends BaseUIListener {
      * @param bareAddress
      * @param vCard
      */
-    public void onVCardReceived(String account, String bareAddress, VCard vCard);
+    void onVCardReceived(String account, String bareAddress, VCard vCard);
 
     /**
      * Fail occurred on vCard response.
@@ -39,6 +39,6 @@ public interface OnVCardListener extends BaseUIListener {
      * @param account
      * @param bareAddress
      */
-    public void onVCardFailed(String account, String bareAddress);
+    void onVCardFailed(String account, String bareAddress);
 
 }

app/src/main/java/com/xabber/android/data/message/OnChatChangedListener.java

@@ -28,6 +28,6 @@ public interface OnChatChangedListener extends BaseUIListener {
      * @param user
      * @param incoming Whether new incoming message received.
      */
-    public void onChatChanged(String account, String user, boolean incoming);
+    void onChatChanged(String account, String user, boolean incoming);
 
 }

app/src/main/java/com/xabber/android/data/message/RegularChat.java

@@ -120,10 +120,15 @@ public class RegularChat extends AbstractChat {
         final String resource = Jid.getResource(packet.getFrom());
         if (packet instanceof Presence) {
             final Presence presence = (Presence) packet;
-            if (this.resource != null
-                    && presence.getType() == Presence.Type.unavailable
-                    && this.resource.equals(resource))
+
+            if (this.resource != null && presence.getType() == Presence.Type.unavailable
+                    && this.resource.equals(resource)) {
                 this.resource = null;
+            }
+
+            if (presence.getType() == Presence.Type.unavailable) {
+                OTRManager.getInstance().onContactUnAvailable(account, user);
+            }
         } else if (packet instanceof Message) {
             final Message message = (Message) packet;
             if (message.getType() == Message.Type.error)

app/src/main/java/com/xabber/android/data/notification/AccountNotificationItem.java

@@ -22,6 +22,6 @@ package com.xabber.android.data.notification;
  */
 public interface AccountNotificationItem extends NotificationItem {
 
-    public String getAccount();
+    String getAccount();
 
 }

app/src/main/java/com/xabber/android/data/notification/EntityNotificationItem.java

@@ -21,6 +21,6 @@ package com.xabber.android.data.notification;
  */
 public interface EntityNotificationItem extends AccountNotificationItem {
 
-    public String getUser();
+    String getUser();
 
 }

app/src/main/java/com/xabber/android/data/notification/NotificationManager.java

@@ -150,7 +150,7 @@ public class NotificationManager implements OnInitializedListener, OnAccountChan
         messageNotificationCreator = new MessageNotificationCreator();
 
         accountPainter = new AccountPainter(application);
-        persistentNotificationColor = application.getResources().getColor(R.color.red_500);
+        persistentNotificationColor = application.getResources().getColor(R.color.persistent_notification_color);
     }
 
     public static NotificationManager getInstance() {
@@ -354,6 +354,10 @@ public class NotificationManager implements OnInitializedListener, OnAccountChan
     }
 
     private void updatePersistentNotification() {
+        if (!SettingsManager.eventsPersistent()) {
+            return;
+        }
+
         int waiting = 0;
         int connecting = 0;
         int connected = 0;

app/src/main/java/com/xabber/android/data/roster/Group.java

@@ -21,6 +21,6 @@ package com.xabber.android.data.roster;
  */
 public interface Group {
 
-    public String getName();
+    String getName();
 
 }

app/src/main/java/com/xabber/android/data/roster/OnContactChangedListener.java

@@ -31,6 +31,6 @@ public interface OnContactChangedListener extends BaseUIListener {
      *
      * @param entities
      */
-    public void onContactsChanged(Collection<BaseEntity> entities);
+    void onContactsChanged(Collection<BaseEntity> entities);
 
 }

app/src/main/java/com/xabber/android/data/roster/OnRosterChangedListener.java

@@ -37,7 +37,7 @@ public interface OnRosterChangedListener extends BaseManagerInterface {
      * @param removedContacts
      * @param removedGroups
      */
-    public void onRosterUpdate(
+    void onRosterUpdate(
             Collection<RosterGroup> addedGroups,
             Map<RosterContact, String> addedContacts,
             Map<RosterContact, String> renamedContacts,
@@ -51,14 +51,14 @@ public interface OnRosterChangedListener extends BaseManagerInterface {
      *
      * @param rosterContact
      */
-    public void onPresenceChanged(Collection<RosterContact> rosterContact);
+    void onPresenceChanged(Collection<RosterContact> rosterContact);
 
     /**
      * Contact's structured name has been changed.
      *
      * @param rosterContact
      */
-    public void onContactStructuredInfoChanged(RosterContact rosterContact,
+    void onContactStructuredInfoChanged(RosterContact rosterContact,
                                         StructuredName structuredName);
 
 }

app/src/main/java/com/xabber/android/receiver/ConnectivityReceiver.java

@@ -34,7 +34,7 @@ public class ConnectivityReceiver extends BroadcastReceiver {
     public void onReceive(Context context, Intent intent) {
         if (!ConnectivityManager.CONNECTIVITY_ACTION.equals(intent.getAction()))
             return;
-        NetworkInfo networkInfo = (NetworkInfo) intent
+        NetworkInfo networkInfo = intent
                 .getParcelableExtra(ConnectivityManager.EXTRA_NETWORK_INFO);
         if (networkInfo == null) {
             LogManager.e(this, "NO INFO");

app/src/main/java/com/xabber/android/ui/ContactList.java

@@ -46,6 +46,7 @@ import com.xabber.android.data.Application;
 import com.xabber.android.data.NetworkException;
 import com.xabber.android.data.SettingsManager;
 import com.xabber.android.data.account.AccountManager;
+import com.xabber.android.data.account.CommonState;
 import com.xabber.android.data.account.OnAccountChangedListener;
 import com.xabber.android.data.entity.BaseEntity;
 import com.xabber.android.data.extension.avatar.AvatarManager;
@@ -57,7 +58,7 @@ import com.xabber.android.data.notification.NotificationManager;
 import com.xabber.android.data.roster.AbstractContact;
 import com.xabber.android.data.roster.RosterContact;
 import com.xabber.android.data.roster.RosterManager;
-import com.xabber.android.ui.ContactListFragment.OnContactClickListener;
+import com.xabber.android.ui.ContactListFragment.ContactListFragmentListener;
 import com.xabber.android.ui.dialog.AccountChooseDialogFragment;
 import com.xabber.android.ui.dialog.AccountChooseDialogFragment.OnChoosedListener;
 import com.xabber.android.ui.dialog.ContactIntegrationDialogFragment;
@@ -81,7 +82,7 @@ import java.util.Locale;
  * @author alexander.ivanov
  */
 public class ContactList extends ManagedActivity implements OnAccountChangedListener,
-        View.OnClickListener, OnChoosedListener, OnContactClickListener, ContactListDrawerFragment.ContactListDrawerListener, Toolbar.OnMenuItemClickListener {
+        View.OnClickListener, OnChoosedListener, ContactListFragmentListener, ContactListDrawerFragment.ContactListDrawerListener, Toolbar.OnMenuItemClickListener {
 
     /**
      * Select contact to be invited to the room was requested.
@@ -111,6 +112,7 @@ public class ContactList extends ManagedActivity implements OnAccountChangedList
     private BarPainter barPainter;
     private ActionBarDrawerToggle drawerToggle;
     private DrawerLayout drawerLayout;
+    private Menu optionsMenu;
 
     public static Intent createPersistentIntent(Context context) {
         Intent intent = new Intent(context, ContactList.class);
@@ -162,7 +164,8 @@ public class ContactList extends ManagedActivity implements OnAccountChangedList
         drawerLayout.setDrawerListener(drawerToggle);
 
         toolbar.inflateMenu(R.menu.contact_list);
-        setUpSearchView(toolbar.getMenu());
+        optionsMenu = toolbar.getMenu();
+        setUpSearchView(optionsMenu);
         toolbar.setOnMenuItemClickListener(this);
 
         barPainter = new BarPainter(this, toolbar);
@@ -558,6 +561,30 @@ public class ContactList extends ManagedActivity implements OnAccountChangedList
         }
     }
 
+    @Override
+    public void onContactListChange(CommonState commonState) {
+
+        switch (commonState) {
+
+            case empty:
+            case disabled:
+                for (int i = 0; i < optionsMenu.size(); i++) {
+                    optionsMenu.getItem(i).setVisible(false);
+                }
+                break;
+            case offline:
+            case waiting:
+            case connecting:
+            case roster:
+            case online:
+                for (int i = 0; i < optionsMenu.size(); i++) {
+                    optionsMenu.getItem(i).setVisible(true);
+                }
+
+                break;
+        }
+    }
+
     private void createShortcut(AbstractContact abstractContact) {
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, ChatViewer.createShortCutIntent(this,

app/src/main/java/com/xabber/android/ui/ContactListDrawerFragment.java

@@ -3,6 +3,8 @@ package com.xabber.android.ui;
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageInfo;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
@@ -12,6 +14,7 @@ import android.view.ViewGroup;
 import android.widget.AdapterView;
 import android.widget.ImageView;
 import android.widget.ListView;
+import android.widget.TextView;
 
 import com.xabber.android.R;
 import com.xabber.android.data.Application;
@@ -41,6 +44,14 @@ public class ContactListDrawerFragment extends Fragment implements View.OnClickL
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.contact_list_drawer, container, false);
 
+        try {
+            ((TextView)view.findViewById(R.id.version))
+                    .setText(getActivity().getPackageManager().getPackageInfo(getActivity().getPackageName(), 0)
+                            .versionName);
+        } catch (PackageManager.NameNotFoundException e) {
+            e.printStackTrace();
+        }
+
         View drawerHeader = view.findViewById(R.id.drawer_header);
         drawerHeaderImage = (ImageView) drawerHeader.findViewById(R.id.drawer_header_image);
 
@@ -67,6 +78,8 @@ public class ContactListDrawerFragment extends Fragment implements View.OnClickL
 
         divider = footerView.findViewById(R.id.drawer_divider);
 
+
+
         return view;
     }
 

app/src/main/java/com/xabber/android/ui/ContactListFragment.java

 package com.xabber.android.ui;
 
+import android.app.Activity;
 import android.os.Bundle;
 import android.os.SystemClock;
 import android.support.v4.app.Fragment;
@@ -91,6 +92,15 @@ public class ContactListFragment extends Fragment implements OnAccountChangedLis
     private FloatingActionButton scrollToChatsActionButton;
     private AccountPainter accountPainter;
 
+    private ContactListFragmentListener contactListFragmentListener;
+
+    @Override
+    public void onAttach(Activity activity) {
+        super.onAttach(activity);
+
+        contactListFragmentListener = (ContactListFragmentListener) activity;
+    }
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
         View view = inflater.inflate(R.layout.contact_list_fragment, container, false);
@@ -149,6 +159,12 @@ public class ContactListFragment extends Fragment implements OnAccountChangedLis
         unregisterListeners();
     }
 
+    @Override
+    public void onDetach() {
+        super.onDetach();
+        contactListFragmentListener = null;
+    }
+
     @Override
     public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
         AdapterContextMenuInfo info = (AdapterContextMenuInfo) menuInfo;
@@ -171,7 +187,7 @@ public class ContactListFragment extends Fragment implements OnAccountChangedLis
     public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
         Object object = parent.getAdapter().getItem(position);
         if (object instanceof AbstractContact) {
-            ((OnContactClickListener) getActivity()).onContactClick((AbstractContact) object);
+            contactListFragmentListener.onContactClick((AbstractContact) object);
         } else if (object instanceof GroupConfiguration) {
             GroupConfiguration groupConfiguration = (GroupConfiguration) object;
             adapter.setExpanded(groupConfiguration.getAccount(), groupConfiguration.getUser(),
@@ -328,7 +344,7 @@ public class ContactListFragment extends Fragment implements OnAccountChangedLis
         }
         buttonView.setOnClickListener(listener);
 
-
+        contactListFragmentListener.onContactListChange(commonState);
 
     }
 
@@ -443,8 +459,11 @@ public class ContactListFragment extends Fragment implements OnAccountChangedLis
         popup.show();
     }
 
-    public interface OnContactClickListener {
+    public interface ContactListFragmentListener {
         void onContactClick(AbstractContact contact);
+        void onContactListChange(CommonState commonState);
     }
 
+
+
 }

app/src/main/java/com/xabber/android/ui/StatusEditor.java

@@ -222,6 +222,7 @@ public class StatusEditor extends ManagedListActivity implements OnItemClickList
                 return true;
             case R.id.action_edit_status:
                 showStatus(actionWithItem.getStatusMode(), actionWithItem.getStatusText());
+                statusTextView.requestFocus();
                 return true;
             case R.id.action_remove_status:
                 AccountManager.getInstance().removeSavedStatus(actionWithItem);

app/src/main/java/com/xabber/android/ui/adapter/ChatViewerAdapter.java

@@ -166,7 +166,7 @@ public class ChatViewerAdapter extends FragmentStatePagerAdapter {
     }
 
     public interface FinishUpdateListener {
-        public void onChatViewAdapterFinishUpdate();
+        void onChatViewAdapterFinishUpdate();
     }
 
     public ArrayList<AbstractChat> getActiveChats() {

app/src/main/java/com/xabber/android/ui/adapter/ContactItemInflater.java

@@ -95,7 +95,7 @@ public class ContactItemInflater {
                 viewHolder.outgoingMessageIndicator.setTextColor(accountMainColors[colorLevel]);
 
             }
-            view.setBackgroundColor(context.getResources().getColor(R.color.grey_50));
+            view.setBackgroundColor(context.getResources().getColor(R.color.contact_list_active_chat_background));
             viewHolder.smallRightIcon.setImageResource(R.drawable.ic_client_small);
             viewHolder.smallRightIcon.setVisibility(View.VISIBLE);
             viewHolder.smallRightIcon.setImageLevel(clientSoftware.ordinal());
@@ -103,7 +103,7 @@ public class ContactItemInflater {
         } else {
             statusText = contact.getStatusText().trim();
             viewHolder.smallRightText.setVisibility(View.GONE);
-            view.setBackgroundColor(context.getResources().getColor(R.color.grey_300));
+            view.setBackgroundColor(context.getResources().getColor(R.color.contact_list_contact_background));
             viewHolder.smallRightIcon.setVisibility(View.GONE);
             viewHolder.largeClientIcon.setVisibility(View.VISIBLE);
             viewHolder.largeClientIcon.setImageLevel(clientSoftware.ordinal());

app/src/main/java/com/xabber/android/ui/adapter/GroupedContactAdapter.java

@@ -108,7 +108,7 @@ public abstract class GroupedContactAdapter extends BaseAdapter implements Updat
 
         accountGroupColors = resources.getIntArray(R.array.account_200);
         accountSubgroupColors = resources.getIntArray(R.array.account_50);
-        activeChatsColor = resources.getColor(R.color.color_primary_light);
+        activeChatsColor = resources.getColor(R.color.contact_list_active_chats_group_background);
 
         contactItemInflater = new ContactItemInflater(activity);
 

app/src/main/java/com/xabber/android/ui/preferences/BaseSettingsFragment.java

@@ -66,7 +66,7 @@ public abstract class BaseSettingsFragment extends PreferenceFragment
     /**
      * Possible operations.
      */
-    private static enum Operation {
+    private enum Operation {
         save, discard, read
     }
 

app/src/main/java/com/xabber/xmpp/Container.java

@@ -28,12 +28,12 @@ public interface Container extends Instance {
     /**
      * @return XML element name.
      */
-    public String getElementName();
+    String getElementName();
 
     /**
      * @return XML namespace.
      */
-    public String getNamespace();
+    String getNamespace();
 
     /**
      * Serializes an inner content of XML tag.
@@ -41,7 +41,7 @@ public interface Container extends Instance {
      * @param serializer
      * @throws IOException
      */
-    public abstract void serializeContent(XmlSerializer serializer)
+    void serializeContent(XmlSerializer serializer)
             throws IOException;
 
 }

app/src/main/java/com/xabber/xmpp/Instance.java

@@ -32,7 +32,7 @@ public interface Instance {
      * @return Whether parsed instance has valid values (e.g. required field are
      * not <code>null</code>).
      */
-    public boolean isValid();
+    boolean isValid();
 
     /**
      * Serializes an instance into XML using serializer.
@@ -40,6 +40,6 @@ public interface Instance {
      * @param serializer
      * @throws IOException
      */
-    public void serialize(XmlSerializer serializer) throws IOException;
+    void serialize(XmlSerializer serializer) throws IOException;
 
 }

app/src/main/java/com/xabber/xmpp/ProviderUtils.java

@@ -132,7 +132,7 @@ public class ProviderUtils {
      * @throws Exception
      */
     public static String parseText(XmlPullParser parser, int maximum)
-            throws OverflowReceiverBufferException, Exception {
+            throws Exception {
         final StringBuilder text = new StringBuilder();
         int inner = 1;
         boolean overflow = false;
@@ -179,7 +179,7 @@ public class ProviderUtils {
      * @throws Exception
      */
     public static void skipTag(XmlPullParser parser)
-            throws IllegalStateException, Exception {
+            throws Exception {
         LinkedList<String> tags = new LinkedList<String>();
         tags.add(parser.getName());
         while (!tags.isEmpty()) {

app/src/main/java/com/xabber/xmpp/archive/CollectionHeader.java

@@ -23,12 +23,12 @@ import java.util.Date;
  */
 public interface CollectionHeader {
 
-    public Date getStart();
+    Date getStart();
 
-    public String getStartString();
+    String getStartString();
 
-    public Integer getVersion();
+    Integer getVersion();
 
-    public String getWith();
+    String getWith();
 
 }

app/src/main/java/com/xabber/xmpp/archive/OtrMode.java

@@ -62,7 +62,7 @@ public enum OtrMode {
 
     private final LoggingValue[] loggingValues;
 
-    private OtrMode(LoggingValue[] loggingValues) {
+    OtrMode(LoggingValue[] loggingValues) {
         this.loggingValues = loggingValues;
     }
 

app/src/main/java/com/xabber/xmpp/archive/SaveMode.java

@@ -47,7 +47,7 @@ public enum SaveMode {
 
     private String value;
 
-    private SaveMode(String name) {
+    SaveMode(String name) {
         this.value = name;
     }
 

app/src/main/java/com/xabber/xmpp/ssn/DisclosureValue.java

@@ -37,7 +37,7 @@ public enum DisclosureValue {
 
     private final String label;
 
-    private DisclosureValue(String label) {
+    DisclosureValue(String label) {
         this.label = label;
     }
 

app/src/main/java/com/xabber/xmpp/ssn/LoggingValue.java

@@ -33,7 +33,7 @@ public enum LoggingValue {
 
     private final String label;
 
-    private LoggingValue(String label) {
+    LoggingValue(String label) {
         this.label = label;
     }
 

app/src/main/java/com/xabber/xmpp/ssn/SecurityValue.java

@@ -35,7 +35,7 @@ public enum SecurityValue {
 
     private final String label;
 
-    private SecurityValue(String label) {
+    SecurityValue(String label) {
         this.label = label;
     }
 

app/src/main/java/com/xabber/xmpp/vcard/AddressProperty.java

@@ -28,6 +28,6 @@ public enum AddressProperty {
 
     PCODE,
 
-    CTRY;
+    CTRY
 
 }

app/src/main/java/com/xabber/xmpp/vcard/Classification.java

@@ -20,6 +20,6 @@ public enum Classification {
 
     PRIVATE,
 
-    CONFIDENTIAL;
+    CONFIDENTIAL
 
 }

app/src/main/java/com/xabber/xmpp/vcard/EmailType.java

@@ -24,6 +24,6 @@ public enum EmailType {
 
     X400,
 
-    PREF;
+    PREF
 
 }

app/src/main/java/com/xabber/xmpp/vcard/Logo.java

@@ -18,6 +18,6 @@ import com.xabber.xmpp.Instance;
 
 public interface Logo extends Instance {
 
-    public static final String ELEMENT_NAME = "LOGO";
+    String ELEMENT_NAME = "LOGO";
 
 }

app/src/main/java/com/xabber/xmpp/vcard/NameProperty.java

@@ -24,6 +24,6 @@ public enum NameProperty {
 
     PREFIX,
 
-    SUFFIX;
+    SUFFIX
 
 }

app/src/main/java/com/xabber/xmpp/vcard/Photo.java

@@ -18,6 +18,6 @@ import com.xabber.xmpp.Instance;
 
 public interface Photo extends Instance {
 
-    public static final String ELEMENT_NAME = "PHOTO";
+    String ELEMENT_NAME = "PHOTO";
 
 }

app/src/main/java/com/xabber/xmpp/vcard/Sound.java

@@ -18,6 +18,6 @@ import com.xabber.xmpp.Instance;
 
 public interface Sound extends Instance {
 
-    public static final String ELEMENT_NAME = "SOUND";
+    String ELEMENT_NAME = "SOUND";
 
 }

app/src/main/java/com/xabber/xmpp/vcard/TelephoneType.java

@@ -40,6 +40,6 @@ public enum TelephoneType {
 
     PCS,
 
-    PREF;
+    PREF
 
 }

app/src/main/java/com/xabber/xmpp/vcard/VCardProperty.java

@@ -48,7 +48,7 @@ public enum VCardProperty {
 
     private final String name;
 
-    private VCardProperty() {
+    VCardProperty() {
         name = super.toString().replace('_', '-');
     }
 

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

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber 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/.
--->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:padding="4dip">
-
-    <TextView
-        android:id="@android:id/message"
-        android:layout_width="match_parent"
-        android:layout_height="48dp"
-        android:singleLine="true"
-        android:ellipsize="marquee"
-        android:gravity="center_vertical"
-        />
-
-</LinearLayout>
\ No newline at end of file

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

@@ -67,6 +67,16 @@
             </LinearLayout>
         </LinearLayout>
 
+        <TextView
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="right"
+            android:text="1.0.0"
+            android:id="@+id/version"
+            android:textColor="@color/grey_300"
+            android:paddingRight="4dp"
+            android:textSize="12sp" />
+
     </FrameLayout>
 
     <ListView

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

@@ -24,7 +24,7 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:drawSelectorOnTop="true"
-        android:background="@color/grey_400"
+        android:background="@color/contact_list_background"
         android:divider="@null"
         android:dividerHeight="0dp"
         />

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

-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2013, Redsolution LTD. All rights reserved.
-
-     This file is part of Xabber project; you can redistribute it and/or
-     modify it under the terms of the GNU General Public License, Version 3.
-
-     Xabber 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/.
--->
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/status_icon"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_gravity="center"
-    android:src="@drawable/ic_status"
-    />
\ No newline at end of file

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

@@ -2,7 +2,7 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:orientation="vertical" android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/grey_300"
+    android:background="@color/recent_chats_background"
     >
 
     <include layout="@layout/toolbar_default" />

app/src/main/res/values-ar/contact_viewer.xml

@@ -29,7 +29,6 @@
   <string name="vcard_address_ctry">البلد</string>
   <string name="vcard_telephone">هاتف</string>
   <string name="vcard_email">بريد الكتروني</string>
-  <string name="vcard_type">علامات</string>
   <string name="vcard_type_home">البيت</string>
   <string name="vcard_type_work">العمل</string>
   <string name="vcard_type_postal">بريد</string>

app/src/main/res/values-ar/preference_editor.xml

@@ -76,6 +76,6 @@
   <string name="chats_attention_sound">صوت التنبيه\nاختر نغمة</string>
   <string name="connection_load_vcard">حمّل بطاقة vCard\nحمّل وحدّث البيانات الشخصية وصورة طرف الاتصال. عطّلها لتقليل استخدام بيانات الشبكة.</string>
   <string name="connection_use_carbons">وضع النسخة الكربونية\nقد تكون غير مستقرة!سوف تشارك المحادثات لنفس الحساب على هذا العميل. عطّلها لتقليل استخدام بيانات الشبكة.</string>
-  <string name="events_phrases">عبارات مفتاحية\nالإخطار للرسائل التي تحتوي على عبارات معينة واختيار صوت التنبية</string>
+  <string name="events_phrases">عبارات مفتاحية\nتخصيص إخطارات للرسائل المستقبلة التي تحتوي على عبارات معينة</string>
   <string name="security_clear_certificate_warning">هل ترغب حقاً في حذف كل الشهادات المهملة؟</string>
 </resources>

app/src/main/res/values-de-rDE/account_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="account_compression">Kompression verwenden</string>
+  <string name="account_enabled">Konto aktiviert</string>
+  <string name="account_host">Server</string>
+  <string name="account_password">Passwort</string>
+  <string name="confirm_password">Passwort bestätigen</string>
+  <string name="account_port">Port</string>
+  <string name="account_priority">Priorität</string>
+  <string name="account_resource">Ressource</string>
+  <string name="account_server_name">Servername</string>
+  <string name="account_type">Kontotyp</string>
+  <string name="account_type_hints_gtalk">Benutzername für Google Talk</string>
+  <string name="account_type_helps_gtalk">Wenn Sie über kein Google-Konto verfügen, können Sie eines unter http://mail.google.com\n erstellen. Dann verwenden Sie bitte your_user_name@your_google_domain</string>
+  <string name="account_type_helps_xmpp">Wenn Sie mehr über XMPP (Jabber) erfahren möchten: https://xmpp.org</string>
+  <string name="account_user_name">Benutzername</string>
+  <string name="EMPTY_SERVER_NAME">Servername nicht angegeben</string>
+  <string name="EMPTY_USER_NAME">Benutzername nicht angegeben</string>
+  <string name="CONFIRM_PASSWORD">Unterschiedliche Passwörter</string>
+  <string name="account_archive_mode">Speichern des Chatverlaufs</string>
+  <string name="account_archive_mode_available">Auf dem Server, wenn möglich</string>
+  <string name="account_archive_mode_dont_store">Nicht speichern</string>
+  <string name="account_archive_mode_local">Auf diesem Gerät</string>
+  <string name="account_archive_mode_server">Auf dem Server</string>
+  <string name="account_archive_mode_unread">Auf diesem Gerät (nur ungelesen/ungesendet)</string>
+  <string name="account_compression_summary">Datenkomprimierung aktivieren</string>
+  <string name="account_custom">Benutzerdefinierter Host</string>
+  <string name="account_custom_summary">Benutzerdefinierte Einstellung statt SRV-Eintrag nutzen</string>
+  <string name="account_enabled_summary">Auswählen um das Konto zu aktivieren</string>
+  <string name="account_invalid_port">Port muss eine Zahl sein (Standard: 5222)</string>
+  <string name="account_invalid_priority">Priorität muss eine Zahl zwischen -128 und 128 sein (Standardwert: 10)</string>
+  <string name="account_oauth">Authentifizierung</string>
+  <string name="account_oauth_invalidated">Nicht autorisiert</string>
+  <string name="account_oauth_summary">OAuth-Einstellungen</string>
+  <string name="account_proxy_host">Proxy-Host</string>
+  <string name="account_proxy_password">Proxy-Passwort</string>
+  <string name="account_proxy_port">Proxy-Port</string>
+  <string name="account_proxy_type">Proxy-Typ</string>
+  <string name="account_proxy_type_none">Deaktiviert</string>
+  <string name="account_proxy_user">Proxy-Benutzer</string>
+  <string name="account_sasl">SASL-Authentifizierung nutzen (empfohlen)</string>
+  <string name="account_sasl_summary">Für sehr alte Server deaktivieren</string>
+  <string name="account_store_password">Kennwort speichern</string>
+  <string name="account_store_password_summary">Deaktivieren um das Kennwort bei jedem Start eingeben zu müssen</string>
+  <string name="account_syncable">Mit Telefonbuch synchronisieren</string>
+  <string name="account_syncable_summary">Kontakte dieses Kontos im Telefonbuch anzeigen</string>
+  <string name="account_tls_enable">TLS verwenden</string>
+  <string name="account_tls_enable_summary">TLS Verschlüsselung für die Serververbindung verwenden (falls möglich)</string>
+  <string name="account_tls_legacy">Herkömmliches SSL</string>
+  <string name="account_tls_legacy_summary">Herkömmliche SSL-Verschlüsselung für Serververbindung verwenden</string>
+  <string name="account_tls_mode">TLS/SSL-Verschlüsselung</string>
+  <string name="account_tls_require">TLS benötigt</string>
+  <string name="account_tls_require_summary">TLS-Verschlüsselung für Verbindung zum Server benötig</string>
+  <string name="account_use_orbot">Chatten über das anonyme Netzwerk TOR und erzwingen einer TLS Verschlüsselung\nFür Google Talk nicht empfohlen</string>
+  <string name="confirm_cancellation">Willst du wirklich alle Änderungen verwerfen?</string>
+  <string name="INCORRECT_USER_NAME">Falscher Benutzername. Details siehe Hilfe unten.</string>
+  <string name="orbot_required_message">Für die Nutzung von TOR muss Orbot installiert sein und die Proxy-Verbindung darüber laufen. Möchten Sie die App von Google Play herunterladen?</string>
+  <string name="orbot_required_title">Soll Orbot installiert werden?</string>
+  <string name="ACCOUNT_REGISTER_FAILED">Benutzerkonto konnte auf Server nicht angelegt werden.</string>
+  <string name="account_color">Kontofarbe</string>
+  <string name="account_color_name_green">Grün</string>
+  <string name="account_color_name_orange">Orange</string>
+  <string name="account_color_name_red">Rot</string>
+  <string name="account_color_name_blue">Blau</string>
+  <string name="account_color_name_indigo">Indigoblau</string>
+  <string name="account_color_name_teal">Blaugrün</string>
+  <string name="account_color_name_blue_grey">Blaugrau</string>
+  <string name="account_color_name_cyan">Cyan</string>
+</resources>

app/src/main/res/values-de-rDE/account_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="account_delete_confirm">Möchtest du das Benutzerkonto %s wirklich löschen?\n(es wird nicht auf dem Server, sondern nur in Xabber gelöscht)</string>
+  <string name="account_add">Benutzerkonto hinzufügen</string>
+  <string name="account_register">Neues Benutzerkonto anlegen</string>
+  <string name="account_delete">Konto löschen</string>
+  <string name="account_editor">Benutzerkonto bearbeiten</string>
+  <string name="account_state_registration">Registrierung</string>
+  <string name="account_state_authentication">Autorisierung</string>
+  <string name="account_state_connected">Online</string>
+  <string name="account_state_connecting">Verbindung wird hergestellt</string>
+  <string name="account_state_disconnecting">Verbindung wird getrennt</string>
+  <string name="account_state_offline">Abgemeldet</string>
+  <string name="account_state_waiting">Auf Wiederverbindung warten</string>
+</resources>

app/src/main/res/values-de-rDE/chat_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="action_status_text">%1$s hat den Status geändert: %2$s</string>
+  <string name="action_status_text_none">%1$s hat den Statustext gelöscht</string>
+  <string name="action_join">%1$s hat die Konferenz betreten</string>
+  <string name="action_kick">%1$s wurde rausgeworfen</string>
+  <string name="account_is_offline">Sie sind momentan offline. Nachrichten, die Sie senden, werden erst zugestellt sobald Sie sich erneut  verbinden.</string>
+  <string name="chat_delay">gesendet um %s</string>
+  <string name="chat_input_hint">Geben Sie Ihre Nachricht hier ein</string>
+  <string name="chat_send">Senden</string>
+  <string name="clear_history">Gesprächsverlauf löschen</string>
+  <string name="contact_is_offline">Der Empfänger ist offline. Nachrichten, die Sie senden werden erst zugestellt, sobald er wieder online ist.</string>
+  <string name="ENTRY_IS_NOT_AVAILABLE">Kontakt ist nicht verfügbar</string>
+  <string name="FILE_NOT_FOUND">Datei nicht gefunden</string>
+  <string name="message_copy">Nachricht kopieren</string>
+  <string name="message_quote">Nachricht zitieren</string>
+  <string name="message_remove">Nachrichten aus dem Verlauf entfernen</string>
+  <string name="message_repeat">Erneut senden</string>
+  <string name="save_history">Gesprächsverlauf speichern\nDen Gesprächsverlauf lokal speichern</string>
+  <string name="show_history">Gesprächsverlauf anzeigen</string>
+  <string name="action_attention_called">Aufmerksamkeitswunsch wurde versandt</string>
+  <string name="action_attention_requested">Aufmerksamkeit wurde erbeten</string>
+  <string name="action_ban">%1$s wurde verbannt</string>
+  <string name="action_ban_by">%1$s wurde verbannt von %2$s</string>
+  <string name="action_invite_error">%s hat die Einladung nicht empfangen</string>
+  <string name="action_invite_sent">Einladung wurde an %s gesendet</string>
+  <string name="action_join_complete">Du bist dem Gespräch als %1$s beigetreten</string>
+  <string name="action_join_complete_to">Du bist dem Gespräch %1$s beigetreten</string>
+  <string name="action_kick_by">%1$s wurde rausgeworfen von %2$s</string>
+  <string name="action_leave">%1$s hat das Gespräch verlassen</string>
+  <string name="action_nickname">%1$s hat den Spitznamen in %2$s geändert</string>
+  <string name="action_otr_encryption">Verschlüsselung wurde aktiviert, aber der Chatpartner wurde noch nicht verifiziert. Die Verifizierung kann im OTR Menü aktiviert werden.</string>
+  <string name="action_otr_error">OTR Fehler: %1$s</string>
+  <string name="action_otr_finish">Der Chatpartner hat die Unterhaltung verlassen. Du solltest das gleiche tun oder die Unterhaltung erneut starten.</string>
+  <string name="action_otr_finished_session">Die Nachricht wurde nicht versendet. Verlasse die Unterhaltung oder starte sie neu.</string>
+  <string name="action_otr_plain">Die verschlüsselte Konversation wurde beendet.</string>
+  <string name="action_otr_smp_cheated">Der Chatpartner versuchte während der Überprüfung zu betrügen</string>
+  <string name="action_otr_smp_failed">Überprüfung fehlgeschlagen</string>
+  <string name="action_otr_smp_not_approved">Ihre Antwort auf die geheime Frage wurde verifiziert. Du solltest deinen Gesprächspartner ebenfalls fragen oder ein geteiltes Geheimnis prüfen.</string>
+  <string name="action_otr_smp_unverified">Verifikation fehlgeschlagen</string>
+  <string name="action_otr_smp_verified">Verifikation erfolgreich</string>
+  <string name="action_otr_unreadable">Die erhaltene verschlüsselte Nachricht konnte nicht gelesen werden.</string>
+  <string name="action_otr_verified">Verschlüsselung aktiviert</string>
+  <string name="action_status_available">%1$s ist online</string>
+  <string name="action_status_away">%1$s ist abwesend</string>
+  <string name="action_status_chat">%1$s bereit zum Chat</string>
+  <string name="action_status_dnd">%1$s möchte nicht gestört werden</string>
+  <string name="action_status_unavailable">%1$s ist nicht verfügbar</string>
+  <string name="action_status_xa">%1$s längere Zeit abwesend</string>
+  <string name="action_subject">%1$s hat das Thema zu %2$s geändert.</string>
+  <string name="ATTENTION_IS_NOT_SUPPORTED">Von Chatpartner nicht unterstützt oder deaktiviert</string>
+  <string name="call_attention">Aufmerksam machen</string>
+  <string name="chat_settings">Chateinstellungen</string>
+  <string name="chat_state_composing">Tippt gerade&#8230;</string>
+  <string name="chat_state_paused">Eingegebenen Text&#8230;</string>
+  <string name="chat_typed">geschrieben am %s</string>
+  <string name="export_chat">Chat exportieren</string>
+  <string name="export_chat_done">Verlauf wurde auf SD Karte exportiert</string>
+  <string name="export_chat_mask">%2$s für %1$s.html</string>
+  <string name="export_chat_send">Nach dem Export senden</string>
+  <string name="export_chat_title">Dateiname eingeben</string>
+  <string name="muc_invite">Zu Gespräch einladen</string>
+  <string name="muc_is_unavailable">Deine Nachricht kann nicht zugestellt werden. Bitte tritt dem Gespräch bei.</string>
+  <string name="occupant_list">Liste der Teilnehmer</string>
+  <string name="otr_encryption">OTR Verschlüsselung</string>
+  <string name="otr_end">Verschlüsselung beenden</string>
+  <string name="otr_refresh">Verschlüsselung aktualisieren</string>
+  <string name="otr_request">Es wurde eine private Unterhaltung durch Off-the-Record angefordert, du hast das benötigte Plugin jedoch nicht installiert. Bitte benutze Pidgin, Gajim oder Adium für PC/Mac und Xabber oder ChatSecure für Android. Weitere Informationen findest du unter http://otr.cypherpunks.ca/</string>
+  <string name="otr_start">Verschlüsselung starten</string>
+  <string name="otr_unencrypted_message">Diese Nachricht wurde nicht verschlüsselt</string>
+  <string name="otr_unreadable_message">Die verschlüsselte Nachricht, die du gesendet hast, ist nicht lesbar.</string>
+  <string name="otr_verification">OTR Verifikation</string>
+  <string name="otr_verify_fingerprint">Mittels virtuellen Fingerabdrucks verifizieren</string>
+  <string name="otr_verify_question">Mittels Frage verifizieren</string>
+  <string name="otr_verify_secret">Mittels geteiltem Geheimnis verifizieren</string>
+  <string name="recent_chats">Aktuelle Chats</string>
+  <string name="under_construction">Feature noch nicht verfügbar</string>
+  <string name="under_construction_message">Dieser Bildschirm ist noch nicht verfügbar</string>
+  <string name="chat_events_show_text_global">Voreinstellung verwenden</string>
+  <string name="chat_events_show_text_always">Nachrichtentext anzeigen</string>
+  <string name="chat_events_show_text_never">Nachrichtentext verbergen</string>
+</resources>

app/src/main/res/values-de-rDE/contact_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="contact_account">Benutzerkonto</string>
+  <string name="contact_group">Gruppen wählen</string>
+  <string name="contact_name">Alias (optional)</string>
+  <string name="contact_subscribe_confirm">Teilen Sie Ihren Kontostatus %1$s mit dem Kontakt?</string>
+  <string name="contact_user">Kontakt Benutzername</string>
+  <string name="ENTRY_IS_NOT_FOUND">Kontakt wurde nicht gefunden</string>
+  <string name="group_is_empty">Gruppenname setzen</string>
+  <string name="group_name">Gruppename</string>
+  <string name="choose_account">Bitte ein  Konto auswählen</string>
+  <string name="EMPTY_ACCOUNT">Bitte ein Konto auswählen</string>
+  <string name="add_new_group">Neue Gruppe hinzufügen&#8230;</string>
+  <string name="accept_contact">Autorisieren</string>
+  <string name="decline_contact">Verwerfen</string>
+</resources>

app/src/main/res/values-de-rDE/contact_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="accept_subscription">Kontakt bestätigen</string>
+  <string name="account_reconnect">Erneut verbinden</string>
+  <string name="application_action_disabled">Konten verwalten</string>
+  <string name="application_action_empty">Benutzerkonto hinzufügen</string>
+  <string name="application_action_no_contacts">Kontakt hinzufügen</string>
+  <string name="application_action_no_online">Offline Kontakte zeigen</string>
+  <string name="application_action_offline">Verbinden</string>
+  <string name="application_action_waiting">Wiederverbinden</string>
+  <string name="application_state_connecting">Verbinde...</string>
+  <string name="application_state_disabled">Konten deaktiviert</string>
+  <string name="application_state_empty">Kein Benutzerkonto vorhanden</string>
+  <string name="application_state_no_contacts">Keine Kontakte vorhanden</string>
+  <string name="application_state_no_online">Niemand online</string>
+  <string name="application_state_offline">Keine Kontakte online</string>
+  <string name="application_state_roster">Verbunden.</string>
+  <string name="application_state_starting">Anwendung wird gestartet... </string>
+  <string name="application_state_waiting">Warte auf Verbindung</string>
+  <string name="chat_list">Chatliste</string>
+  <string name="chat_list_is_empty">Keine aktiven Gespräche</string>
+  <string name="chat_viewer">Chat</string>
+  <string name="close_chat">Chat beenden</string>
+  <string name="CONNECTION_FAILED">Verbindungsfehler</string>
+  <string name="contact_add">Kontakt hinzufügen</string>
+  <string name="contact_delete">Kontakt löschen</string>
+  <string name="contact_delete_confirm">Möchtest du wirklich Kontakt %1$s aus dem Konto %2$s entfernen?</string>
+  <string name="contact_list">Kontakteliste</string>
+  <string name="discard_subscription">Kontakt ablehnen</string>
+  <string name="exit">Beenden</string>
+  <string name="group_active_chat">Aktive Gespräche</string>
+  <string name="group_none">Keine Gruppen</string>
+  <string name="group_remove">Gruppe löschen</string>
+  <string name="group_remove_confirm">Willst du die Gruppe %s wirklich löschen? Benutzer dieser Gruppe bleiben in der Kontaktliste.</string>
+  <string name="group_rename">Gruppe umbenennen</string>
+  <string name="NO_SUCH_ACCOUNT">Konto nicht gefunden</string>
+  <string name="NOT_CONNECTED">Verbindung nicht hergestellt</string>
+  <string name="request_subscription">Abonnement anfordern</string>
+  <string name="XMPP_EXCEPTION">Fehler im Datenstrom</string>
+  <string name="application_state_closing">Einstellungen werden gespeichert...\nDie Anwendung wird beendet.</string>
+  <string name="certificate_confirmation">%1$s.\nVertraust du dem Zertifikat mit folgendem SHA1 Fingerabdruck: %2$s vollständig?\nMöchtest du nicht über jedes Problem mit diesem Zeritifikat informiert werden?</string>
+  <string name="certificate_details">\n\nAusgestellt an:\nCommon Name (CN): %1$s\nOrganisation (O): %2$s\nOrganisationseinheit (OU): %3$s\nSeriennummer: %4$s\n\nErstellt durch:\nCommon Name (CN): %5$s\nOrganisation (O): %6$s\nOrganisationseinheit (OU): %7$s\n\nGültigkeit:\nErstellt am: %8$s\nAuflaufdatum: %9$s.</string>
+  <string name="certificate_invalid_chane">Verifizierung der Signaturkette fehlgeschlagen</string>
+  <string name="certificate_invalid_target">Ziel konnte nicht verifiziert werden</string>
+  <string name="certificate_self_signed">Selbst-signiertes Zertifikat</string>
+  <string name="certificate_show_details">Details</string>
+  <string name="close_chats">Alle Chats beenden</string>
+  <string name="contact_integration_suggest">Möchtest du Xabber in deine Kontaktliste integrieren?\nEs kann unter \"Einstellungen\" → \"XMPP Accounts\" → Dein Account → \"Integration der Kontakte\" hinzugefügt werden.\nEs ist möglich, dass die Kontakliste für ein paar Minuten langsamer reagiert.</string>
+  <string name="group_room">Konferenzen</string>
+  <string name="OTR_ERROR">OTR Fehler</string>
+  <string name="select_contact">Bitte Kontakt auswählen</string>
+  <string name="show_offline_always">Immer anzeigen</string>
+  <string name="show_offline_never">Niemals anzeigen</string>
+  <string name="show_offline_normal">Globale Einstellungen benutzen</string>
+  <string name="show_offline_settings">Offline Kontakte anzeigen</string>
+  <string name="start_at_boot_suggest">Xabber beim Start von Android starten?\nDies kann unter \"Einstellungen\" → \"Verbindungseinstellungen\" → \"Mit Android starten\" geändert werden.</string>
+  <string name="contact_search_hint">Kontakte suchen</string>
+  <string name="sender_is_you">Du</string>
+  <string name="xmpp_accounts">XMPP-Benutzerkonten</string>
+</resources>

app/src/main/res/values-de-rDE/contact_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="contact_viewer">Kontaktinformationen</string>
+  <string name="contact_viewer_client">Client</string>
+  <string name="vcard_nick_name">Nickname</string>
+  <string name="vcard_formatted_name">Formatierter Name</string>
+  <string name="vcard_prefix_name">Präfix</string>
+  <string name="vcard_given_name">Vorname</string>
+  <string name="vcard_middle_name">Zweiter Vorname</string>
+  <string name="vcard_family_name">Nachname</string>
+  <string name="vcard_suffix_name">Suffix</string>
+  <string name="vcard_birth_date">Geburtstag</string>
+  <string name="vcard_url">Internetseite</string>
+  <string name="vcard_organization">Organisation</string>
+  <string name="vcard_title">Beruf</string>
+  <string name="vcard_role">Rolle</string>
+  <string name="vcard_other">Andere Informationen</string>
+  <string name="vcard_categories">Kategorien</string>
+  <string name="vcard_decsription">Beschreibung</string>
+  <string name="vcard_note">Notizen</string>
+  <string name="vcard_address">Adresse</string>
+  <string name="vcard_address_pobox">Postfach</string>
+  <string name="vcard_address_extadr">Adresszusatz</string>
+  <string name="vcard_address_street">Strasse</string>
+  <string name="vcard_address_locality">Ort</string>
+  <string name="vcard_address_region">Bundesland</string>
+  <string name="vcard_address_pcode">PLZ</string>
+  <string name="vcard_address_ctry">Land</string>
+  <string name="vcard_telephone">Telefon</string>
+  <string name="vcard_email">E-Mail-Adresse</string>
+  <string name="vcard_type_home">Zu Hause</string>
+  <string name="vcard_type_work">Auf Arbeit</string>
+  <string name="vcard_type_postal">Postleitzahl</string>
+  <string name="vcard_type_parcel">Paketdienst</string>
+  <string name="vcard_type_dom">Inländisch</string>
+  <string name="vcard_type_intl">International</string>
+  <string name="vcard_type_pref">Bevorzugt</string>
+  <string name="vcard_type_voice">Telefon</string>
+  <string name="vcard_type_fax">Fax</string>
+  <string name="vcard_type_pager">Pager</string>
+  <string name="vcard_type_cell">Handy</string>
+  <string name="vcard_type_video">Video</string>
+  <string name="vcard_type_modem">Modem</string>
+  <string name="vcard_type_msg">Sprachmailbox</string>
+  <string name="vcard_type_internet">Internet</string>
+  <string name="please_wait">Bitte warten...</string>
+  <string name="unknown">Unbekannt</string>
+  <string name="edit_alias">Alias bearbeiten</string>
+  <string name="edit_contact_groups">Gruppen bearbeiten</string>
+  <string name="remove_contact">Kontakt löschen</string>
+</resources>

app/src/main/res/values-de-rDE/fingerprint_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="otr_fingerprint_description">Dein Chatpartner kann dir seinen virtuellen Fingerabdruck schicken, um seine Identität zu bestätigen. Für diesen Zweck sollte nicht XMPP verwendet werden.</string>
+  <string name="otr_is_verified">Dieser Kontakt ist vertrauenswürdig</string>
+  <string name="otr_local_fingerprint">Dein virtueller Fingerabdruck:</string>
+  <string name="otr_remote_fingerprint">Virtueller Fingerabdruck deines Gesprächspartners:</string>
+  <string name="otr_scan_fingerprint">QR Code von virtuellem Fingerabdruck des Gesprächspartners scannen</string>
+  <string name="otr_show_fingerprint">QR Code mit deinem virtuellem Fingerabdruck zeigen</string>
+  <string name="zxing_install_fail">Google Play nicht installiert. Bitte installiere die App Barcode Scanner manuell.</string>
+  <string name="zxing_install_message">Diese Anwendung benötigt die App Barcode Scanner. Möchtest du diese installieren?</string>
+  <string name="otr_copy_fingerprint">Virtuellen Fingerabdruck in Zwischenablage kopieren</string>
+</resources>

app/src/main/res/values-de-rDE/muc_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="EMPTY_NICK_NAME">Spitzname nicht angegeben</string>
+  <string name="EMPTY_ROOM_NAME">Konferenz nicht angegeben</string>
+  <string name="muc_join">Konferenz beitreten</string>
+  <string name="muc_nick">Spitzname</string>
+  <string name="muc_nick_hint">Dein Spitzname in der Konferenz</string>
+  <string name="muc_password">Passwort</string>
+  <string name="muc_password_hint">Kein Passwort benötigt</string>
+  <string name="muc_room">Konferenz</string>
+  <string name="muc_server">Mehrbenutzer Chat</string>
+  <string name="NICK_ALREADY_USED">Der Spitzname wird bereits verwendet</string>
+  <string name="ALREADY_IN_PROGRESS">Bereits in Arbeit</string>
+  <string name="ALREADY_JOINED">Bereits beigetreten</string>
+  <string name="muc_add">Konferenz hinzufügen</string>
+  <string name="muc_delete">Konferenz entfernen</string>
+  <string name="muc_delete_confirm">Möchtest du die Konferenz %1$s wirklich von Konto %2$s entfernen?</string>
+  <string name="muc_edit">Autorisierungseinstellungen</string>
+  <string name="muc_invite_confirm">%2$s lädt dich zur Konferenz %3$s ein. Mit Konto %1$s beitreten?</string>
+  <string name="muc_invite_confirm_reason">%2$s lädt dich zur Konferenz %3$s: \"%4$s\" ein. Mit Konto %1$s beitreten?</string>
+  <string name="muc_leave">Konferenz verlassen</string>
+  <string name="muc_save">Konferenz speichern</string>
+</resources>

app/src/main/res/values-de-rDE/notification_bar.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="account_quantity_1">Benutzerkonto</string>
+  <string name="account_quantity_2">Benutzerkonten</string>
+  <string name="account_quantity_5">-</string>
+  <string name="account_quantity_offline_1">Benutzerkonto</string>
+  <string name="account_quantity_offline_2">Benutzerkonten</string>
+  <string name="account_quantity_offline_5">-</string>
+  <string name="AUTHENTICATION_FAILED">Autorisierungsfehler</string>
+  <string name="chat_contact_quantity_1">Kontakt</string>
+  <string name="chat_contact_quantity_2">Kontakte</string>
+  <string name="chat_contact_quantity_5">Kontakte</string>
+  <string name="chat_message_quantity_1">Nachricht</string>
+  <string name="chat_message_quantity_2">Nachrichten</string>
+  <string name="chat_message_quantity_5">-</string>
+  <string name="chat_status">%1$d %2$s von %3$d %4$s</string>
+  <string name="chat_messages_from_contact">%1$d %2$s von %3$s</string>
+  <string name="chat_contact_and_message">%1$s: %2$s</string>
+  <string name="connection_state_connected_1">%1$d von %2$d %3$s online</string>
+  <string name="connection_state_connected_2">%1$d von %2$d %3$s online</string>
+  <string name="connection_state_connected_5">-</string>
+  <string name="connection_state_connecting_1">%1$d von %2$d %3$s verbinden...</string>
+  <string name="connection_state_connecting_2">%1$d von %2$d %3$s verbinden...</string>
+  <string name="connection_state_connecting_5">-</string>
+  <string name="connection_state_waiting_1">%1$d von %2$d %3$s warten auf Verbindung</string>
+  <string name="connection_state_waiting_2">%1$d von %2$d %3$s warten auf Verbindung...</string>
+  <string name="connection_state_waiting_5">-</string>
+  <string name="connection_state_offline">%1$d %2$s abwesend</string>
+  <string name="archive_available_request_message">Möchtest du deine Nachrichten auf dem Server speichern?\nDies ermöglicht Xabber deinen Verlauf auf jedem Gerät zu laden, welches diesen Account nutzt.\nDieses Feature wird zusätzliches Datenvolumen erzeugen und die Verbindungsgeschwindigkeit leicht reduzieren.\nWARNUNG: Alle lokalen Verläufe werden gelöscht.</string>
+  <string name="archive_available_request_title">Nachrichtenarchiv aktivieren?</string>
+  <string name="INVALID_CERTIFICATE">Ungültiges Zertifikat</string>
+  <string name="muc_invite_message">Möchtest du der Konferenz beitreten?</string>
+  <string name="otr_verification_in_progress">Hier klicken um abzubrechen.</string>
+  <string name="PASSWORD_REQUIRED">Kennwort erforderlich</string>
+  <string name="pay_attention">Aufmerksamkeit geben</string>
+  <string name="subscription_request_message">Autorisationsanfrage</string>
+</resources>

app/src/main/res/values-de-rDE/phrase_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="phrase_add">Satz hinzufügen</string>
+  <string name="phrase_delete">Satz löschen</string>
+  <string name="phrase_delete_confirm">Wollen Sie folgenden Begriff wirklich löschen: %s?</string>
+  <string name="phrase_empty">&lt; beliebiger Text &gt;</string>
+  <string name="phrase_group">Teil der Kontaktgruppe</string>
+  <string name="phrase_regexp">Regulärer Ausdruck</string>
+  <string name="phrase_sound">Benachrichtigungston auswählen</string>
+  <string name="phrase_text">Zu suchender Text</string>
+  <string name="phrase_user">Teil der Jabber-ID des Kontakts</string>
+</resources>

app/src/main/res/values-de-rDE/preference_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="cache_clear">Den Cache löschen\nAlle lokalen Daten löschen. Dadurch kann etwas Speicherplatz frei werden.</string>
+  <string name="cache_clear_warning">Wollen Sie wirklich den Chatverlauf und andere lokale Daten entfernen? \nAccount und Listendaten sind davon nicht betroffen. Die Anwendung wird geschlossen.</string>
+  <string name="chats_send_by_enter">Senden mit Enter\nDurch Drücken der Enter-Taste kann die Nachricht gesendet werden</string>
+  <string name="connection_go_away">Status autom. auf \"Abwesend\" ändern\nStatus automatisch auf \"Abwesend\" setzen, wenn der Bildschirm gesperrt wird</string>
+  <string name="contacts_order">Kontakteliste sortieren \nFestlegen der Reihenfolge, in welcher die Kontakte angezeigt werden</string>
+  <string name="contacts_order_alphabet">Alphabetisch</string>
+  <string name="contacts_order_status">Nach Status</string>
+  <string name="contacts_show_accounts">Nach Benutzerkonten gruppieren\nBenutzer in der Kontakteliste nach Benutzerkonten gruppieren</string>
+  <string name="contacts_show_active_chats">Aktive Chats oben\nDarstellung der aktiven Chats am Beginn der Kontaktliste</string>
+  <string name="contacts_show_avatars">Avatare zeigen\nAvatare der Benutzer in Kontaktliste zeigen</string>
+  <string name="contacts_show_empty_groups">Leere Gruppen anzeigen\nAnzeige der Gruppen ohne online Kontakte</string>
+  <string name="contacts_show_groups">Gruppen zeigen\nGruppen in der Kontaktliste zeigen</string>
+  <string name="contacts_show_offline">Offline Kontakte anzeigen</string>
+  <string name="contacts_show_panel">Konten Panel anzeigen\nAnzeigen der Aktions-Buttons mit Avatars in der unteren rechten Ecke der Kontaktliste</string>
+  <string name="contacts_stay_active_chats">Duplizieren der aktiven Chats\nAktive Chats werden sowohl am Beginn der Kontakteliste als auch in den Gruppen angezeigt</string>
+  <string name="debug_log">Debug Logging\nSchreibe Nachrichten in das Fehlerprotokoll (Um Änderungen zu aktivieren, muss die  Anwendung neugestartet werden)</string>
+  <string name="events_lightning">LED-Benachrichtigung\nLED blinkt bei Benachrichtigung</string>
+  <string name="events_persistent">Taskleisten Icon\nAnzeige einer dauerhaften Benachrichtigung. Diese Option verhindert, dass Android die Anwendung  aus dem Speicher entfernt</string>
+  <string name="events_sound">Benachrichtigungston\nBenachrichtigungston wählen</string>
+  <string name="events_vibro">Vibrationsalarm\nVibration zur Benachrichtigung</string>
+  <string name="interface_theme">Design\nDesign-Einstellungen</string>
+  <string name="interface_theme_dark">Dunkel</string>
+  <string name="interface_theme_light">Hell</string>
+  <string name="interface_theme_normal">Standard</string>
+  <string name="interface_smiles">Emoticons\nEmoticon-Einstellungen (Smileys)</string>
+  <string name="interface_smiles_android">Android Emoticons</string>
+  <string name="interface_smiles_none">keine grafischen Emoticons</string>
+  <string name="preference_connection">Verbindungseinstellungen\nVerbindungseinstellungen</string>
+  <string name="preference_contacts">Kontaktliste\nAussehen der Kontaktliste anpassen</string>
+  <string name="preference_debug">Debugging-Einstellungen\nEinstellungen, um den Entwicklern zu helfen, Xabber zu verbessern.</string>
+  <string name="preference_editor">Einstellungen</string>
+  <string name="preference_events">Benachrichtigungen\nBenachrichtigungseinstellungen</string>
+  <string name="preference_interface">Aussehen\nErscheinungsbild anpassen</string>
+  <string name="about_viewer">Über</string>
+  <string name="chats_show_background">Hintergrund anzeigen\nDas Ausschalten dieser Option kann die Leistung steigern</string>
+  <string name="chats_font_size">Schriftgröße\nGröße des Nachrichtentextes festlegen</string>
+  <string name="chats_font_size_large">Groß</string>
+  <string name="chats_font_size_normal">Normal</string>
+  <string name="chats_font_size_small">Klein</string>
+  <string name="chats_font_size_xlarge">Sehr groß</string>
+  <string name="chats_hide_keyboard">Ausblenden der Tastatur\nSoftware-Tastatur nach dem versandt der Nachricht ausblenden</string>
+  <string name="chats_hide_keyboard_landscape">Im Querformat</string>
+  <string name="chats_receipt">Nachrichten Quittierung\nSenden und Erhalten von Nachrichten Quittierungen</string>
+  <string name="chats_show_avatars">Avatare in Nachrichten\nAvatar in jeder Chat-Nachricht anzeigen</string>
+  <string name="chats_show_status_change">Statusänderungen anzeigen\nIm Chat anzeigen, wenn sich der Status eines Chatters ändert</string>
+  <string name="chats_show_status_change_muc">In Gruppenchats</string>
+  <string name="chats_state_notification">Benachrichtigung bei Eingabe\nAnzeigen, dass der andere Benutzer eine Nachricht eingibt</string>
+  <string name="connection_adjust_priority">Anpassen der Priorität\nDie Priorität entsprechend dem ausgewählten Status anpassen. Die Konto-Priorität wird überschrieben werden.</string>
+  <string name="connection_go_away_immediately">Sofort nach Bildschirmabschaltung</string>
+  <string name="connection_go_xa">\"Erweiterte Abwesenheitsnotiz\" bei Inaktivität\nSetze \"Erweiterte Abwesenheitsnotiz\" bei Display-Sperre</string>
+  <string name="connection_priority">Prioritäteinstellungen</string>
+  <string name="connection_start_at_boot">Starten nach dem Booten\nStart der Anwendung nach dem Booten von Android. Dies funktioniert nicht, wenn Xabber auf einer SD-Karte installiert ist.</string>
+  <string name="connection_wake_lock">Verhindern des Schlafmodus\nVerhindern, dass das Gerät in den Schlafmodus wechselt.Dies erhöht die Akku-Nutzung.</string>
+  <string name="connection_wifi_lock">WiFi aktiv lassen\nWiFi bleibt im Standbymodus aktiv. Dies erhöht die Akku-Nutzung</string>
+  <string name="contacts_reset_offline">Offline-Einstellungen zurücksetzen\nIndividuelle Einstellungen für Gruppen und Konten zurücksetzen.</string>
+  <string name="contacts_reset_offline_warning">Bist du sicher, dass du alle individuellen Einstellungen für Gruppen und Konten zurücksetzen willst?</string>
+  <string name="events_first_only">Alarmieren bei der ersten Nachricht\nBenachrichtigung nur bei der ersten Nachricht in einem Chat</string>
+  <string name="events_ignore_system_vibro">System-Vibrationseinstellungen ignorieren\nDiese Option verwenden, falls die Vibration nicht funktioniert</string>
+  <string name="events_message">Benachrichtigungeinstellungen\nBenachrichtigungen für eingehenden Nachricht konfigurieren</string>
+  <string name="events_message_chat">Nur Gespräche</string>
+  <string name="events_message_chat_and_muc">Gespräche und Konferenzen</string>
+  <string name="events_message_none">Nicht benachrichtigen</string>
+  <string name="events_show_text">Nachricht in der Statusleiste anzeigen\nNachricht in der Statusleiste anzeigen</string>
+  <string name="events_visible_chat">Benachrichtigung bei offenem Chat\nBenachrichtigung bei eingehender Nachricht im offenen Chat</string>
+  <string name="negative_priotiry_summary">%s (Du wirst aus keinem Chat Nachrichten erhalten)</string>
+  <string name="preference_accounts">XMPP-Konten\nKonten verwalten</string>
+  <string name="preference_security">Sicherheit\nSicherheitseinstellungen</string>
+  <string name="security_check_certificate">Server Zertifikat überprüfen\nBenachrichten, wenn Zertifikatsprobleme bei verschlüsselten Verbindungen auftreten</string>
+  <string name="security_clear_certificate">Zertifikate entfernen\nListe der ignorierten Zertifikate leeren</string>
+  <string name="security_otr_history">Verlauf speichern\nDen Chatverlauf bei OTR-Sitzungen speichern</string>
+  <string name="security_otr_mode">OTR Modus</string>
+  <string name="chats_attention">Aufmerksamkeit\nAuf eingehende Aufmerksamkeitsanforderungen reagieren</string>
+  <string name="chats_attention_sound">Aufmerksamkeitston\nAuswahl des Klingeltons</string>
+  <string name="connection_load_vcard">Lade vCard\nLaden und Aktualisieren von Kontaktdaten und Avataren. Deaktivieren, um Netzwerkverkehr zu reduzieren.</string>
+  <string name="connection_use_carbons">carbon copy Mode\nMöglicherweise instabil! Wird Sitzungen für dasselbe Konto auf diesem Client teilen. Deaktivieren, um die Datennutzung zu reduzieren.</string>
+  <string name="events_phrases">Schlüsselbegriffe\nBenachrichtigung wenn Nachrichten voreingestellte Begriffe enthalten und auswahl des dazugehörigen Klanges</string>
+  <string name="security_clear_certificate_warning">Wollen Sie wirklich alle ignorierten Zertifikate entfernen?</string>
+</resources>

app/src/main/res/values-de-rDE/secret_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="otr_answer">Geheime Antwort:</string>
+  <string name="otr_question">Geheime Frage:</string>
+  <string name="otr_question_description">Geheime Frage für gegenseitige Verifikation nutzen</string>
+  <string name="otr_secret">Geteiltes Geheimnis:</string>
+  <string name="otr_secret_description">Geteiltes Geheimnis für gegenseitige Verifikation nutzen</string>
+</resources>

app/src/main/res/values-de-rDE/status_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="available">Erreichbar</string>
+  <string name="away">Abwesend</string>
+  <string name="chat">Bereit zum Chatten!</string>
+  <string name="dnd">Nicht stören</string>
+  <string name="edit_status">Status bearbeiten</string>
+  <string name="empty_status">&lt; leerer Status &gt;</string>
+  <string name="invisible">Unsichtbar</string>
+  <string name="remove_status">Status löschen</string>
+  <string name="status_editor">Status setzen</string>
+  <string name="status_text_hint">Geben Sie die Statusmeldung ein</string>
+  <string name="unavailable">Offline</string>
+  <string name="unsubscribed">Nicht berechtigt</string>
+  <string name="xa">Abwesend für längere Zeit</string>
+  <string name="new_status">Neuer Status</string>
+  <string name="saved_statuses">Gespeicherte Status</string>
+  <string name="clear_status_history">Statusverlauf löschen</string>
+  <string name="status_message">Statusnachricht</string>
+</resources>

app/src/main/res/values-de-rDE/translation.xml

+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <bool name="is_translated">true</bool>
+</resources>
\ No newline at end of file

app/src/main/res/values-de-rDE/words.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="in10m">Nach 10 Minuten</string>
+  <string name="in15m">Nach 15 Minuten</string>
+  <string name="in1h">In einer Stunde</string>
+  <string name="in1m">Nach einer Minute</string>
+  <string name="in2m">Nach 2 Minuten</string>
+  <string name="in30m">Nach 30 Minuten</string>
+  <string name="in5m">Nach 5 Minuten</string>
+  <string name="always">Immer</string>
+  <string name="disabled">Deaktiviert</string>
+  <string name="manual">Manuell</string>
+  <string name="never">Nie</string>
+  <string name="required">Erforderlich</string>
+  <string name="auto">Automatisch</string>
+  <string name="save">Speichern</string>
+</resources>

app/src/main/res/values-es-rES/chat_viewer.xml

@@ -60,7 +60,7 @@
   <string name="export_chat_mask">%2$s en %1$s.html</string>
   <string name="export_chat_send">Enviar después de exportar</string>
   <string name="export_chat_title">Nombre de archivo:</string>
-  <string name="muc_invite">Invitarle a charlar</string>
+  <string name="muc_invite">Invitar a un contacto</string>
   <string name="muc_is_unavailable">Por favor, únete a una conversación para que tus mensajes se envíen</string>
   <string name="occupant_list">Lista de participantes</string>
   <string name="otr_encryption">Cifrado OTR</string>

app/src/main/res/values-es-rES/contact_viewer.xml

@@ -29,7 +29,6 @@
   <string name="vcard_address_ctry">País</string>
   <string name="vcard_telephone">Teléfono</string>
   <string name="vcard_email">Correo electrónico</string>
-  <string name="vcard_type">Etiquetas</string>
   <string name="vcard_type_home">Casa</string>
   <string name="vcard_type_work">Trabajo</string>
   <string name="vcard_type_postal">Código Postal</string>

app/src/main/res/values-fr-rFR/account_editor.xml

@@ -55,7 +55,7 @@
   <string name="account_use_orbot">Discuter à travers le réseau anonymisant TOR et forcer le chiffrement TLS\nDéconseillé pour Google Talk</string>
   <string name="confirm_cancellation">Êtes-vous sûr de vouloir annuler vos modifications ?</string>
   <string name="INCORRECT_USER_NAME">Identifiant incorrect. Consultez le message ci-dessous pour plus de détails.</string>
-  <string name="orbot_required_message">Pour utiliser TOR, Orbot doit être installé et activé pour relayer les communications. Voulez-vous l\'installer à partir de Google Play?</string>
+  <string name="orbot_required_message">Afin d\'utiliser TOR, Orbot doit être installé et activé pour relayer les communications. Voulez-vous l\'installer à partir de Google Play?</string>
   <string name="orbot_required_title">Installer Orbot ?</string>
   <string name="ACCOUNT_REGISTER_FAILED">L\'enregistrement sur le serveur a échoué.</string>
   <string name="account_color">Couleur du compte</string>

app/src/main/res/values-fr-rFR/chat_viewer.xml

@@ -4,20 +4,20 @@
   <string name="action_status_text">%1$s a changé de statut : %2$s</string>
   <string name="action_status_text_none">%1$s a supprimé le message de statut</string>
   <string name="action_join">%1$s a rejoint la conférence</string>
-  <string name="action_kick">%1$s a été expulsé</string>
-  <string name="account_is_offline">Vous n\'êtes pas en ligne actuellement. Vos messages seront envoyés dès que vous vous reconnecterez.</string>
+  <string name="action_kick">%1$s a été éjecté</string>
+  <string name="account_is_offline">Vous êtes hors-ligne. Vos messages seront envoyés lorsque vous serez connecté à nouveau.</string>
   <string name="chat_delay">Envoi : %s</string>
   <string name="chat_input_hint">Écrivez votre message ici</string>
   <string name="chat_send">Envoyer</string>
   <string name="clear_history">Effacer l\'historique</string>
   <string name="contact_is_offline">Votre interlocuteur n\'est pas en ligne. Il recevra vos messages à son retour.</string>
   <string name="ENTRY_IS_NOT_AVAILABLE">Le contact n\'est pas disponible</string>
-  <string name="FILE_NOT_FOUND">Fichier non trouvé</string>
+  <string name="FILE_NOT_FOUND">Fichier introuvable</string>
   <string name="message_copy">Copier</string>
   <string name="message_quote">Citer</string>
   <string name="message_remove">Supprimer de l\'historique</string>
   <string name="message_repeat">Tenter à nouveau l\'envoi</string>
-  <string name="save_history">Sauvegarder l\'historique localement\nStocker l\'historique des messages localement</string>
+  <string name="save_history">Stocker l\'historique localement\nSauvegarder l\'historique des messages localement</string>
   <string name="show_history">Afficher l\'historique</string>
   <string name="action_attention_called">Une demande d\'attention a été envoyée</string>
   <string name="action_attention_requested">Une demande d\'attention a été reçue</string>
@@ -37,7 +37,7 @@
   <string name="action_otr_plain">Vous avez quitté la conversation chiffrée</string>
   <string name="action_otr_smp_cheated">Votre interlocuteur a tenté de tricher lors de la vérification</string>
   <string name="action_otr_smp_failed">Échec de la vérification</string>
-  <string name="action_otr_smp_not_approved">Votre réponse à la question secrète a bien été vérifiée. Vous devriez la poser à votre interlocuteur.</string>
+  <string name="action_otr_smp_not_approved">Votre réponse à la question secrète a bien été vérifiée. Vous devriez également interroger votre interlocuteur ou vérifier un secret partagé.</string>
   <string name="action_otr_smp_unverified">Échec de la vérification</string>
   <string name="action_otr_smp_verified">Vérification passée avec succès</string>
   <string name="action_otr_unreadable">Le message chiffré reçu est illisible</string>
@@ -64,7 +64,7 @@
   <string name="muc_is_unavailable">Vos messages ne peuvent être délivrés. Rejoignez la discussion s\'il vous plait.</string>
   <string name="occupant_list">Liste des participants</string>
   <string name="otr_encryption">Chiffrement OTR</string>
-  <string name="otr_end">Interrompre le chiffrement</string>
+  <string name="otr_end">Arrêter le chiffrement</string>
   <string name="otr_refresh">Relancer le chiffrement</string>
   <string name="otr_request">Une conversation privée OTR (Off-The-Record) a été demandée mais vous n\'avez pas le plugin requis. Utilisez Pidgin, Gajim ou Adium sur PC / Mac, et Xabber, Conversations ou ChatSecure sur Android. Allez sur http://otr.cypherpunks.ca/ pour plus d\'informations.</string>
   <string name="otr_start">Démarrer le chiffrement</string>

app/src/main/res/values-fr-rFR/contact_editor.xml

@@ -3,10 +3,10 @@
 <resources>
   <string name="contact_account">Compte</string>
   <string name="contact_group">Sélectionner les groupes</string>
-  <string name="contact_name">Surnom (facultatif)</string>
+  <string name="contact_name">Alias (facultatif)</string>
   <string name="contact_subscribe_confirm">Partager le status de votre compte %1$s avec ce contact ?</string>
-  <string name="contact_user">Nom d\'utilisateur</string>
-  <string name="ENTRY_IS_NOT_FOUND">Contact non trouvé</string>
+  <string name="contact_user">Identifiant du contact</string>
+  <string name="ENTRY_IS_NOT_FOUND">Contact introuvable</string>
   <string name="group_is_empty">Définir le nom du groupe</string>
   <string name="group_name">Nom du groupe</string>
   <string name="choose_account">Choisir un compte</string>

app/src/main/res/values-fr-rFR/contact_list.xml

@@ -7,19 +7,19 @@
   <string name="application_action_empty">Ajouter un compte</string>
   <string name="application_action_no_contacts">Ajouter un contact</string>
   <string name="application_action_no_online">Afficher les contacts hors ligne</string>
-  <string name="application_action_offline">Passer En ligne</string>
+  <string name="application_action_offline">Se connecter</string>
   <string name="application_action_waiting">Reconnecter</string>
-  <string name="application_state_connecting">Connexion....</string>
+  <string name="application_state_connecting">Connexion en cours&#8230;</string>
   <string name="application_state_disabled">Comptes désactivés</string>
   <string name="application_state_empty">Vous n\'avez aucun compte</string>
   <string name="application_state_no_contacts">Vous n\'avez pas de contacts</string>
-  <string name="application_state_no_online">Aucune personne en ligne</string>
+  <string name="application_state_no_online">Personne n\'est en ligne</string>
   <string name="application_state_offline">Pas de compte en ligne</string>
   <string name="application_state_roster">Connecté.</string>
   <string name="application_state_starting">Démarrage de l\'application... </string>
   <string name="application_state_waiting">En attente de connexion...</string>
   <string name="chat_list">Liste des conversations</string>
-  <string name="chat_list_is_empty">Pas de conversations active</string>
+  <string name="chat_list_is_empty">Pas de conversation active</string>
   <string name="chat_viewer">Conversation</string>
   <string name="close_chat">Fermer cette conversation</string>
   <string name="CONNECTION_FAILED">Erreur de connexion</string>
@@ -34,27 +34,27 @@
   <string name="group_remove">Supprimer le groupe</string>
   <string name="group_remove_confirm">Souhaitez-vous vraiment supprimer le groupe %s ? Les utilisateurs de ce groupe resteront dans votre liste de contacts</string>
   <string name="group_rename">Renommer le groupe</string>
-  <string name="NO_SUCH_ACCOUNT">Compte non trouvé</string>
+  <string name="NO_SUCH_ACCOUNT">Compte introuvable</string>
   <string name="NOT_CONNECTED">Connexion non établie</string>
   <string name="request_subscription">Demande de souscription</string>
   <string name="XMPP_EXCEPTION">Erreur de flux</string>
   <string name="application_state_closing">Enregistrement des modifications...\nL\'application va être fermée sous peu.</string>
-  <string name="certificate_confirmation">%1$s.\nAvez-vous tout à fait confiance dans ce certificat ayant l\'empreinte sha1: %2$s? Voulez-vous ne plus être informé des problèmes concernant ce certificat?</string>
-  <string name="certificate_details">\n\nÉmis pour:\nNom commun (CN): %1$s\nOrganisation (O): %2$s\nUnité d\'organisation (OU): %3$s\nNuméro de série: %4$s\n\nÉmis par:\nNom commun (CN): %5$s\nOrganisation (O): %6$s\nUnité d\'organisation (OU): %7$s\n\nValidité:\nÉmis le: %8$s\nExpire le: %9$s.</string>
+  <string name="certificate_confirmation">%1$s.\nÊtes-vous tout à fait sûr de faire confiance au certificat ayant l\'empreinte sha1 %2$s ? Voulez-vous ne plus être informé des problèmes concernant ce certificat ?</string>
+  <string name="certificate_details">\n\nÉmis pour :\nNom commun (CN) : %1$s\nOrganisation (O) : %2$s\nUnité d\'organisation (OU) : %3$s\nNuméro de série : %4$s\n\nÉmis par :\nNom commun (CN) : %5$s\nOrganisation (O) : %6$s\nUnité d\'organisation (OU) : %7$s\n\nValidité :\nÉmis le : %8$s\nExpire le : %9$s</string>
   <string name="certificate_invalid_chane">La vérification de la chaîne des signatures a échoué</string>
   <string name="certificate_invalid_target">La vérification de la cible a échoué</string>
   <string name="certificate_self_signed">Certificat auto-signé</string>
   <string name="certificate_show_details">Détails...</string>
   <string name="close_chats">Fermer toutes les conversations</string>
-  <string name="contact_integration_suggest">Voulez-vous que Xabber soit intégré dans le gestionnaire de contacts du système ?\nCeci peut être changé dans \"Paramètres\" → \"Compte XMPP\" → Votre compte → \"Intégration des contacts\".\nNB: La liste des contacts peut devenir plus lente pendant quelques minutes.</string>
+  <string name="contact_integration_suggest">Voulez-vous que Xabber soit intégré dans le gestionnaire de contacts du système ?\nCeci peut être changé dans \"Paramètres\" → \"Comptes XMPP\" → Votre compte → \"Intégration des contacts\".\nNote : La liste des contacts peut être ralentie pendant quelques minutes.</string>
   <string name="group_room">Conférences</string>
   <string name="OTR_ERROR">Erreur OTR</string>
-  <string name="select_contact">Merci de cliquer pour sélectionner le contact</string>
-  <string name="show_offline_always">Toujours afficher les contacts hors ligne</string>
+  <string name="select_contact">Appuyez pour sélectionner le contact</string>
+  <string name="show_offline_always">Toujours afficher</string>
   <string name="show_offline_never">Masquer les contacts hors ligne</string>
   <string name="show_offline_normal">Utiliser les paramètres généraux</string>
   <string name="show_offline_settings">Afficher les contacts hors ligne</string>
-  <string name="start_at_boot_suggest">Voulez-vous lancer Xabber au démarrage ?\nCeci peut être changé via \"Paramètres\" → \"Paramètres de connexion\" → \"Lancer au démarrage\"</string>
+  <string name="start_at_boot_suggest">Voulez-vous lancer Xabber au démarrage ?\nCeci peut être changé via \"Paramètres\" → \"Paramètres de connexion\" → \"Démarrer avec Android\"</string>
   <string name="contact_search_hint">Chercher contacts</string>
   <string name="sender_is_you">Vous </string>
   <string name="xmpp_accounts">Comptes XMPP</string>

app/src/main/res/values-fr-rFR/contact_viewer.xml

@@ -6,8 +6,8 @@
   <string name="vcard_nick_name">Surnom</string>
   <string name="vcard_formatted_name">Nom formaté</string>
   <string name="vcard_prefix_name">Titre</string>
-  <string name="vcard_given_name">Surnom</string>
-  <string name="vcard_middle_name">Second prénom</string>
+  <string name="vcard_given_name">Prénom</string>
+  <string name="vcard_middle_name">Deuxième prénom</string>
   <string name="vcard_family_name">Nom de famille</string>
   <string name="vcard_suffix_name">Suffixe</string>
   <string name="vcard_birth_date">Anniversaire</string>
@@ -20,19 +20,18 @@
   <string name="vcard_decsription">Description</string>
   <string name="vcard_note">Notes</string>
   <string name="vcard_address">Adresse</string>
-  <string name="vcard_address_pobox">CP</string>
+  <string name="vcard_address_pobox">Boîte postale</string>
   <string name="vcard_address_extadr">Adresse étendue</string>
   <string name="vcard_address_street">Rue</string>
-  <string name="vcard_address_locality">Localité</string>
+  <string name="vcard_address_locality">Ville</string>
   <string name="vcard_address_region">Région</string>
   <string name="vcard_address_pcode">Code Postal</string>
   <string name="vcard_address_ctry">Pays</string>
   <string name="vcard_telephone">Téléphone</string>
-  <string name="vcard_email">Courrier Électronique</string>
-  <string name="vcard_type">Étiquettes</string>
+  <string name="vcard_email">Courriel</string>
   <string name="vcard_type_home">Domicile</string>
   <string name="vcard_type_work">Travail</string>
-  <string name="vcard_type_postal">Code postal</string>
+  <string name="vcard_type_postal">Postal</string>
   <string name="vcard_type_parcel">Colis</string>
   <string name="vcard_type_dom">Domicile</string>
   <string name="vcard_type_intl">International</string>

app/src/main/res/values-fr-rFR/fingerprint_viewer.xml

@@ -3,11 +3,11 @@
 <resources>
   <string name="otr_fingerprint_description">Votre interlocuteur ne peut fournir son empreinte, vous pouvez la comparer méticuleusement pour être sûr qu\'il est bien celui que vous pensez. Vous ne devriez pas utiliser le chat XMPP à cet effet.</string>
   <string name="otr_is_verified">Ce contact est digne de confiance</string>
-  <string name="otr_local_fingerprint">Votre empreinte:</string>
-  <string name="otr_remote_fingerprint">L\'empreinte de votre interlocuteur:</string>
-  <string name="otr_scan_fingerprint">Scanner le QR code de votre interlocuteur</string>
-  <string name="otr_show_fingerprint">Afficher le QR code de votre empreinte</string>
-  <string name="zxing_install_fail">Google Play ne semble pas installé. Merci d\'installer Barcode Scanner manuellement</string>
-  <string name="zxing_install_message">Cette application nécessite Barcode Scanner. Voulez-vous l\'installer?</string>
+  <string name="otr_local_fingerprint">Votre empreinte :</string>
+  <string name="otr_remote_fingerprint">L\'empreinte de votre interlocuteur :</string>
+  <string name="otr_scan_fingerprint">Scanner le code QR de votre interlocuteur</string>
+  <string name="otr_show_fingerprint">Afficher le code QR de votre empreinte</string>
+  <string name="zxing_install_fail">Google Play ne semble pas installé. Merci d\'installer Barcode Scanner manuellement.</string>
+  <string name="zxing_install_message">Cette application nécessite Barcode Scanner. Voulez-vous l\'installer ?</string>
   <string name="otr_copy_fingerprint">Copier votre empreinte dans le presse-papier</string>
 </resources>

app/src/main/res/values-fr-rFR/muc_editor.xml

 <?xml version="1.0" encoding="utf-8"?>
 <!--Generated by crowdin.com-->
 <resources>
-  <string name="EMPTY_NICK_NAME">Pseudo non spécifié</string>
-  <string name="EMPTY_ROOM_NAME">Conférence non spécifiée</string>
+  <string name="EMPTY_NICK_NAME">Pseudo manquant</string>
+  <string name="EMPTY_ROOM_NAME">Conférence manquante</string>
   <string name="muc_join">Rejoindre une conférence</string>
   <string name="muc_nick">Pseudo</string>
   <string name="muc_nick_hint">Votre pseudo dans la conférence</string>
   <string name="muc_password">Mot de passe</string>
   <string name="muc_password_hint">le mot de passe n\'est pas requis</string>
   <string name="muc_room">Conférence</string>
-  <string name="muc_server">Serveur de discussions multi-utilisateur</string>
+  <string name="muc_server">Serveur de discussions multi-utilisateur (MUC)</string>
   <string name="NICK_ALREADY_USED">Pseudo déjà utilisé</string>
   <string name="ALREADY_IN_PROGRESS">Déjà en cours</string>
   <string name="ALREADY_JOINED">Déjà rejointe</string>
   <string name="muc_add">Ajouter une conférence</string>
   <string name="muc_delete">Retirer la conférence</string>
-  <string name="muc_delete_confirm">Souhaitez-vous vraiment retirer la conférence %1$s du compte %2$s</string>
+  <string name="muc_delete_confirm">Êtes-vous sûr de vouloir retirer la conférence %1$s du compte %2$s ?</string>
   <string name="muc_edit">Paramètres d\'autorisation</string>
-  <string name="muc_invite_confirm">%2$s vous a invité à rejoindre la conférence %3$s. La rejoindre avec le compte %1$s?</string>
-  <string name="muc_invite_confirm_reason">%2$s vous a invité à rejoindre la conférence %3$s: %4$s. La rejoindre avec le compte %1$s?</string>
+  <string name="muc_invite_confirm">%2$s vous a invité à rejoindre la conférence %3$s. La rejoindre avec le compte %1$s ?</string>
+  <string name="muc_invite_confirm_reason">%2$s vous a invité à rejoindre la conférence %3$s : %4$s. La rejoindre avec le compte %1$s ?</string>
   <string name="muc_leave">Quitter la conférence</string>
   <string name="muc_save">Enregistrer la conférence</string>
 </resources>

app/src/main/res/values-fr-rFR/preference_editor.xml

@@ -4,7 +4,7 @@
   <string name="cache_clear">Vider le cache\nSupprime toutes les données locales. Peut libérer de l\'espace.</string>
   <string name="cache_clear_warning">Êtes-vous sûr de vouloir supprimer les historiques des conversations et autres données locales ?\nLes paramètres des comptes et les listes de contacts ne seront pas affectés. L\'application sera fermée.</string>
   <string name="chats_send_by_enter">Entrée pour envoyer\nAppuyer sur Entrée pour envoyer un message</string>
-  <string name="connection_go_away">Non Disponible Automatique\nPasse le statut à non disponible automatiquement au verrouillage de l\'écran</string>
+  <string name="connection_go_away">Absence automatique\nPasser au statut \"Absent\" au verrouillage de l\'écran</string>
   <string name="contacts_order">Trier les contacts\nChoisir l\'ordre d\'affichage des contacts</string>
   <string name="contacts_order_alphabet">Alphabétique</string>
   <string name="contacts_order_status">Par statut</string>
@@ -50,7 +50,7 @@
   <string name="chats_state_notification">Afficher notification d\'écriture\nNotifier que l\'interlocuteur est en train d\'écrire</string>
   <string name="connection_adjust_priority">Ajuster la priorité\nModifier la priorité en fonction du statut. Ce paramètre l\'emportera sur la priorité globale du compte.</string>
   <string name="connection_go_away_immediately">Immédiatement au verrouillage d\'écran</string>
-  <string name="connection_go_xa">\"Absence prolongée\" en cas d\'inactivité\nPasser en \"Absence prolongée\" lorsque l\'écran est vérouillé</string>
+  <string name="connection_go_xa">Absence prolongée en cas d\'inactivité\nPasser en absence prolongée au verrouillage de l\'écran</string>
   <string name="connection_priority">Configuration de la priorité</string>
   <string name="connection_start_at_boot">Démarrer avec Android\nL\'application sera lancée au démarrage d\'Android. Ne fonctionne pas quand Xabber est installé sur une carte SD.</string>
   <string name="connection_wake_lock">Empêcher la mise en veille\nEmpêcher l\'appareil de se mettre veille. Décharge la batterie plus rapidement.</string>

app/src/main/res/values-fr-rFR/status_editor.xml

@@ -9,13 +9,13 @@
   <string name="empty_status">&lt;Pas de message&gt;</string>
   <string name="invisible">Invisible</string>
   <string name="remove_status">Supprimer le statut</string>
-  <string name="status_editor">Paramétrer Statut</string>
+  <string name="status_editor">Définir le statut</string>
   <string name="status_text_hint">Écrire message de statut</string>
   <string name="unavailable">Hors ligne</string>
-  <string name="unsubscribed">Non autorisé</string>
+  <string name="unsubscribed">Autorisation refusée</string>
   <string name="xa">Absent depuis un moment</string>
   <string name="new_status">Nouveau statut</string>
   <string name="saved_statuses">Statuts enregistrés</string>
   <string name="clear_status_history">Effacer l\'historique des status</string>
-  <string name="status_message">Message de statut</string>
+  <string name="status_message">Message d\'état</string>
 </resources>

app/src/main/res/values-ja-rJP/contact_viewer.xml

@@ -29,7 +29,6 @@
   <string name="vcard_address_ctry">国</string>
   <string name="vcard_telephone">電話</string>
   <string name="vcard_email">メール</string>
-  <string name="vcard_type">ラベル</string>
   <string name="vcard_type_home">自宅</string>
   <string name="vcard_type_work">会社</string>
   <string name="vcard_type_postal">郵便</string>

app/src/main/res/values-ru-rRU/contact_viewer.xml

@@ -29,7 +29,6 @@
   <string name="vcard_address_ctry">Страна</string>
   <string name="vcard_telephone">Телефон</string>
   <string name="vcard_email">Эл. почта</string>
-  <string name="vcard_type">Метки</string>
   <string name="vcard_type_home">Домашний</string>
   <string name="vcard_type_work">Рабочий</string>
   <string name="vcard_type_postal">Почтовый</string>

app/src/main/res/values-sr/account_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="account_compression">Користи компресију</string>
+  <string name="account_enabled">Омогућен</string>
+  <string name="account_host">Домаћин</string>
+  <string name="account_password">Лозинка</string>
+  <string name="confirm_password">Потврда лозинке</string>
+  <string name="account_port">Порт</string>
+  <string name="account_priority">Приоритет</string>
+  <string name="account_resource">Ресурс</string>
+  <string name="account_server_name">Сервер</string>
+  <string name="account_type">Тип налога</string>
+  <string name="account_type_hints_gtalk">корисничко име за gmail.com или Google Apps домен</string>
+  <string name="account_type_helps_gtalk">Ако немате Гугл налог можете да га направите на http://mail.google.com\nТакође можете да користите vase_korisnicko_ime@vas_google_domen</string>
+  <string name="account_type_helps_xmpp">Сазнајте више о ИксМПП (Џаберу) овде: https://xmpp.org</string>
+  <string name="account_user_name">Корисничко име</string>
+  <string name="EMPTY_SERVER_NAME">Није наведено име сервера</string>
+  <string name="EMPTY_USER_NAME">Није наведено корисничко име</string>
+  <string name="CONFIRM_PASSWORD">Лозинке се не поклапају</string>
+  <string name="account_archive_mode">Складишти историјат порука</string>
+  <string name="account_archive_mode_available">на серверу ако је могуће</string>
+  <string name="account_archive_mode_dont_store">не складишти</string>
+  <string name="account_archive_mode_local">локално на уређају</string>
+  <string name="account_archive_mode_server">на серверу</string>
+  <string name="account_archive_mode_unread">локално, непослате и непрочитане</string>
+  <string name="account_compression_summary">Укључује компресију података</string>
+  <string name="account_custom">Прилагођени домаћин</string>
+  <string name="account_custom_summary">Користи посебне поставке домаћина уместо СРВ записа</string>
+  <string name="account_enabled_summary">Кликните да омогућите налог</string>
+  <string name="account_invalid_port">Порт мора бити број (подразумевано: 5222)</string>
+  <string name="account_invalid_priority">Приоритет мора бити број између -128 и 128 (подразумевано: 10)</string>
+  <string name="account_oauth">Овлашћење</string>
+  <string name="account_oauth_invalidated">Без овлашћења</string>
+  <string name="account_oauth_summary">ОАут поставке</string>
+  <string name="account_proxy_host">Домаћин проксија</string>
+  <string name="account_proxy_password">Лозинка проксија</string>
+  <string name="account_proxy_port">Порт проксија</string>
+  <string name="account_proxy_type">Тип проксија</string>
+  <string name="account_proxy_type_none">Онемогућен</string>
+  <string name="account_proxy_user">Корисник проксија</string>
+  <string name="account_sasl">Користи САСЛ аутентификацију (подразумевано)</string>
+  <string name="account_sasl_summary">Искључите за старије сервере</string>
+  <string name="account_store_password">Запамти лозинку</string>
+  <string name="account_store_password_summary">Искључите ову опцију да би се лозинка тражила сваки пут кад се повезујете</string>
+  <string name="account_syncable">Интеграција са системским контактима</string>
+  <string name="account_syncable_summary">Прикажи контакте из овог налога у системској листи контаката</string>
+  <string name="account_tls_enable">Омогући ТЛС</string>
+  <string name="account_tls_enable_summary">Користи ТЛС шифровање при повезивању кад је могуће</string>
+  <string name="account_tls_legacy">Застарели ССЛ</string>
+  <string name="account_tls_legacy_summary">Користи застарело ССЛ шифровање при повезивању кад је могуће</string>
+  <string name="account_tls_mode">Употреба ТЛС/ССЛ</string>
+  <string name="account_tls_require">Захтевај ТЛС</string>
+  <string name="account_tls_require_summary">Захтевај ТЛС шифровање при повезивању са сервером</string>
+  <string name="account_use_orbot">Ћаскање преко ТОР анонимне мреже и присила ТЛС криптографског протокола\nНије препоручиво за Гугл Talk</string>
+  <string name="confirm_cancellation">Желите ли заиста да одбаците све измене?</string>
+  <string name="INCORRECT_USER_NAME">Неисправно корисничко име. За детаље погледајте помоћ испод.</string>
+  <string name="orbot_required_message">Да бисте користили ТОР посредника морате имати инсталиран Орбот и активиран прокси саобраћај кроз њега. Желите ли да га инсталирате са Гугл Плеја?</string>
+  <string name="orbot_required_title">Инсталирати Орбот?</string>
+  <string name="ACCOUNT_REGISTER_FAILED">Неуспех регистровања налога на серверу.</string>
+  <string name="account_color">Боја налога</string>
+  <string name="account_color_name_green">Зелена</string>
+  <string name="account_color_name_orange">Наранџаста</string>
+  <string name="account_color_name_red">Црвена</string>
+  <string name="account_color_name_blue">Плава</string>
+  <string name="account_color_name_indigo">Индиго</string>
+  <string name="account_color_name_teal">Плавозелена</string>
+  <string name="account_color_name_blue_grey">Плавосива</string>
+  <string name="account_color_name_cyan">Цијан</string>
+</resources>

app/src/main/res/values-sr/account_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="account_delete_confirm">Заиста желите да обришете налог %s?\n(Неће бити обрисан са сервера, само из Ксабера.)</string>
+  <string name="account_add">Додај налог</string>
+  <string name="account_register">Региструј нови налог</string>
+  <string name="account_delete">Обриши налог</string>
+  <string name="account_editor">Уреди налог</string>
+  <string name="account_state_registration">Региструјем</string>
+  <string name="account_state_authentication">Пријављујем се</string>
+  <string name="account_state_connected">Повезан</string>
+  <string name="account_state_connecting">Повезујем се</string>
+  <string name="account_state_disconnecting">Прекидам везу</string>
+  <string name="account_state_offline">Неповезан</string>
+  <string name="account_state_waiting">Чекам поновно повезивање</string>
+</resources>

app/src/main/res/values-sr/chat_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="action_status_text">%1$s промени стање: %2$s</string>
+  <string name="action_status_text_none">%1$s очисти поруку стања</string>
+  <string name="action_join">%1$s се придружи конференцији</string>
+  <string name="action_kick">корисник %1$s је избачен</string>
+  <string name="account_is_offline">Тренутно сте ван везе. Поруке које пошаљете биће испоручене када се повежете следећи пут.</string>
+  <string name="chat_delay">послато у %s</string>
+  <string name="chat_input_hint">овде унесите вашу поруку</string>
+  <string name="chat_send">Пошаљи</string>
+  <string name="clear_history">Очисти историјат</string>
+  <string name="contact_is_offline">Прималац је ван везе. Поруке које пошаљете биће испоручене када се врати на везу.</string>
+  <string name="ENTRY_IS_NOT_AVAILABLE">Контакт није доступан</string>
+  <string name="FILE_NOT_FOUND">Фајл није нађен</string>
+  <string name="message_copy">Копирај</string>
+  <string name="message_quote">Цитирај</string>
+  <string name="message_remove">Уклони из историјата</string>
+  <string name="message_repeat">Поново покушај слање</string>
+  <string name="save_history">Сачувај историјат локално\nИсторијат порука се чува локално</string>
+  <string name="show_history">Прикажи историјат</string>
+  <string name="action_attention_called">Позив за пажњу је послат</string>
+  <string name="action_attention_requested">Тражена је пажња</string>
+  <string name="action_ban">корисник %1$s је блокиран</string>
+  <string name="action_ban_by">%2$s блокира %1$s</string>
+  <string name="action_invite_error">Позивницу не прими %s</string>
+  <string name="action_invite_sent">Позивница је послата кориснику %s</string>
+  <string name="action_join_complete">Придружили сте се ћаскању као %1$s</string>
+  <string name="action_join_complete_to">Придружили сте се ћаскању %1$s</string>
+  <string name="action_kick_by">%2$s избаци %1$s</string>
+  <string name="action_leave">%1$s напусти ћаскање</string>
+  <string name="action_nickname">%1$s промени надимак у %2$s</string>
+  <string name="action_otr_encryption">Шифровање је укључено али овај контакт није проверен. Можете да га проверите из ОТР менија за шифровање.</string>
+  <string name="action_otr_error">ОТР грешка: %1$s</string>
+  <string name="action_otr_finish">Саговорник је напустио разговор. Учините исто или га поново покрените.</string>
+  <string name="action_otr_finished_session">Ваша порука није послата. Напустите разговор или га поново покрените.</string>
+  <string name="action_otr_plain">Напустили сте шифровану преписку</string>
+  <string name="action_otr_smp_cheated">Саговорник је покушао да вара током провере</string>
+  <string name="action_otr_smp_failed">Проверавање није успело</string>
+  <string name="action_otr_smp_not_approved">Ваш одговор на тајно питање је проверен. Можете и ви питати вашег саговорника или проверити дељену тајну.</string>
+  <string name="action_otr_smp_unverified">Проверавање није успело</string>
+  <string name="action_otr_smp_verified">Проверавање завршено успешно</string>
+  <string name="action_otr_unreadable">Примљена шифрована порука је нечитљива</string>
+  <string name="action_otr_verified">Шифровање је укључено</string>
+  <string name="action_status_available">%1$s је сад на вези</string>
+  <string name="action_status_away">%1$s је сад одсутан</string>
+  <string name="action_status_chat">%1$s слободан за ћаскање</string>
+  <string name="action_status_dnd">%1$s моли да се не узнемирава</string>
+  <string name="action_status_unavailable">корисник %1$s није недоступан</string>
+  <string name="action_status_xa">корисник %1$s је одсутан дуже време</string>
+  <string name="action_subject">%1$s измени тему у: %2$s</string>
+  <string name="ATTENTION_IS_NOT_SUPPORTED">Контакт не подржава или је искључио пажњу</string>
+  <string name="call_attention">Позив за пажњу</string>
+  <string name="chat_settings">Поставке ћаскања</string>
+  <string name="chat_state_composing">Куца&#8230;</string>
+  <string name="chat_state_paused">Уноси текст&#8230;</string>
+  <string name="chat_typed">откуцано %s</string>
+  <string name="export_chat">Извези ћаскање</string>
+  <string name="export_chat_done">Историјат је извезен на СД картицу</string>
+  <string name="export_chat_mask">%2$s за %1$s.html</string>
+  <string name="export_chat_send">Пошаљи након извоза</string>
+  <string name="export_chat_title">Унесите назив фајла</string>
+  <string name="muc_invite">Позови у ћаскање</string>
+  <string name="muc_is_unavailable">Ваша порука се не може испоручити. Придружите се ћаскању</string>
+  <string name="occupant_list">Листа присутних</string>
+  <string name="otr_encryption">ОТР шифровање</string>
+  <string name="otr_end">Заустави шифровање</string>
+  <string name="otr_refresh">Поново почни шифровање</string>
+  <string name="otr_request">Поверљива (ОТР) лична преписка се захтева од вас али немате могућности за то. Користите Пиџин, Гаџим или Адијум за рачунар и Ксабер, Конверзацију или Сигурно ћаскање за Андроид. Посетите http://otr.cypherpunks.ca/ за више података.</string>
+  <string name="otr_start">Почни шифровање</string>
+  <string name="otr_unencrypted_message">Ова порука није шифрована</string>
+  <string name="otr_unreadable_message">Шифрована порука коју сте послали није читљива</string>
+  <string name="otr_verification">ОТР потврђивање</string>
+  <string name="otr_verify_fingerprint">Провери помоћу отиска</string>
+  <string name="otr_verify_question">Провери помоћу питања</string>
+  <string name="otr_verify_secret">Провери помоћу заједничке тајне</string>
+  <string name="recent_chats">Недавне преписке</string>
+  <string name="under_construction">У изградњи</string>
+  <string name="under_construction_message">Овај екран је у изградњи</string>
+  <string name="chat_events_show_text_global">Користи опште поставке</string>
+  <string name="chat_events_show_text_always">Прикажи текст поруке</string>
+  <string name="chat_events_show_text_never">Сакриј текст поруке</string>
+</resources>

app/src/main/res/values-sr/contact_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="contact_account">Налог</string>
+  <string name="contact_group">Изаберите групе</string>
+  <string name="contact_name">Псеудоним (необавезно)</string>
+  <string name="contact_subscribe_confirm">Делите стање налога %1$s са особом?</string>
+  <string name="contact_user">Корисничко име контакта</string>
+  <string name="ENTRY_IS_NOT_FOUND">Контакт није нађен</string>
+  <string name="group_is_empty">Постави назив групе</string>
+  <string name="group_name">Назив групе</string>
+  <string name="choose_account">Изаберите налог</string>
+  <string name="EMPTY_ACCOUNT">Изаберите налог</string>
+  <string name="add_new_group">Додај нову групу&#8230;</string>
+  <string name="accept_contact">Одобри</string>
+  <string name="decline_contact">Одбаци</string>
+</resources>

app/src/main/res/values-sr/contact_list.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="accept_subscription">Прихвати контакт</string>
+  <string name="account_reconnect">Повежи се поново</string>
+  <string name="application_action_disabled">Управљај налозима</string>
+  <string name="application_action_empty">Додајте налог</string>
+  <string name="application_action_no_contacts">Додај контакт</string>
+  <string name="application_action_no_online">Прикажи неповезане контакте</string>
+  <string name="application_action_offline">Повежи се</string>
+  <string name="application_action_waiting">Повежи се поново</string>
+  <string name="application_state_connecting">Повезујем се...</string>
+  <string name="application_state_disabled">Налог је онемогућен</string>
+  <string name="application_state_empty">Немате ниједан налог</string>
+  <string name="application_state_no_contacts">Немате ниједан контакт</string>
+  <string name="application_state_no_online">Нема никог на вези</string>
+  <string name="application_state_offline">Нема повезаних налога</string>
+  <string name="application_state_roster">Повезан.</string>
+  <string name="application_state_starting">Покрећем апликацију... </string>
+  <string name="application_state_waiting">Чекам везу...</string>
+  <string name="chat_list">Списак преписки</string>
+  <string name="chat_list_is_empty">Нема активних преписки</string>
+  <string name="chat_viewer">Ћаскање</string>
+  <string name="close_chat">Затвори ћаскање</string>
+  <string name="CONNECTION_FAILED">Грешка при повезивању</string>
+  <string name="contact_add">Додај контакт</string>
+  <string name="contact_delete">Обриши</string>
+  <string name="contact_delete_confirm">Желите ли заиста да обришете контакт %1$s са налога %2$s?</string>
+  <string name="contact_list">Списак контаката</string>
+  <string name="discard_subscription">Одбиј контакт</string>
+  <string name="exit">Изађи</string>
+  <string name="group_active_chat">Активне преписке</string>
+  <string name="group_none">Нема група</string>
+  <string name="group_remove">Обриши групу</string>
+  <string name="group_remove_confirm">Желите ли заиста да обришете групу %s? Корисници из ове групе ће остати на списку контаката.</string>
+  <string name="group_rename">Преименуј групу</string>
+  <string name="NO_SUCH_ACCOUNT">Налог није нађен</string>
+  <string name="NOT_CONNECTED">Веза није успостављена</string>
+  <string name="request_subscription">Затражи претплату</string>
+  <string name="XMPP_EXCEPTION">Грешка тока</string>
+  <string name="application_state_closing">Уписујем измене&#8230;\nАпликација ће да се затвори ускоро.</string>
+  <string name="certificate_confirmation">%1$s.\nДа ли у потпуности имате поуздања у сертификат сха1 отиска: %2$s? Желите ли да вас се не обавештава о овом проблему са овим сертификатом?</string>
+  <string name="certificate_details">\n\nИздат за:\nУобичајени назив (CN): %1$s\nОрганизација (O): %2$s\nОрганизациона јединица (OU): %3$s\nСеријски број: %4$s\n\nИздавач:\nУобичајени назив (CN): %5$s\nОрганизација (O): %6$s\nОрганизациона јединица (OU): %7$s\n\nВажност:\nИздат: %8$s\nИстиче: %9$s.</string>
+  <string name="certificate_invalid_chane">Потврђивање потписа ланца није успело</string>
+  <string name="certificate_invalid_target">Потврђивање мете није успело</string>
+  <string name="certificate_self_signed">Самопотписан сертификат</string>
+  <string name="certificate_show_details">Детаљи...</string>
+  <string name="close_chats">Затвори све преписке</string>
+  <string name="contact_integration_suggest">Желите ли да се Ксабер интегрише у системске контакте?\nОво се може изменити у „Поставке“ → „ИксМПП налози“ → Ваш налог → „Интеграција контаката“.\nНапомена: Листање системских контаката биће спорије неколико минута.</string>
+  <string name="group_room">Групна ћаскања</string>
+  <string name="OTR_ERROR">ОТР грешка</string>
+  <string name="select_contact">Тапните за избор контакта</string>
+  <string name="show_offline_always">увек прикажи</string>
+  <string name="show_offline_never">никад не приказуј</string>
+  <string name="show_offline_normal">користи опште поставке</string>
+  <string name="show_offline_settings">Прикажи неповезане контакте</string>
+  <string name="start_at_boot_suggest">Желите ли покретати Ксабер при дизању система?\nМожете да измените ово у \"Поставке\" → \"Поставке везе\" → \"Покрени при подизању система\"</string>
+  <string name="contact_search_hint">Тражи контакте</string>
+  <string name="sender_is_you">Ви</string>
+  <string name="xmpp_accounts">ИксМПП налози</string>
+</resources>

app/src/main/res/values-sr/contact_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="contact_viewer">Подаци о контакту</string>
+  <string name="contact_viewer_client">Клијент</string>
+  <string name="vcard_nick_name">Надимак</string>
+  <string name="vcard_formatted_name">Уобличено име</string>
+  <string name="vcard_prefix_name">Префикс</string>
+  <string name="vcard_given_name">Име</string>
+  <string name="vcard_middle_name">Средње име</string>
+  <string name="vcard_family_name">Презиме</string>
+  <string name="vcard_suffix_name">Суфикс имена</string>
+  <string name="vcard_birth_date">Рођендан</string>
+  <string name="vcard_url">Вебсајт</string>
+  <string name="vcard_organization">Организација</string>
+  <string name="vcard_title">Радно место, функција</string>
+  <string name="vcard_role">Улога</string>
+  <string name="vcard_other">Остали подаци</string>
+  <string name="vcard_categories">Категорије</string>
+  <string name="vcard_decsription">Опис</string>
+  <string name="vcard_note">Белешке</string>
+  <string name="vcard_address">Адреса</string>
+  <string name="vcard_address_pobox">Поштански фах</string>
+  <string name="vcard_address_extadr">Проширена адреса</string>
+  <string name="vcard_address_street">Улица</string>
+  <string name="vcard_address_locality">Локалитет</string>
+  <string name="vcard_address_region">Регија</string>
+  <string name="vcard_address_pcode">Поштански број</string>
+  <string name="vcard_address_ctry">Држава</string>
+  <string name="vcard_telephone">Телефон</string>
+  <string name="vcard_email">Е-адреса</string>
+  <string name="vcard_type_home">Кућа</string>
+  <string name="vcard_type_work">Посао</string>
+  <string name="vcard_type_postal">Поштански</string>
+  <string name="vcard_type_parcel">Пошиљка</string>
+  <string name="vcard_type_dom">Домаћи</string>
+  <string name="vcard_type_intl">Међународни</string>
+  <string name="vcard_type_pref">Жељени</string>
+  <string name="vcard_type_voice">Глас</string>
+  <string name="vcard_type_fax">Факс</string>
+  <string name="vcard_type_pager">Дојављивач</string>
+  <string name="vcard_type_cell">Мобилни</string>
+  <string name="vcard_type_video">Видео</string>
+  <string name="vcard_type_modem">Модем</string>
+  <string name="vcard_type_msg">Говорна пошта</string>
+  <string name="vcard_type_internet">Интернет</string>
+  <string name="please_wait">Сачекајте...</string>
+  <string name="unknown">Непознато</string>
+  <string name="edit_alias">Уреди псеудоним</string>
+  <string name="edit_contact_groups">Уреди групе</string>
+  <string name="remove_contact">Уклони контакт</string>
+</resources>

app/src/main/res/values-sr/fingerprint_viewer.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="otr_fingerprint_description">Саговорник вам може дати свој отисак који можете упоредити са овим овде да бисте били сигурни да је то он. Ту размену не треба вршити у ћаскању.</string>
+  <string name="otr_is_verified">Овај контакт је поуздан</string>
+  <string name="otr_local_fingerprint">Ваш отисак:</string>
+  <string name="otr_remote_fingerprint">Отисак вашег саговорника:</string>
+  <string name="otr_scan_fingerprint">Скенирајте QR код са отиском саговорника</string>
+  <string name="otr_show_fingerprint">Прикажи QR код мог отиска</string>
+  <string name="zxing_install_fail">Нема Гуглове Плеј продавнице. Инсталирајте скенер бар-кôда ручно.</string>
+  <string name="zxing_install_message">Ова апликација захтева скенер бар-кôда. Желите ли да га инсталирате?</string>
+  <string name="otr_copy_fingerprint">Копирај мој отисак у клипборд</string>
+</resources>

app/src/main/res/values-sr/muc_editor.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="EMPTY_NICK_NAME">Надимак није наведен</string>
+  <string name="EMPTY_ROOM_NAME">Групно ћаскање није наведено</string>
+  <string name="muc_join">Придружи ме</string>
+  <string name="muc_nick">Надимак</string>
+  <string name="muc_nick_hint">Ваш надимак у групном ћаскању</string>
+  <string name="muc_password">Лозинка</string>
+  <string name="muc_password_hint">лозинка није потребна</string>
+  <string name="muc_room">Групно ћаскање</string>
+  <string name="muc_server">Сервер групног ћаскања</string>
+  <string name="NICK_ALREADY_USED">Надимак је већ у употреби</string>
+  <string name="ALREADY_IN_PROGRESS">Већ у току</string>
+  <string name="ALREADY_JOINED">Већ придружен</string>
+  <string name="muc_add">Додај групно ћаскање</string>
+  <string name="muc_delete">Уклони групно ћаскање</string>
+  <string name="muc_delete_confirm">Желите ли заиста да уклоните групно ћаскање %1$s са налога %2$s?</string>
+  <string name="muc_edit">Поставке одобравања</string>
+  <string name="muc_invite_confirm">%2$s вас позива у групно ћаскање %3$s. Да се придружим се са налога %1$s?</string>
+  <string name="muc_invite_confirm_reason">%2$s вас позива у групно ћаскање %3$s: %4$s. Да се придружим се са налога %1$s?</string>
+  <string name="muc_leave">Напусти групно ћаскање</string>
+  <string name="muc_save">Сачувај групно ћаскање</string>
+</resources>

app/src/main/res/values-sr/notification_bar.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!--Generated by crowdin.com-->
+<resources>
+  <string name="account_quantity_1">налог</string>
+  <string name="account_quantity_2">налога</string>
+  <string name="account_quantity_5">налога</string>
+  <string name="account_quantity_offline_1">налог</string>
+  <string name="account_quantity_offline_2">налога</string>
+  <string name="account_quantity_offline_5">налога</string>
+  <string name="AUTHENTICATION_FAILED">Грешка аутентификације</string>
+  <string name="chat_contact_quantity_1">контакт</string>
+  <string name="chat_contact_quantity_2">контакта</string>
+  <string name="chat_contact_quantity_5">контаката</string>
+  <string name="chat_message_quantity_1">порука</string>
+  <string name="chat_message_quantity_2">поруке</string>
+  <string name="chat_message_quantity_5">порука</string>
+  <string name="chat_status">%1$d %2$s од %3$d %4$s</string>
+  <string name="chat_messages_from_contact">%1$d %2$s од %3$s</string>
+  <string name="chat_contact_and_message">%1$s: %2$s</string>
+  <string name="connection_state_connected_1">%1$d од %2$d %3$s повезан</string>
+  <string name="connection_state_connected_2">%1$d од %2$d %3$s повезана</string>
+  <string name="connection_state_connected_5">%1$d од %2$d %3$s повезано</string>
+  <string name="connection_state_connecting_1">повезивање %1$d од %2$d %3$s</string>
+  <string name="connection_state_connecting_2">повезивање %1$d од %2$d %3$s</string>
+  <string name="connection_state_connecting_5">повезивање %1$d од %2$d %3$s</string>
+  <string name="connection_state_waiting_1">%1$d од %2$d %3$s чека на повезивање</string>
+  <string name="connection_state_waiting_2">%1$d од %2$d %3$s чекају на повезивање</string>
+  <string name="connection_state_waiting_5">%1$d од %2$d %3$s чекају на повезивање</string>
+  <string name="connection_state_offline">%1$d %2$s ван везе</string>
+  <string name="archive_available_request_message">Желите ли да складиштите историјат порука на серверу?\nОво омогућује Ксаберу да учита историјат порука са свих уређаја који користе овај налог.\nОва функција ће повући нешто више података са интернета и лагано смањити брзину везе.\nУПОЗОРЕЊЕ: Читав ваш локални историјат ће бити уклоњен.</string>
+  <string name="archive_available_request_title">Омогућити архивисање порука?</string>
+  <string name="INVALID_CERTIFICATE">Неисправан сертификат</string>
+  <string name="muc_invite_message">Желите ли да се прикључите групном ћаскању?</string>
+  <string name="otr_verification_in_progress">Кликните овде за прекид.</string>
+  <string name="PASSWORD_REQUIRED">Потребна је лозинка</string>
+  <string name="pay_attention">Обратите пажњу</string>
+  <string name="subscription_request_message">Захтев за одобрењем</string>
+</resources>