Prepare release 0.1.17

All other flavors are currently not supported by F-Droid, they can
be re-enabled when the app is available through Google Play.

CHANGELOG.md

@@ -0,0 +1,21 @@
+# Delta Chat Changelog
+
+## v0.1.16
+2017-02-07
+
+* Drop two unnecessary permissions: ACCESS_COARSE_LOCATION and ACCESS_FINE_LOCATION
+* Really add French translation
+* Update Portuguese translation
+* Start fixing translation handling of the program
+* Remove special "foss" build, because the whole program is free now.
+
+## v0.1.16
+2017-02-06
+
+* Added French translation
+* Fixed some lint errors and warnings
+
+## v0.1.15
+2017-01-31
+
+* Prepare for release on [F-Droid](https://f-droid.org/)

MessengerProj/build.gradle

@@ -74,34 +74,17 @@ android {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
-
-        foss {
-            debuggable false
-            jniDebuggable false
-            signingConfig signingConfigs.release
-        }
     }
 
-    defaultConfig.versionCode = 14
+    defaultConfig.versionCode = 16
 
     sourceSets.main {
         jniLibs.srcDir 'libs'
         jni.srcDirs = [] //disable automatic ndk-build call
     }
 
-    sourceSets.debug {
-        manifest.srcFile 'config/debug/AndroidManifest.xml'
-    }
-
-    sourceSets.release {
-        manifest.srcFile 'config/release/AndroidManifest.xml'
-    }
-
-    sourceSets.foss {
-        manifest.srcFile 'config/foss/AndroidManifest.xml'
-    }
-
     productFlavors {
+        /*
         x86 {
             ndk {
                 abiFilter "x86"
@@ -120,6 +103,7 @@ android {
             }
             versionCode = 1
         }
+        */
         fat {
             versionCode = 3
         }
@@ -133,7 +117,6 @@ android {
     defaultConfig {
         minSdkVersion 14 // 14: Android 4.0 Ice Cream Sandwich 2011 (Telegram default), 21: Android 5.0 Lollipop 2014 (recommended for InstantRun)
         targetSdkVersion 23
-        versionName "0.1.15"
+        versionName "0.1.17"
     }
 }
-

MessengerProj/config/debug/AndroidManifest.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.b44t.messenger"
-    android:installLocation="auto">
-
-    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false" />
-    <uses-feature android:name="android.hardware.LOCATION" android:required="false" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/AppName"
-        android:theme="@style/Theme.MessengerProj.Start"
-        android:name=".ApplicationLoader"
-        android:hardwareAccelerated="@bool/useHardwareAcceleration"
-        android:largeHeap="true">
-    </application>
-
-</manifest>

MessengerProj/config/foss/AndroidManifest.xml

@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.b44t.messenger"
-    android:installLocation="auto">
-
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/AppName"
-        android:theme="@style/Theme.MessengerProj.Start"
-        android:name=".ApplicationLoader"
-        android:hardwareAccelerated="@bool/useHardwareAcceleration"
-        android:largeHeap="true">
-
-    </application>
-
-</manifest>

MessengerProj/config/release/AndroidManifest.xml

@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="com.b44t.messenger"
-    android:installLocation="auto">
-
-    <uses-feature android:name="android.hardware.location.gps" android:required="false" />
-    <uses-feature android:name="android.hardware.location.network" android:required="false" />
-    <uses-feature android:name="android.hardware.location" android:required="false" />
-    <uses-feature android:name="android.hardware.LOCATION" android:required="false" />
-
-    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
-    <application
-        android:allowBackup="false"
-        android:icon="@drawable/ic_launcher"
-        android:label="@string/AppName"
-        android:theme="@style/Theme.MessengerProj.Start"
-        android:name=".ApplicationLoader"
-        android:hardwareAccelerated="@bool/useHardwareAcceleration"
-        android:largeHeap="true">
-    </application>
-
-</manifest>

MessengerProj/src/main/AndroidManifest.xml

@@ -48,6 +48,7 @@
         android:allowBackup="false"
         android:hardwareAccelerated="@bool/useHardwareAcceleration"
         android:icon="@drawable/ic_launcher"
+        android:label="@string/AppName"
         android:largeHeap="true"
         android:theme="@style/Theme.MessengerProj.Start"
         android:manageSpaceActivity="com.b44t.ui.ManageSpaceActivity">

MessengerProj/src/main/java/com/b44t/messenger/AndroidUtilities.java

@@ -513,25 +513,6 @@ public class AndroidUtilities {
         return photoSize;
     }
 
-    public static String formatTTLString(int ttl) {
-        if (ttl < 60) {
-            return LocaleController.formatPluralString("Seconds", ttl);
-        } else if (ttl < 60 * 60) {
-            return LocaleController.formatPluralString("Minutes", ttl / 60);
-        } else if (ttl < 60 * 60 * 24) {
-            return LocaleController.formatPluralString("Hours", ttl / 60 / 60);
-        } else if (ttl < 60 * 60 * 24 * 7) {
-            return LocaleController.formatPluralString("Days", ttl / 60 / 60 / 24);
-        } else {
-            int days = ttl / 60 / 60 / 24;
-            if (ttl % 7 == 0) {
-                return LocaleController.formatPluralString("Weeks", days / 7);
-            } else {
-                return String.format("%s %s", LocaleController.formatPluralString("Weeks", days / 7), LocaleController.formatPluralString("Days", days % 7));
-            }
-        }
-    }
-
     public static void clearCursorDrawable(EditText editText) {
         if (editText == null) {
             return;

MessengerProj/src/main/java/com/b44t/messenger/LocaleController.java

@@ -71,7 +71,6 @@ public class LocaleController {
     private HashMap<String, PluralRules> allRules = new HashMap<>();
 
     private Locale currentLocale;
-    private Locale systemDefaultLocale;
     private PluralRules currentPluralRules;
     private LocaleInfo currentLocaleInfo;
     private LocaleInfo defaultLocalInfo;
@@ -195,6 +194,14 @@ public class LocaleController {
         sortedLanguages.add(localeInfo);
         languagesDict.put(localeInfo.shortName, localeInfo);
 
+        localeInfo = new LocaleInfo();
+        localeInfo.name = "Français";
+        localeInfo.nameEnglish = "French";
+        localeInfo.shortName = "fr";
+        localeInfo.pathToFile = null;
+        sortedLanguages.add(localeInfo);
+        languagesDict.put(localeInfo.shortName, localeInfo);
+
         localeInfo = new LocaleInfo();
         localeInfo.name = "Nederlands";
         localeInfo.nameEnglish = "Dutch";
@@ -260,7 +267,6 @@ public class LocaleController {
         localeInfo.pathToFile = null;
         sortedLanguages.add(0, localeInfo);
 
-        systemDefaultLocale = Locale.getDefault();
         is24HourFormat = DateFormat.is24HourFormat(ApplicationLoader.applicationContext);
         LocaleInfo currentInfo = null;
         boolean override = false;
@@ -275,11 +281,11 @@ public class LocaleController {
                 }
             }
 
-            if (currentInfo == null && systemDefaultLocale.getLanguage() != null) {
-                currentInfo = languagesDict.get(systemDefaultLocale.getLanguage());
+            if (currentInfo == null && Locale.getDefault().getLanguage() != null) {
+                currentInfo = languagesDict.get(Locale.getDefault().getLanguage());
             }
             if (currentInfo == null) {
-                currentInfo = languagesDict.get(getLocaleString(systemDefaultLocale));
+                currentInfo = languagesDict.get(getLocaleString(Locale.getDefault()));
             }
             if (currentInfo == null) {
                 currentInfo = languagesDict.get("en");
@@ -320,10 +326,6 @@ public class LocaleController {
         }
     }
 
-    public Locale getSystemDefaultLocale() {
-        return systemDefaultLocale;
-    }
-
     private String getLocaleString(Locale locale) {
         if (locale == null) {
             return "en";
@@ -348,7 +350,7 @@ public class LocaleController {
     }
 
     public static String getLocaleStringIso639() {
-        Locale locale = getInstance().getSystemDefaultLocale();
+        Locale locale = Locale.getDefault();
         if (locale == null) {
             return "en";
         }
@@ -371,68 +373,6 @@ public class LocaleController {
         return result.toString();
     }
 
-    public boolean applyLanguageFile(File file) {
-        try {
-            HashMap<String, String> stringMap = getLocaleFileStrings(file);
-
-            String languageName = stringMap.get("LanguageName");
-            String languageNameInEnglish = stringMap.get("LanguageNameInEnglish");
-            String languageCode = stringMap.get("LanguageCode");
-
-            if (languageName != null && languageName.length() > 0 &&
-                    languageNameInEnglish != null && languageNameInEnglish.length() > 0 &&
-                    languageCode != null && languageCode.length() > 0) {
-
-                if (languageName.contains("&") || languageName.contains("|")) {
-                    return false;
-                }
-                if (languageNameInEnglish.contains("&") || languageNameInEnglish.contains("|")) {
-                    return false;
-                }
-                if (languageCode.contains("&") || languageCode.contains("|") || languageCode.contains("/") || languageCode.contains("\\")) {
-                    return false;
-                }
-
-                File finalFile = new File(ApplicationLoader.getFilesDirFixed(), languageCode + ".xml");
-                if (!AndroidUtilities.copyFile(file, finalFile)) {
-                    return false;
-                }
-
-                LocaleInfo localeInfo = languagesDict.get(languageCode);
-                if (localeInfo == null) {
-                    localeInfo = new LocaleInfo();
-                    localeInfo.name = languageName;
-                    localeInfo.nameEnglish = languageNameInEnglish;
-                    localeInfo.shortName = languageCode;
-
-                    localeInfo.pathToFile = finalFile.getAbsolutePath();
-                    sortedLanguages.add(localeInfo);
-                    languagesDict.put(localeInfo.shortName, localeInfo);
-                    otherLanguages.add(localeInfo);
-
-                    Collections.sort(sortedLanguages, new Comparator<LocaleInfo>() {
-                        @Override
-                        public int compare(LocaleController.LocaleInfo o, LocaleController.LocaleInfo o2) {
-                            if (o.shortName == null) {
-                                return -1;
-                            } else if (o2.shortName == null) {
-                                return 1;
-                            }
-                            return o.name.compareTo(o2.name);
-                        }
-                    });
-                    saveOtherLanguages();
-                }
-                localeValues = stringMap;
-                applyLanguage(localeInfo, true, true);
-                return true;
-            }
-        } catch (Exception e) {
-            FileLog.e("messenger", e);
-        }
-        return false;
-    }
-
     private void saveOtherLanguages() {
         SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("langconfig", Activity.MODE_PRIVATE);
         SharedPreferences.Editor editor = preferences.edit();
@@ -565,7 +505,7 @@ public class LocaleController {
                     }
                 }
             } else {
-                newLocale = systemDefaultLocale;
+                newLocale = Locale.getDefault();
                 languageOverride = null;
                 SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE);
                 SharedPreferences.Editor editor = preferences.edit();
@@ -611,10 +551,6 @@ public class LocaleController {
         recreateFormatters();
     }
 
-    private void loadCurrentLocale() {
-        localeValues.clear();
-    }
-
     public static String getCurrentLanguageName() {
         return getString("LanguageName", R.string.LanguageName);
     }
@@ -684,7 +620,6 @@ public class LocaleController {
             return;
         }
         is24HourFormat = DateFormat.is24HourFormat(ApplicationLoader.applicationContext);
-        systemDefaultLocale = newConfig.locale;
         if (languageOverride != null) {
             LocaleInfo toSet = currentLocaleInfo;
             currentLocaleInfo = null;
@@ -724,30 +659,6 @@ public class LocaleController {
         return "LOC_ERR: formatDateChat";
     }
 
-    public static String formatDate(long date) {
-        try {
-            Calendar rightNow = Calendar.getInstance();
-            int day = rightNow.get(Calendar.DAY_OF_YEAR);
-            int year = rightNow.get(Calendar.YEAR);
-            rightNow.setTimeInMillis(date * 1000);
-            int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
-            int dateYear = rightNow.get(Calendar.YEAR);
-
-            if (dateDay == day && year == dateYear) {
-                return getInstance().formatterDay.format(new Date(date * 1000));
-            } else if (dateDay + 1 == day && year == dateYear) {
-                return getString("Yesterday", R.string.Yesterday);
-            } else if (year == dateYear) {
-                return getInstance().formatterMonth.format(new Date(date * 1000));
-            } else {
-                return getInstance().formatterYear.format(new Date(date * 1000));
-            }
-        } catch (Exception e) {
-            FileLog.e("messenger", e);
-        }
-        return "LOC_ERR: formatDate";
-    }
-
     public static String formatDateAudio(long date) {
         try {
             Calendar rightNow = Calendar.getInstance();
@@ -772,40 +683,6 @@ public class LocaleController {
         return "LOC_ERR";
     }
 
-    public static String formatDateOnline(long date) {
-        try {
-            Calendar rightNow = Calendar.getInstance();
-            int day = rightNow.get(Calendar.DAY_OF_YEAR);
-            int year = rightNow.get(Calendar.YEAR);
-            rightNow.setTimeInMillis(date * 1000);
-            int dateDay = rightNow.get(Calendar.DAY_OF_YEAR);
-            int dateYear = rightNow.get(Calendar.YEAR);
-
-            if (dateDay == day && year == dateYear) {
-                return String.format("%s %s %s", LocaleController.getString("LastSeen", R.string.LastSeen), LocaleController.getString("TodayAt", R.string.TodayAt), getInstance().formatterDay.format(new Date(date * 1000)));
-                /*int diff = (int) (ConnectionsManager.getInstance().getCurrentTime() - date) / 60;
-                if (diff < 1) {
-                    return LocaleController.getString("LastSeenNow", R.string.LastSeenNow);
-                } else if (diff < 60) {
-                    return LocaleController.formatPluralString("LastSeenMinutes", diff);
-                } else {
-                    return LocaleController.formatPluralString("LastSeenHours", (int) Math.ceil(diff / 60.0f));
-                }*/
-            } else if (dateDay + 1 == day && year == dateYear) {
-                return String.format("%s %s %s", LocaleController.getString("LastSeen", R.string.LastSeen), LocaleController.getString("YesterdayAt", R.string.YesterdayAt), getInstance().formatterDay.format(new Date(date * 1000)));
-            } else if (year == dateYear) {
-                String format = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, getInstance().formatterMonth.format(new Date(date * 1000)), getInstance().formatterDay.format(new Date(date * 1000)));
-                return String.format("%s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), format);
-            } else {
-                String format = LocaleController.formatString("formatDateAtTime", R.string.formatDateAtTime, getInstance().formatterYear.format(new Date(date * 1000)), getInstance().formatterDay.format(new Date(date * 1000)));
-                return String.format("%s %s", LocaleController.getString("LastSeenDate", R.string.LastSeenDate), format);
-            }
-        } catch (Exception e) {
-            FileLog.e("messenger", e);
-        }
-        return "LOC_ERR";
-    }
-
     private FastDateFormat createFormatter(Locale locale, String format, String defaultFormat) {
         if (format == null || format.length() == 0) {
             format = defaultFormat;

MessengerProj/src/main/java/com/b44t/messenger/NotificationsController.java

@@ -55,6 +55,8 @@ import java.util.List;
 
 public class NotificationsController {
 
+    private Context mContext;
+
     public static final String EXTRA_VOICE_REPLY = "extra_voice_reply";
 
     private DispatchQueue notificationsQueue = new DispatchQueue("notificationsQueue");
@@ -104,6 +106,7 @@ public class NotificationsController {
     }
 
     public NotificationsController() {
+        mContext = ApplicationLoader.applicationContext;
         notificationManager = NotificationManagerCompat.from(ApplicationLoader.applicationContext);
         SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("Notifications", Context.MODE_PRIVATE);
         inChatSoundEnabled = preferences.getBoolean("EnableInChatSound", true);
@@ -1117,10 +1120,10 @@ public class NotificationsController {
 
             String detailText;
             if (pushDialogs.size() == 1) {
-                detailText = LocaleController.formatPluralString("NewMessages", total_unread_count);
+                detailText = mContext.getResources().getQuantityString(R.plurals.NewMessages, total_unread_count, total_unread_count);
             } else {
                 detailText = LocaleController.formatString("NotificationMessagesPeopleDisplayOrder", R.string.NotificationMessagesPeopleDisplayOrder,
-                        LocaleController.formatPluralString("NewMessages", total_unread_count),
+                        mContext.getResources().getQuantityString(R.plurals.NewMessages, total_unread_count, total_unread_count),
                         LocaleController.formatPluralString("FromChats", pushDialogs.size()));
             }
 

MessengerProj/src/main/java/com/b44t/messenger/support/widget/LinearLayoutManager.java

@@ -1890,7 +1890,7 @@ public class LinearLayoutManager extends RecyclerView.LayoutManager implements
      */
     static class LayoutState {
 
-        final static String TAG = "LinearLayoutManager#LayoutState";
+        final static String TAG = "LinLayMngr#LayoutState";
 
         final static int LAYOUT_START = -1;
 

MessengerProj/src/main/java/com/b44t/ui/Adapters/DialogsSearchAdapter.java

@@ -27,11 +27,11 @@ import android.content.Context;
 import android.view.View;
 import android.view.ViewGroup;
 
-import com.b44t.messenger.LocaleController;
 import com.b44t.messenger.MrChat;
 import com.b44t.messenger.MrChatlist;
 import com.b44t.messenger.MrMsg;
 import com.b44t.messenger.MrPoortext;
+import com.b44t.messenger.R;
 import com.b44t.messenger.support.widget.RecyclerView;
 import com.b44t.messenger.MrMailbox;
 import com.b44t.ui.Cells.DialogCell;
@@ -177,9 +177,9 @@ public class DialogsSearchAdapter extends RecyclerView.Adapter {
             case ROWTYPE_HEADLINE: {
                     GreySectionCell headlineCell = (GreySectionCell) viewHolder.itemView;
                     if (i == rowChatsHeadline) {
-                        headlineCell.setText(LocaleController.formatPluralString("Chats", m_chatlistCnt));
+                        headlineCell.setText(mContext.getResources().getQuantityString(R.plurals.Chats, m_chatlistCnt, m_chatlistCnt));
                     } else if (i == rowMsgsHeadline) {
-                        headlineCell.setText(LocaleController.formatPluralString("messages", m_msgIds.length));
+                        headlineCell.setText(mContext.getResources().getQuantityString(R.plurals.messages, m_msgIds.length, m_msgIds.length));
                     }
                 }
                 break;

MessengerProj/src/main/java/com/b44t/ui/CacheControlActivity.java

@@ -320,7 +320,7 @@ public class CacheControlActivity extends BaseFragment {
     */
 
     @Override
-    public View createView(Context context) {
+    public View createView(final Context context) {
         actionBar.setBackButtonImage(R.drawable.ic_ab_back);
         actionBar.setAllowOverlayTitle(true);
         actionBar.setTitle(LocaleController.getString("CacheSettings", R.string.CacheSettings));
@@ -351,7 +351,7 @@ public class CacheControlActivity extends BaseFragment {
             public void onItemClick(final AdapterView<?> adapterView, View view, final int i, long l) {
                 if (i == keepMediaRow) {
                     AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-                    builder.setItems(new CharSequence[]{LocaleController.formatPluralString("Weeks", 1), LocaleController.formatPluralString("Months", 1), LocaleController.getString("KeepMediaForever", R.string.KeepMediaForever)}, new DialogInterface.OnClickListener() {
+                    builder.setItems(new CharSequence[]{context.getResources().getQuantityString(R.plurals.Weeks, 1, 1), context.getResources().getQuantityString(R.plurals.Months, 1, 1), LocaleController.getString("KeepMediaForever", R.string.KeepMediaForever)}, new DialogInterface.OnClickListener() {
                         @Override
                         public void onClick(DialogInterface dialog, final int which) {
                             SharedPreferences.Editor editor = ApplicationLoader.applicationContext.getSharedPreferences("mainconfig", Activity.MODE_PRIVATE).edit();
@@ -639,13 +639,13 @@ public class CacheControlActivity extends BaseFragment {
                     int keepMedia = preferences.getInt("keep_media", 2);
                     String value;
                     if (keepMedia == 0) {
-                        value = LocaleController.formatPluralString("Weeks", 1);
+                        value = mContext.getResources().getQuantityString(R.plurals.Weeks, 1, 1);
                     } else if (keepMedia == 1) {
-                        value = LocaleController.formatPluralString("Months", 1);
+                        value = mContext.getResources().getQuantityString(R.plurals.Months, 1, 1);
                     } else {
-                        value = LocaleController.getString("KeepMediaForever", R.string.KeepMediaForever);
+                        value = mContext.getString(R.string.KeepMediaForever);
                     }
-                    textCell.setTextAndValue(LocaleController.getString("KeepMedia", R.string.KeepMedia), value, false);
+                    textCell.setTextAndValue(mContext.getString(R.string.KeepMedia), value, false);
                 }
             } else if (type_ == typeTextInfo) {
                 if (view == null) {

MessengerProj/src/main/java/com/b44t/ui/ChatActivity.java

@@ -2503,7 +2503,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
 
     private void createDeleteMessagesAlert() {
         AlertDialog.Builder builder = new AlertDialog.Builder(getParentActivity());
-        builder.setMessage(LocaleController.formatString("AreYouSureDeleteMessages", R.string.AreYouSureDeleteMessages, LocaleController.formatPluralString("messages", selectedMessagesIds.size())));
+        builder.setMessage(ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.AreYouSureDeleteMessages, selectedMessagesIds.size(), selectedMessagesIds.size()));
         builder.setPositiveButton(LocaleController.getString("OK", R.string.OK), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
@@ -3198,7 +3198,7 @@ public class ChatActivity extends BaseFragment implements NotificationCenter.Not
                 else if (view instanceof ChatUnreadCell)
                 {
                     ChatUnreadCell unreadCell = (ChatUnreadCell) view;
-                    unreadCell.setText(LocaleController.formatPluralString("NewMessages", markerUnreadCount));
+                    unreadCell.setText(mContext.getResources().getQuantityString(R.plurals.NewMessages, markerUnreadCount, markerUnreadCount));
                 }
             }
         }

MessengerProj/src/main/java/com/b44t/ui/Components/ChatActivityEnterView.java

@@ -815,7 +815,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     }
                     startedDraggingX = -1;
                     MediaController.getInstance().startRecording(dialog_id, replyingMessageObject);
-                    updateAudioRecordIntefrace();
+                    updateAudioRecordInterface();
                     audioSendButton.getParent().requestDisallowInterceptTouchEvent(true);
                     */
                 } else if (motionEvent.getAction() == MotionEvent.ACTION_UP || motionEvent.getAction() == MotionEvent.ACTION_CANCEL) {
@@ -824,14 +824,14 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
                     startedDraggingX = -1;
                     MediaController.getInstance().stopRecording(1);
                     recordingAudio = false;
-                    updateAudioRecordIntefrace();
+                    updateAudioRecordInterface();
                     */
                 } else if (motionEvent.getAction() == MotionEvent.ACTION_MOVE && recordingAudio) {
                     float x = motionEvent.getX();
                     if (x < -distCanMove) {
                         MediaController.getInstance().stopRecording(0);
                         recordingAudio = false;
-                        updateAudioRecordIntefrace();
+                        updateAudioRecordInterface();
                     }
 
                     x = x + audioSendButton.getX();
@@ -1524,7 +1524,7 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
         messageEditText.setLayoutParams(layoutParams);
     }
 
-    private void updateAudioRecordIntefrace() {
+    private void updateAudioRecordInterface() {
         if (recordingAudio) {
             if (audioInterfaceState == 1) {
                 return;
@@ -2069,12 +2069,12 @@ public class ChatActivityEnterView extends FrameLayout implements NotificationCe
             if (recordingAudio) {
                 MessagesController.getInstance().sendTyping(dialog_id, 2, 0);
                 recordingAudio = false;
-                updateAudioRecordIntefrace();
+                updateAudioRecordInterface();
             }
         } else if (id == NotificationCenter.recordStarted) {
             if (!recordingAudio) {
                 recordingAudio = true;
-                updateAudioRecordIntefrace();
+                updateAudioRecordInterface();
             }
         } else if (id == NotificationCenter.audioDidSent) {
             audioToSend = (TLRPC.TL_document) args[0];

MessengerProj/src/main/java/com/b44t/ui/Components/VideoTimelineView.java

@@ -42,7 +42,6 @@ import com.b44t.messenger.R;
 
 import java.util.ArrayList;
 
-@TargetApi(10)
 public class VideoTimelineView extends View {
 
     private long videoLength = 0;

MessengerProj/src/main/java/com/b44t/ui/ContactsActivity.java

@@ -136,7 +136,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
         else if( do_what == SELECT_CONTACTS_FOR_NEW_GROUP )
         {
             title      = LocaleController.getString("NewGroup", R.string.NewGroup);
-            subtitle   = LocaleController.getString("MeAnd", R.string.MeAnd) + " " + LocaleController.formatPluralString("Members", 0);
+            subtitle   = ApplicationLoader.applicationContext.getResources().getQuantityString(R.plurals.MeAndMembers, 0, 0);
         }
         else if( do_what == ADD_CONTACTS_TO_GROUP )
         {
@@ -163,7 +163,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
     private volatile boolean m_in_sync = false;
 
     @Override
-    public View createView(Context context) {
+    public View createView(final Context context) {
 
         // do sync?
         boolean do_sync_now = true;
@@ -464,7 +464,7 @@ public class ContactsActivity extends BaseFragment implements NotificationCenter
                             span.uid = user.id;
                             ignoreChange = false;
                         }
-                        actionBar.setSubtitle(LocaleController.getString("MeAnd", R.string.MeAnd) + " " + LocaleController.formatPluralString("Members", selectedContacts.size()));
+                        actionBar.setSubtitle(context.getResources().getQuantityString(R.plurals.MeAndMembers, selectedContacts.size(), selectedContacts.size()));
                         if (searching || searchWas) {
                             ignoreChange = true;
                             SpannableStringBuilder ssb = new SpannableStringBuilder("");

MessengerProj/src/main/java/com/b44t/ui/GroupCreateFinalActivity.java

@@ -271,7 +271,7 @@ public class GroupCreateFinalActivity extends BaseFragment implements Notificati
         }
 
         GreySectionCell sectionCell = new GreySectionCell(context);
-        sectionCell.setText(LocaleController.formatPluralString("Members", selectedContacts.size()));
+        sectionCell.setText(context.getResources().getQuantityString(R.plurals.Members, selectedContacts.size(), selectedContacts.size()));
         linearLayout.addView(sectionCell);
 
         listView = new ListView(context);

MessengerProj/src/main/res/layout/player_big_notification.xml

@@ -1,122 +1,122 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="128dp"
-    android:orientation="horizontal"
-    android:background="#ff424242" >
-
-    <ImageView
-        android:id="@+id/player_album_art"
-        android:layout_width="128dp"
-        android:layout_height="128dp"
-        android:scaleType="fitXY"
-        android:background="#ffc0c0c0" />
-
-    <FrameLayout
-        android:layout_width="0dp"
-        android:layout_height="match_parent"
-        android:layout_weight="1">
-
-        <TextView
-            android:id="@+id/player_song_name"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:gravity="top|left"
-            android:singleLine="true"
-            android:textColor="#ffffffff"
-            android:textSize="16dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginTop="4dp"
-            android:layout_marginRight="44dp"/>
-
-        <ImageView
-            android:id="@+id/player_close"
-            android:layout_width="28dp"
-            android:layout_height="28dp"
-            android:layout_marginTop="8dp"
-            android:layout_marginRight="8dp"
-            android:scaleType="center"
-            android:layout_gravity="right"
-            android:background="@drawable/bar_selector_white"
-            android:src="@drawable/ic_close_white" />
-
-        <TextView
-            android:id="@+id/player_author_name"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:singleLine="true"
-            android:textColor="#ffc7c7c7"
-            android:layout_marginTop="25dp"
-            android:layout_marginLeft="12dp"
-            android:layout_marginRight="44dp"
-            android:textSize="13dp" />
-
-        <FrameLayout
-            android:layout_height="1dp"
-            android:layout_width="match_parent"
-            android:layout_marginBottom="48dp"
-            android:layout_gravity="bottom"
-            android:background="#ff606060"/>
-
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="48dp"
-            android:layout_gravity="bottom"
-            android:gravity="center"
-            android:orientation="horizontal" >
-
-            <ProgressBar
-                android:layout_width="30dp"
-                android:layout_height="30dp"
-                android:layout_gravity="center"
-                android:indeterminateDrawable="@drawable/loading_animation"
-                android:indeterminateDuration="1500"
-                android:id="@+id/player_progress_bar" />
-
-            <ImageView
-                android:id="@+id/player_previous"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:scaleType="center"
-                android:background="@drawable/bar_selector_white"
-                android:src="@drawable/ic_action_previous" />
-
-            <ImageView
-                android:id="@+id/player_pause"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:scaleType="center"
-                android:background="@drawable/bar_selector_white"
-                android:src="@drawable/ic_action_pause" />
-
-            <ImageView
-                android:id="@+id/player_play"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:scaleType="center"
-                android:background="@drawable/bar_selector_white"
-                android:src="@drawable/ic_action_play"
-                android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/player_next"
-                android:layout_width="40dp"
-                android:layout_height="40dp"
-                android:layout_marginLeft="10dp"
-                android:layout_marginRight="10dp"
-                android:scaleType="center"
-                android:background="@drawable/bar_selector_white"
-                android:src="@drawable/ic_action_next"/>
-
-        </LinearLayout>
-
-    </FrameLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="128dp"
+    android:orientation="horizontal"
+    android:background="#ff424242" >
+
+    <ImageView
+        android:id="@+id/player_album_art"
+        android:layout_width="128dp"
+        android:layout_height="128dp"
+        android:scaleType="fitXY"
+        android:background="#ffc0c0c0" />
+
+    <FrameLayout
+        android:layout_width="0dp"
+        android:layout_height="match_parent"
+        android:layout_weight="1">
+
+        <TextView
+            android:id="@+id/player_song_name"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:gravity="top|left"
+            android:textColor="#ffffffff"
+            android:textSize="16dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginTop="4dp"
+            android:layout_marginRight="44dp"
+            android:maxLines="1" />
+
+        <ImageView
+            android:id="@+id/player_close"
+            android:layout_width="28dp"
+            android:layout_height="28dp"
+            android:layout_marginTop="8dp"
+            android:layout_marginRight="8dp"
+            android:scaleType="center"
+            android:layout_gravity="right"
+            android:background="@drawable/bar_selector_white"
+            android:src="@drawable/ic_close_white" />
+
+        <TextView
+            android:id="@+id/player_author_name"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textColor="#ffc7c7c7"
+            android:layout_marginTop="25dp"
+            android:layout_marginLeft="12dp"
+            android:layout_marginRight="44dp"
+            android:textSize="13dp"
+            android:maxLines="1" />
+
+        <FrameLayout
+            android:layout_height="1dp"
+            android:layout_width="match_parent"
+            android:layout_marginBottom="48dp"
+            android:layout_gravity="bottom"
+            android:background="#ff606060"/>
+
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:layout_gravity="bottom"
+            android:gravity="center"
+            android:orientation="horizontal" >
+
+            <ProgressBar
+                android:layout_width="30dp"
+                android:layout_height="30dp"
+                android:layout_gravity="center"
+                android:indeterminateDrawable="@drawable/loading_animation"
+                android:indeterminateDuration="1500"
+                android:id="@+id/player_progress_bar" />
+
+            <ImageView
+                android:id="@+id/player_previous"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:scaleType="center"
+                android:background="@drawable/bar_selector_white"
+                android:src="@drawable/ic_action_previous" />
+
+            <ImageView
+                android:id="@+id/player_pause"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:scaleType="center"
+                android:background="@drawable/bar_selector_white"
+                android:src="@drawable/ic_action_pause" />
+
+            <ImageView
+                android:id="@+id/player_play"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:scaleType="center"
+                android:background="@drawable/bar_selector_white"
+                android:src="@drawable/ic_action_play"
+                android:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/player_next"
+                android:layout_width="40dp"
+                android:layout_height="40dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:scaleType="center"
+                android:background="@drawable/bar_selector_white"
+                android:src="@drawable/ic_action_next"/>
+
+        </LinearLayout>
+
+    </FrameLayout>
+
 </LinearLayout>

MessengerProj/src/main/res/layout/player_small_notification.xml

@@ -1,116 +1,116 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="#ff424242" >
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:src="@drawable/transparent" />
-
-    <ImageView
-        android:id="@+id/player_album_art"
-        android:layout_width="40dp"
-        android:layout_height="40dp"
-        android:scaleType="fitXY"
-        android:layout_centerVertical="true"
-        android:layout_marginLeft="12dp" />
-
-    <TextView
-        android:id="@+id/player_song_name"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="top|left"
-        android:singleLine="true"
-        android:textColor="#ffffffff"
-        android:textSize="16dp"
-        android:layout_marginLeft="64dp"
-        android:layout_marginTop="12dp"
-        android:layout_marginRight="180dp"/>
-
-    <ImageView
-        android:id="@+id/player_close"
-        android:layout_width="28dp"
-        android:layout_height="28dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginRight="8dp"
-        android:scaleType="center"
-        android:layout_alignParentRight="true"
-        android:background="@drawable/bar_selector_white"
-        android:src="@drawable/ic_close_white" />
-
-    <TextView
-        android:id="@+id/player_author_name"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:singleLine="true"
-        android:textColor="#ffc7c7c7"
-        android:layout_marginTop="33dp"
-        android:layout_marginLeft="64dp"
-        android:layout_marginRight="180dp"
-        android:textSize="13dp" />
-
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="48dp"
-        android:gravity="center"
-        android:layout_marginRight="40dp"
-        android:layout_centerVertical="true"
-        android:layout_alignParentRight="true"
-        android:orientation="horizontal" >
-
-        <ProgressBar
-            android:layout_width="30dp"
-            android:layout_height="30dp"
-            android:layout_gravity="center"
-            android:layout_marginRight="56dp"
-            android:indeterminateDrawable="@drawable/loading_animation"
-            android:indeterminateDuration="1500"
-            android:id="@+id/player_progress_bar" />
-
-        <ImageView
-            android:id="@+id/player_previous"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:scaleType="center"
-            android:background="@drawable/bar_selector_white"
-            android:src="@drawable/ic_action_previous" />
-
-        <ImageView
-            android:id="@+id/player_pause"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:scaleType="center"
-            android:background="@drawable/bar_selector_white"
-            android:src="@drawable/ic_action_pause" />
-
-        <ImageView
-            android:id="@+id/player_play"
-            android:layout_width="36dp"
-            android:layout_height="36dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:scaleType="center"
-            android:background="@drawable/bar_selector_white"
-            android:src="@drawable/ic_action_play"
-            android:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/player_next"
-            android:layout_width="32dp"
-            android:layout_height="32dp"
-            android:layout_marginLeft="8dp"
-            android:layout_marginRight="8dp"
-            android:scaleType="center"
-            android:background="@drawable/bar_selector_white"
-            android:src="@drawable/ic_action_next"/>
-
-    </LinearLayout>
-
+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:background="#ff424242" >
+
+    <ImageView
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        android:src="@drawable/transparent" />
+
+    <ImageView
+        android:id="@+id/player_album_art"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:scaleType="fitXY"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="12dp" />
+
+    <TextView
+        android:id="@+id/player_song_name"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:gravity="top|left"
+        android:textColor="#ffffffff"
+        android:textSize="16dp"
+        android:layout_marginLeft="64dp"
+        android:layout_marginTop="12dp"
+        android:layout_marginRight="180dp"
+        android:maxLines="1" />
+
+    <ImageView
+        android:id="@+id/player_close"
+        android:layout_width="28dp"
+        android:layout_height="28dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginRight="8dp"
+        android:scaleType="center"
+        android:layout_alignParentRight="true"
+        android:background="@drawable/bar_selector_white"
+        android:src="@drawable/ic_close_white" />
+
+    <TextView
+        android:id="@+id/player_author_name"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:textColor="#ffc7c7c7"
+        android:layout_marginTop="33dp"
+        android:layout_marginLeft="64dp"
+        android:layout_marginRight="180dp"
+        android:textSize="13dp"
+        android:maxLines="1" />
+
+    <LinearLayout
+        android:layout_width="wrap_content"
+        android:layout_height="48dp"
+        android:gravity="center"
+        android:layout_marginRight="40dp"
+        android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
+        android:orientation="horizontal" >
+
+        <ProgressBar
+            android:layout_width="30dp"
+            android:layout_height="30dp"
+            android:layout_gravity="center"
+            android:layout_marginRight="56dp"
+            android:indeterminateDrawable="@drawable/loading_animation"
+            android:indeterminateDuration="1500"
+            android:id="@+id/player_progress_bar" />
+
+        <ImageView
+            android:id="@+id/player_previous"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:scaleType="center"
+            android:background="@drawable/bar_selector_white"
+            android:src="@drawable/ic_action_previous" />
+
+        <ImageView
+            android:id="@+id/player_pause"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:scaleType="center"
+            android:background="@drawable/bar_selector_white"
+            android:src="@drawable/ic_action_pause" />
+
+        <ImageView
+            android:id="@+id/player_play"
+            android:layout_width="36dp"
+            android:layout_height="36dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:scaleType="center"
+            android:background="@drawable/bar_selector_white"
+            android:src="@drawable/ic_action_play"
+            android:visibility="gone" />
+
+        <ImageView
+            android:id="@+id/player_next"
+            android:layout_width="32dp"
+            android:layout_height="32dp"
+            android:layout_marginLeft="8dp"
+            android:layout_marginRight="8dp"
+            android:scaleType="center"
+            android:background="@drawable/bar_selector_white"
+            android:src="@drawable/ic_action_next"/>
+
+    </LinearLayout>
+
 </RelativeLayout>

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

@@ -78,8 +78,6 @@
     <string name="NoContacts">Keine Benutzer.</string>
     <string name="TodayAt">um</string>
     <string name="YesterdayAt">gestern um</string>
-    <string name="LastSeen">zul. online</string>
-    <string name="LastSeenDate">zul. online</string>
     <!--group create view-->
     <string name="SendMessageTo">Sende Nachricht an …</string>
     <string name="EnterGroupNamePlaceholder">Gruppenname</string>
@@ -308,7 +306,6 @@
     <string name="ShareYouLocationUnableManually">Selbst wählen</string>
     <string name="AreYouSureBlockContact">Diesen Benutzer wirklich blockieren?</string>
     <string name="AreYouSureDeleteContact">Diesen Benutzer wirklich löschen?</string>
-    <string name="AreYouSureDeleteMessages">%1$s löschen? Die Nachrichten werden auch auf dem Server gelöscht.</string>
     <string name="RaiseToSpeakAlert">Möchtest du \"Zum Sprechen ans Ohr\" für Sprachnachrichten aktivieren?</string>
     <!--permissions-->
     <string name="PermissionContacts">Für eine einfache Kontaktaufnahme, benötigt Delta Chat Zugriff auf die Kontakte. Die Daten werden dabei nur lokal verarbeitet und zu keinem Server oder Dienst übertragen.</string>
@@ -341,30 +338,26 @@
 
     <string name="IntroStartMessaging">Jetzt beginnen</string>
     <!--plural-->
-    <string name="Members_zero">%1$d Mitglieder</string>
-    <string name="Members_one">%1$d Mitglied</string>
-    <string name="Members_two">%1$d Mitglieder</string>
-    <string name="Members_few">%1$d Mitglieder</string>
-    <string name="Members_many">%1$d Mitglieder</string>
-    <string name="Members_other">%1$d Mitglieder</string>
-    <string name="NewMessages_zero">keine neuen Nachrichten</string>
-    <string name="NewMessages_one">%1$d neue Nachricht</string>
-    <string name="NewMessages_two">%1$d neue Nachrichten</string>
-    <string name="NewMessages_few">%1$d neue Nachrichten</string>
-    <string name="NewMessages_many">%1$d neue Nachrichten</string>
-    <string name="NewMessages_other">%1$d neue Nachrichten</string>
-    <string name="messages_zero">keine Nachrichten</string>
-    <string name="messages_one">%1$d Nachricht</string>
-    <string name="messages_two">%1$d Nachrichten</string>
-    <string name="messages_few">%1$d Nachrichten</string>
-    <string name="messages_many">%1$d Nachrichten</string>
-    <string name="messages_other">%1$d Nachrichten</string>
-    <string name="items_zero">keine Objekte</string>
-    <string name="items_one">%1$d Objekt</string>
-    <string name="items_two">%1$d Objekte</string>
-    <string name="items_few">%1$d Objekte</string>
-    <string name="items_many">%1$d Objekte</string>
-    <string name="items_other">%1$d Objekte</string>
+    <plurals name="Members">
+        <item quantity="one">%d Mitglied</item>
+        <item quantity="other">%d Mitglieder</item>
+    </plurals>
+    <plurals name="MeAndMembers">
+        <item quantity="one">Ich und %d Mitglied</item>
+        <item quantity="other">Ich und %d Mitglieder</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d neue Nachricht</item>
+        <item quantity="other">%d neue Nachrichten</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d Nachricht</item>
+        <item quantity="other">%d Nachrichten</item>
+    </plurals>
+    <plurals name="AreYouSureDeleteMessages">
+        <item quantity="one">%d Nachricht löschen? Die Nachricht wird auch auf dem Server gelöscht.</item>
+        <item quantity="other">%d Nachrichten löschen? Die Nachrichten werden auch auf dem Server gelöscht.</item>
+    </plurals>
     <string name="FromChats_zero">in keinen Chats</string>
     <string name="FromChats_one">in %1$d Chat</string>
     <string name="FromChats_two">in %1$d Chats</string>
@@ -372,19 +365,11 @@
     <string name="FromChats_many">in %1$d Chats</string>
     <string name="FromChats_other">in %1$d Chats</string>
 
-    <string name="Chats_zero">Keine Chats</string>
-    <string name="Chats_one">%1$d Chat</string>
-    <string name="Chats_two">%1$d Chats</string>
-    <string name="Chats_few">%1$d Chats</string>
-    <string name="Chats_many">%1$d Chats</string>
-    <string name="Chats_other">%1$d Chats</string>
+    <plurals name="Chats">
+        <item quantity="one">%d Chat</item>
+        <item quantity="other">%d Chats</item>
+    </plurals>
 
-    <string name="Seconds_zero">%1$d Sekunden</string>
-    <string name="Seconds_one">%1$d Sekunde</string>
-    <string name="Seconds_two">%1$d Sekunden</string>
-    <string name="Seconds_few">%1$d Sekunden</string>
-    <string name="Seconds_many">%1$d Sekunden</string>
-    <string name="Seconds_other">%1$d Sekunden</string>
     <string name="Minutes_zero">%1$d Minuten</string>
     <string name="Minutes_one">%1$d Minute</string>
     <string name="Minutes_two">%1$d Minuten</string>
@@ -403,42 +388,20 @@
     <string name="Days_few">%1$d Tage</string>
     <string name="Days_many">%1$d Tage</string>
     <string name="Days_other">%1$d Tage</string>
-    <string name="Weeks_zero">%1$d Wochen</string>
-    <string name="Weeks_one">%1$d Woche</string>
-    <string name="Weeks_two">%1$d Wochen</string>
-    <string name="Weeks_few">%1$d Wochen</string>
-    <string name="Weeks_many">%1$d Wochen</string>
-    <string name="Weeks_other">%1$d Wochen</string>
-    <string name="Months_zero">%1$d Monate</string>
-    <string name="Months_one">%1$d Monat</string>
-    <string name="Months_two">%1$d Monate</string>
-    <string name="Months_few">%1$d Monate</string>
-    <string name="Months_many">%1$d Monate</string>
-    <string name="Months_other">%1$d Monate</string>
-    <string name="Years_zero">%1$d Jahre</string>
-    <string name="Years_one">%1$d Jahr</string>
-    <string name="Years_two">%1$d Jahre</string>
-    <string name="Years_few">%1$d Jahre</string>
-    <string name="Years_many">%1$d Jahre</string>
-    <string name="Years_other">%1$d Jahre</string>
-    <string name="Users_zero">%1$d Nutzer</string>
-    <string name="Users_one">%1$d Nutzer</string>
-    <string name="Users_two">%1$d Nutzer</string>
-    <string name="Users_few">%1$d Nutzer</string>
-    <string name="Users_many">%1$d Nutzer</string>
-    <string name="Users_other">%1$d Nutzer</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d Woche</item>
+        <item quantity="other">%d Wochen</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d Monat</item>
+        <item quantity="other">%d Monate</item>
+    </plurals>
     <string name="Times_zero">%1$d Mal</string>
     <string name="Times_one">%1$d Mal</string>
     <string name="Times_two">%1$d Mal</string>
     <string name="Times_few">%1$d Mal</string>
     <string name="Times_many">%1$d Mal</string>
     <string name="Times_other">%1$d Mal</string>
-    <string name="Meters_zero">%1$d Meter</string>
-    <string name="Meters_one">%1$d Meter</string>
-    <string name="Meters_two">%1$d Meter</string>
-    <string name="Meters_few">%1$d Meter</string>
-    <string name="Meters_many">%1$d Meter</string>
-    <string name="Meters_other">%1$d Meter</string>
     <string name="Stickers_zero">%1$d Sticker</string>
     <string name="Stickers_one">%1$d Sticker</string>
     <string name="Stickers_two">%1$d Sticker</string>
@@ -451,18 +414,6 @@
     <string name="Photos_few">%1$d Bilder</string>
     <string name="Photos_many">%1$d Bilder</string>
     <string name="Photos_other">%1$d Bilder</string>
-    <string name="LastSeenMinutes_zero">zul. online vor %1$d Minuten</string>
-    <string name="LastSeenMinutes_one">zul. online vor %1$d Minute</string>
-    <string name="LastSeenMinutes_two">zul. online vor %1$d Minuten</string>
-    <string name="LastSeenMinutes_few">zul. online vor %1$d Minuten</string>
-    <string name="LastSeenMinutes_many">zul. online vor %1$d Minuten</string>
-    <string name="LastSeenMinutes_other">zul. online vor %1$d Minuten</string>
-    <string name="LastSeenHours_zero">zul. online vor %1$d Stunden</string>
-    <string name="LastSeenHours_one">zul. online vor %1$d Stunde</string>
-    <string name="LastSeenHours_two">zul. online vor %1$d Stunden</string>
-    <string name="LastSeenHours_few">zul. online vor %1$d Stunden</string>
-    <string name="LastSeenHours_many">zul. online vor %1$d Stunden</string>
-    <string name="LastSeenHours_other">zul. online vor %1$d Stunden</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM yyyy</string>
     <string name="formatterMonth">d. MMM</string>
@@ -515,7 +466,6 @@
     <string name="SeachUser">Benutzer suchen</string>
     <string name="Name">Name</string>
     <string name="EmailAddress">E-Mail-Adresse</string>
-    <string name="MeAnd">Ich und</string>
     <string name="CannotDeleteContact">Der Benutzer kann nicht gelöscht werden, da er verwendet wird; er kann aber blockiert werden.</string>
     <string name="BadEmailAddress">Ungültige E-Mail-Adresse.</string>
     <string name="ContactDeleted">Benutzer gelöscht.</string>
@@ -528,7 +478,7 @@
     <string name="InviteMenuEntry">Einladungen versenden</string>
     <string name="InviteText">Ich verwende nun auch den Delta Chat Messenger - %1$s - und bin dort unter %2$s erreichbar.</string>
     <string name="AdvancedSettings">Fortgeschrittene Einstellungen</string>
-    <string name="CannotConnect"></string>
+    <string name="CannotConnect">Verbindung mit dem Konto nicht möglich, bitte überprüfen Sie die Konfiguration.</string>
     <string name="AskResetNotifications">Alle Benachrichtigungseinstellungen und Töne dieser Seite und auch der einzelnen Chats zurücksetzen?</string>
     <string name="AttachFiles">Dateien anhängen</string>
     <string name="ErrGroupNameEmpty">Bitte einen Namen für die Gruppe eingeben.</string>
@@ -549,4 +499,5 @@
     <string name="E2ECompareKeys">Schlüssel vergleichen</string>
     <string name="ResetUserKey">Benutzerschlüssel zurücksetzen</string>
     <string name="ForwardToTitle">Weiterleiten an …</string>
+    <string name="Chats">Chats</string>
 </resources>

MessengerProj/src/main/res/values-es/strings.xml

@@ -78,8 +78,6 @@
     <string name="NoContacts">Aún sin contactos</string>
     <string name="TodayAt">a las</string>
     <string name="YesterdayAt">ayer a las</string>
-    <string name="LastSeen">últ. vez</string>
-    <string name="LastSeenDate">últ. vez el</string>
     <!--group create view-->
     <string name="SendMessageTo">Invitar a…</string>
     <string name="EnterGroupNamePlaceholder">Nombre del grupo</string>
@@ -308,7 +306,6 @@
     <string name="ShareYouLocationUnableManually">Elegir manualmente</string>
     <string name="AreYouSureBlockContact">¿Quieres bloquear este contacto?</string>
     <string name="AreYouSureDeleteContact">¿Quieres eliminar este contacto?</string>
-    <string name="AreYouSureDeleteMessages">¿Quieres eliminar %1$s?</string>
     <string name="RaiseToSpeakAlert">¿Quieres habilitar “Elevar para hablar” para mensajes de voz?</string>
     <!--permissions-->
     <string name="PermissionContacts">Delta Chat necesita el acceso a tus contactos, para que puedas comunicarte con ellos en todos tus dispositivos.</string>
@@ -320,42 +317,24 @@
     <!--Intro view-->
     <string name="IntroStartMessaging">Empieza a conversar</string>
     <!--plural-->
-    <string name="Members_zero">%1$d miembros</string>
-    <string name="Members_one">%1$d miembro</string>
-    <string name="Members_two">%1$d miembros</string>
-    <string name="Members_few">%1$d miembros</string>
-    <string name="Members_many">%1$d miembros</string>
-    <string name="Members_other">%1$d miembros</string>
-    <string name="NewMessages_zero">Sin mensajes nuevos</string>
-    <string name="NewMessages_one">%1$d nuevo mensaje</string>
-    <string name="NewMessages_two">%1$d nuevos mensajes</string>
-    <string name="NewMessages_few">%1$d nuevos mensajes</string>
-    <string name="NewMessages_many">%1$d nuevos mensajes</string>
-    <string name="NewMessages_other">%1$d nuevos mensajes</string>
-    <string name="messages_zero">Sin mensajes</string>
-    <string name="messages_one">%1$d mensaje</string>
-    <string name="messages_two">%1$d mensajes</string>
-    <string name="messages_few">%1$d mensajes</string>
-    <string name="messages_many">%1$d mensajes</string>
-    <string name="messages_other">%1$d mensajes</string>
-    <string name="items_zero">Sin ítems</string>
-    <string name="items_one">%1$d ítem</string>
-    <string name="items_two">%1$d ítems</string>
-    <string name="items_few">%1$d ítems</string>
-    <string name="items_many">%1$d ítems</string>
-    <string name="items_other">%1$d ítems</string>
+    <plurals name="Members">
+        <item quantity="one">%d miembro</item>
+        <item quantity="other">%d miembros</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nuevo mensaje</item>
+        <item quantity="other">%d nuevos mensajes</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d mensaje</item>
+        <item quantity="other">%d mensajes</item>
+    </plurals>
     <string name="FromChats_zero">desde ningún chat</string>
     <string name="FromChats_one">desde %1$d chat</string>
     <string name="FromChats_two">desde %1$d chats</string>
     <string name="FromChats_few">desde %1$d chats</string>
     <string name="FromChats_many">desde %1$d chats</string>
     <string name="FromChats_other">desde %1$d chats</string>
-    <string name="Seconds_zero">%1$d segundos</string>
-    <string name="Seconds_one">%1$d segundo</string>
-    <string name="Seconds_two">%1$d segundos</string>
-    <string name="Seconds_few">%1$d segundos</string>
-    <string name="Seconds_many">%1$d segundos</string>
-    <string name="Seconds_other">%1$d segundos</string>
     <string name="Minutes_zero">%1$d minutos</string>
     <string name="Minutes_one">%1$d minuto</string>
     <string name="Minutes_two">%1$d minutos</string>
@@ -374,42 +353,20 @@
     <string name="Days_few">%1$d días</string>
     <string name="Days_many">%1$d días</string>
     <string name="Days_other">%1$d días</string>
-    <string name="Weeks_zero">%1$d semanas</string>
-    <string name="Weeks_one">%1$d semana</string>
-    <string name="Weeks_two">%1$d semanas</string>
-    <string name="Weeks_few">%1$d semanas</string>
-    <string name="Weeks_many">%1$d semanas</string>
-    <string name="Weeks_other">%1$d semanas</string>
-    <string name="Months_zero">%1$d meses</string>
-    <string name="Months_one">%1$d mes</string>
-    <string name="Months_two">%1$d meses</string>
-    <string name="Months_few">%1$d meses</string>
-    <string name="Months_many">%1$d meses</string>
-    <string name="Months_other">%1$d meses</string>
-    <string name="Years_zero">%1$d años</string>
-    <string name="Years_one">%1$d año</string>
-    <string name="Years_two">%1$d años</string>
-    <string name="Years_few">%1$d años</string>
-    <string name="Years_many">%1$d años</string>
-    <string name="Years_other">%1$d años</string>
-    <string name="Users_zero">%1$d usuarios</string>
-    <string name="Users_one">%1$d usuario</string>
-    <string name="Users_two">%1$d usuarios</string>
-    <string name="Users_few">%1$d usuarios</string>
-    <string name="Users_many">%1$d usuarios</string>
-    <string name="Users_other">%1$d usuarios</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d semana</item>
+        <item quantity="other">%d semanas</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d mes</item>
+        <item quantity="other">%d meses</item>
+    </plurals>
     <string name="Times_zero">%1$d veces</string>
     <string name="Times_one">%1$d vez</string>
     <string name="Times_two">%1$d veces</string>
     <string name="Times_few">%1$d veces</string>
     <string name="Times_many">%1$d veces</string>
     <string name="Times_other">%1$d veces</string>
-    <string name="Meters_zero">%1$d metros</string>
-    <string name="Meters_one">%1$d metro</string>
-    <string name="Meters_two">%1$d metros</string>
-    <string name="Meters_few">%1$d metros</string>
-    <string name="Meters_many">%1$d metros</string>
-    <string name="Meters_other">%1$d metros</string>
     <string name="Stickers_zero">%1$d stickers</string>
     <string name="Stickers_one">%1$d sticker</string>
     <string name="Stickers_two">%1$d stickers</string>
@@ -422,18 +379,6 @@
     <string name="Photos_few">%1$d fotos</string>
     <string name="Photos_many">%1$d fotos</string>
     <string name="Photos_other">%1$d fotos</string>
-    <string name="LastSeenMinutes_zero">últ. vez hace %1$d minutos</string>
-    <string name="LastSeenMinutes_one">últ. vez hace %1$d minuto</string>
-    <string name="LastSeenMinutes_two">últ. vez hace %1$d minutos</string>
-    <string name="LastSeenMinutes_few">últ. vez hace %1$d minutos</string>
-    <string name="LastSeenMinutes_many">últ. vez hace %1$d minutos</string>
-    <string name="LastSeenMinutes_other">últ. vez hace %1$d minutos</string>
-    <string name="LastSeenHours_zero">últ. vez hace %1$d horas</string>
-    <string name="LastSeenHours_one">últ. vez hace %1$d hora</string>
-    <string name="LastSeenHours_two">últ. vez hace %1$d horas</string>
-    <string name="LastSeenHours_few">últ. vez hace %1$d horas</string>
-    <string name="LastSeenHours_many">últ. vez hace %1$d horas</string>
-    <string name="LastSeenHours_other">últ. vez hace %1$d horas</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM \'de\' yyyy</string>
     <string name="formatterMonth">dd \'de\' MMM</string>

MessengerProj/src/main/res/values-fr/strings.xml

@@ -0,0 +1,497 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<resources>
+    <string name="AppName">Delta Chat</string>
+    <string name="LanguageName">Français</string>
+    <string name="LanguageNameInEnglish">French</string>
+    <string name="LanguageCode">fr</string>
+    <!--chats view-->
+    <string name="Settings">Paramètres</string>
+    <string name="NewGroup">Nouveau groupe</string>
+    <string name="Yesterday">hier</string>
+    <string name="NoResult">Aucun résultat.</string>
+    <string name="NoChats">Aucune conversation.</string>
+    <string name="WaitingForNetwork">En attente du réseau…</string>
+    <string name="Connecting">Connexion…</string>
+    <string name="Updating">Mise à jour…</string>
+    <string name="DeleteChat">Supprimer la conversation</string>
+    <string name="SelectChat">Selectionner la conversation…</string>
+    <string name="Search">Rechercher</string>
+    <string name="MuteNotifications">Désactiver les notifications</string>
+    <string name="MuteFor">Silence pour %1$s</string>
+    <string name="UnmuteNotifications">Activer les notifications</string>
+    <string name="WillUnmuteIn">Dans %1$s</string>
+    <string name="Draft">Brouillons</string>
+    <!--audio view-->
+    <string name="NoAudio">Veuillez ajouter des fichiers dans votre bibliotèque musicale pour les voir ici.</string>
+    <string name="AttachMusic">Musique</string>
+    <string name="AudioUnknownArtist">Artiste inconnu</string>
+    <string name="AudioUnknownTitle">Titre inconnu</string>
+    <!--documents view-->
+    <string name="SelectFile">Selectionner le fichier</string>
+    <string name="FreeOfTotal">Free %1$s of %2$s</string>
+    <string name="UnknownError">Erreur inconnue</string>
+    <string name="AccessError">Erreur d\'accès</string>
+    <string name="NoFiles">Aucun fichier pour le moment…</string>
+    <string name="FileUploadLimit">La taille du fichier ne peut pas exéder %1$s</string>
+    <string name="NotMounted">Stockage non monté</string>
+    <string name="UsbActive">Transfert USB en cours</string>
+    <string name="InternalStorage">Stockage interne</string>
+    <string name="ExternalStorage">Stockage externe</string>
+    <string name="SystemRoot">Racine</string>
+    <string name="SdCard">Carte SD</string>
+    <string name="Folder">Dossier</string>
+    <string name="GalleryInfo">Pour envoyer des images sans compression</string>
+    <!--chat view-->
+    <string name="ChatGallery">Gallerie</string>
+    <string name="ChatLocation">Localisation</string>
+    <string name="ChatVideo">Vidéo</string>
+    <string name="ChatDocument">Fichier</string>
+    <string name="ChatCamera">Appareil photo</string>
+    <string name="NoMessages">Aucun message.</string>
+    <string name="ForwardedMessage">Message transmis</string>
+    <string name="From">De</string>
+    <string name="NoRecent">Pas de récents</string>
+    <string name="TypeMessage">Message</string>
+    <string name="SlideToCancel">GLISSER POUR ANNULER</string>
+    <string name="SaveToDownloads">Enregistrer dans les téléchargements</string>
+    <string name="DeleteGif">Supprimer GIF ?</string>
+    <string name="SaveToMusic">Enregistrer dans les musiques</string>
+    <string name="ShareFile">Partager</string>
+    <string name="UnsupportedAttachment">Pièce jointe non gérée</string>
+    <string name="OpenInBrowser">OUVRIR DANS…</string>
+    <string name="SendItems">Envoyer %1$s</string>
+    <string name="OpenUrlAlert">Ouvrir URL %1$s ?</string>
+    <string name="MoreInfo">Plus d\'info</string>
+    <string name="ShareSendTo">Envoyer à…</string>
+    <string name="ClearRecentEmoji">Vider les emokis récent ?</string>
+    <string name="AddShortcut">Ajouter le widget à l\'écran d\'accueil</string>
+    <string name="ShortcutAdded">Widget ajouté à l\'écran d\'accueil</string>
+    <!--notification-->
+    <string name="Reply">Répondre</string>
+    <string name="ReplyToGroup">Répondre à %1$s</string>
+    <string name="ReplyToUser">Répondre à %1$s</string>
+    <string name="NotificationMessagesPeopleDisplayOrder">%1$s %2$s</string>
+    <!--contacts view-->
+    <string name="NoContacts">Aucun utilisateur pour le moment.</string>
+    <string name="TodayAt">à</string>
+    <string name="YesterdayAt">hier à</string>
+    <!--group create view-->
+    <string name="SendMessageTo">Envoyer un message à…</string>
+    <string name="EnterGroupNamePlaceholder">Saisissez le nom du groupe</string>
+    <string name="ShareLink">Partager le lien</string>
+    <!--group info view-->
+    <string name="SharedMedia">Media partagés</string>
+    <string name="SETTINGS">Paramètres</string>
+    <string name="AddMember">Ajouter un membre</string>
+    <string name="Notifications">Notifications</string>
+    <string name="RemoveMember">Supprimer un membre</string>
+    <!--contact info view-->
+    <string name="ShareContact">Partager</string>
+    <string name="AddContact">Ajouter</string>
+    <string name="NewContactTitle">Nouvel utilisateur</string>
+    <string name="BlockContact">Bloquer le contact</string>
+    <string name="DeleteContact">Supprimer le contact</string>
+    <string name="Info">Info</string>
+    <!--stickers view-->
+    <string name="Stickers">Autocollants</string>
+    <string name="AddStickers">Ajouter des autocollants</string>
+    <string name="AddToStickers">Ajouter aux autocollants</string>
+    <string name="AddStickersNotFound">Autocollants introuvables</string>
+    <string name="StickersRemoved">Autocollants supprimés</string>
+    <string name="AddStickersInstalled">Nouveaux autocollants ajoutés</string>
+    <string name="StickersHide">Cacher</string>
+    <string name="StickersShow">Montrer</string>
+    <string name="StickersShare">Partager</string>
+    <string name="StickersCopy">Copier le lien</string>
+    <string name="StickersRemove">Effacer</string>
+    <string name="NoStickers">Aucun autocollant pour le moment</string>
+    <string name="SendSticker">ENVOYER L\'AUTOCOLLANT</string>
+    <!--settings view-->
+    <string name="TextSize">Taille de la police des messages</string>
+    <string name="EnableAnimations">Animation des transitions</string>
+    <string name="UnblockContact">Débloquer le contact</string>
+    <string name="NoBlocked">Aucun contact bloqué</string>
+    <string name="NormalMessages">Messages normaux</string>
+    <string name="Alert">Alerte</string>
+    <string name="MessagePreview">Prévisualisation du message</string>
+    <string name="GroupMessages">Message de groupe</string>
+    <string name="Sound">Son</string>
+    <string name="InAppNotifications">Notifications dans l\'application</string>
+    <string name="Vibrate">Vibrer</string>
+    <string name="Reset">Reinitialiser</string>
+    <string name="ResetAllNotifications">Réinitialiser les notifications</string>
+    <string name="NotificationsAndSounds">Notifications et sons</string>
+    <string name="BlockedUsers">Contacts bloqués</string>
+    <string name="Default">Defaut</string>
+    <string name="OnlyIfSilent">Seulement en silencieux</string>
+    <string name="ChatBackground">Arrière-plan de conversation</string>
+    <string name="SendByEnter">Envoyer avec "Entrée"</string>
+    <string name="Language">Langue</string>
+    <string name="Help">Aide</string>
+    <string name="DeleteLocalization">Supprimer la localisation ?</string>
+    <string name="Enabled">Activé</string>
+    <string name="Disabled">Désactivé</string>
+    <string name="NotificationsService">Service de continuité</string>
+    <string name="NotificationsServiceInfo">Redémarre l\'application quand elle est arrêtée par le système ou l\'utilisateur. Vous serez assurés de recevoir les notifications.</string>
+    <string name="NotificationsServiceConnection">Connexion en arrière-plan</string>
+    <string name="NotificationsServiceConnectionInfo">Garde une connexion à faible impact en arrière-plan pour recevoir les notifications. Activer pour des notification fiables.</string>
+    <string name="LedColor">Couleur de la notification par LED</string>
+    <string name="BadgeNumber">Montrer le compte dans l\'icône, si possible</string>
+    <string name="Short">Court</string>
+    <string name="Long">Long</string>
+    <string name="SystemDefault">Par défaut du système</string>
+    <string name="RaiseToSpeak">Lever pour parler</string>
+    <string name="EditName">Changer le nom</string>
+    <string name="NotificationsPriority">Priorité de la notification</string>
+    <string name="NotificationsPriorityDefault">Normal</string>
+    <string name="NotificationsPriorityHigh">Haute</string>
+    <string name="NotificationsPriorityMax">La plus haute</string>
+    <string name="RepeatNotifications">Répéter les notifications</string>
+    <string name="NotificationsOther">Autres</string>
+    <string name="InChatSound">Sons dans la conversation</string>
+    <string name="SoundDefault">Defaut</string>
+    <string name="VibrationDefault">Defaut</string>
+    <string name="SmartNotifications">Limiter les notifications</string>
+    <string name="SmartNotificationsInfo">Notifications sonore au maximum %1$s fois toutes les %2$s</string>
+    <string name="SmartNotificationsSoundAtMost">Notifier au maximum</string>
+    <string name="SmartNotificationsTimes">fois</string>
+    <string name="SmartNotificationsWithin">toutes les</string>
+    <string name="SmartNotificationsMinutes">minutes</string>
+    <string name="DirectShare">Partage direct</string>
+    <string name="DirectShareInfo">Montrer les conversations récentes dans le menu de partage</string>
+    <!--cache view-->
+    <string name="CacheSettings">Stockage</string>
+    <string name="LocalDatabase">Base de données locale</string>
+    <string name="LocalDatabaseClear">Effacer tous les messages cachés localement ?</string>
+    <string name="LocalDatabaseInfo">Effacer la base de données locale va supprimer les textes des messages cachés et compresser la base de données pour gagner de l\'espace disque sur le stockage interne. L\'application a besoin de certaines données pour fonctionner, donc, la base de données n\'aura pas un taille nulle.\n\nL\'opération peut prendre plusieurs minutes.</string>
+    <string name="ClearMediaCache">Effacer le cache</string>
+    <string name="CacheClear">Effacer</string>
+    <string name="LocalDocumentCache">Documents</string>
+    <string name="LocalPhotoCache">Photos</string>
+    <string name="LocalAudioCache">Messages vocaux</string>
+    <string name="LocalVideoCache">Vidéos</string>
+    <string name="LocalMusicCache">Musique</string>
+    <string name="LocalCache">Autres fichiers</string>
+    <string name="CacheEmpty">Vide</string>
+    <string name="KeepMedia">Conserver les fichier média</string>
+    <string name="KeepMediaInfo">Les photos, vidéos et autres fichiers venant des conversations du cloud que vous n\'avez <![CDATA[<b>pas</b>]]> consultés pendant cette période seront supprimés pour libérer de l\'espace.</string>
+    <string name="KeepMediaForever">Toujours</string>
+    <!--passcode view-->
+    <string name="Passcode">Verrouiller par mot de passe</string>
+    <string name="ChangePasscode">Modifier le mot de passe</string>
+    <string name="ChangePasscodeInfo">Quand vous ajoutez un mot de passe additionnel, une icône de verrouillage apparaîtra sur la page des conversations. Appuyez sur cette icône et déverrouillez l\'application.\n\nNote : si vous oubliez le mot de passe, vous devrez supprimer et réinstaller l\'application.</string>
+    <string name="PasscodePIN">PIN</string>
+    <string name="PasscodePassword">Mot de passe</string>
+    <string name="EnterCurrentPasscode">Saississez votre mot de passe actuel</string>
+    <string name="EnterNewFirstPasscode">Saississez un mot de passe</string>
+    <string name="EnterNewPasscode">Saississez un nouveau mot de passe</string>
+    <string name="EnterYourPasscode">Saississez votre mot de passe</string>
+    <string name="ReEnterYourPasscode">Ressaississez votre mot de passe</string>
+    <string name="PasscodeDoNotMatch">Les mots de passe ne correspondent pas</string>
+    <string name="AutoLock">Verrouillage automatique</string>
+    <string name="AutoLockInfo">Redemande le mot de passe en cas d\'inactivité prolongée.</string>
+    <string name="AutoLockInTime">dans %1$s</string>
+    <string name="UnlockFingerprint">Déverrouiller avec votre empreinte digitale</string>
+    <string name="FingerprintInfo">Confirmer votre empreinte digitale pour continuer</string>
+    <string name="FingerprintHelp">Capteur tactile</string>
+    <string name="FingerprintNotRecognized">Empreinte non reconnue. Essayer encore</string>
+    <!--photo gallery view-->
+    <string name="ShowAllMedia">Montrer tous les médias</string>
+    <string name="SaveToGallery">Enregistrer dans la galerie</string>
+    <string name="Of">%1$d de %2$d</string>
+    <string name="Gallery">Gallerie</string>
+    <string name="AllPhotos">Toutes les photos</string>
+    <string name="AllVideo">Toutes les vidéos</string>
+    <string name="NoPhotos">Aucune photo pour le moment</string>
+    <string name="NoVideo">Aucune vidéo pour le moement</string>
+    <string name="PleaseDownload">Veuiller télécharger le média</string>
+    <string name="NoRecentPhotos">Aucune photo récente</string>
+    <string name="NoRecentGIFs">Aucun GIF récent</string>
+    <string name="SearchImages">TROUVER LES IMAGES</string>
+    <string name="SearchImagesInfo">RECHERCHER SUR LE WEB</string>
+    <string name="SearchGifs">TROUVER DES GIFS</string>
+    <string name="SearchImagesTitle">Recherche sur le web</string>
+    <string name="SearchGifsTitle">Rechercher des GIF</string>
+    <string name="CropImage">Couper les images</string>
+    <string name="EditImage">Modifier les images</string>
+    <string name="Enhance">Améliorer</string>
+    <string name="Highlights">Surbriller</string>
+    <string name="Contrast">Contraste</string>
+    <string name="Exposure">Exposition</string>
+    <string name="Warmth">Température</string>
+    <string name="Saturation">Saturation</string>
+    <string name="Vignette">Vignette</string>
+    <string name="Shadows">Ombres</string>
+    <string name="Grain">Grain</string>
+    <string name="Sharpen">Netteté</string>
+    <string name="Fade">Fondu</string>
+    <string name="Tint">Teinte</string>
+    <string name="TintShadows">OMBRES</string>
+    <string name="TintHighlights">SURBRILLANCE</string>
+    <string name="Curves">Courbes</string>
+    <string name="CurvesAll">TOUT</string>
+    <string name="CurvesRed">ROUGE</string>
+    <string name="CurvesGreen">VERT</string>
+    <string name="CurvesBlue">BLEU</string>
+    <string name="Blur">Flou</string>
+    <string name="BlurOff">Désactiver</string>
+    <string name="BlurLinear">Linéaire</string>
+    <string name="BlurRadial">Radial</string>
+    <string name="DiscardChanges">Ignorer les changements ?</string>
+    <string name="ClearSearch">Effacer l\'historique de recherche ?</string>
+    <string name="ClearButton">Effacer</string>
+    <string name="PickerPhotos">Photos</string>
+    <string name="PickerVideo">Vidéo</string>
+    <string name="AddCaption">Ajouter une légende…</string>
+    <string name="PhotoCaption">Légende de photo</string>
+    <string name="VideoCaption">Légende de vidéo</string>
+    <string name="Caption">Légende</string>
+    <!--privacy settings-->
+    <string name="PrivacySettings">Vie privée et sécurité</string>
+    <string name="PrivacyTitle">Vie privée</string>
+    <string name="SecurityTitle">Securité</string>
+    <!--edit video view-->
+    <string name="EditVideo">Modifier la vidéo</string>
+    <string name="OriginalVideo">Vidéo originale</string>
+    <string name="EditedVideo">Vidéos modifiées</string>
+    <string name="SendingVideo">Envoi de la vidéo…</string>
+    <string name="CompressVideo">Compresser la vidéo</string>
+    <!--button titles-->
+    <string name="Next">Suivant</string>
+    <string name="Back">Précédent</string>
+    <string name="Done">Fait</string>
+    <string name="Open">Ouvrir</string>
+    <string name="Save">Enregistrer</string>
+    <string name="Cancel">Annuler</string>
+    <string name="Close">Fermer</string>
+    <string name="Add">Ajouter</string>
+    <string name="Edit">Modifier</string>
+    <string name="Send">Envoyer</string>
+    <string name="CopyToClipboard">Copier vers le presse-papier</string>
+    <string name="Delete">Supprimer</string>
+    <string name="Forward">Renvoyer</string>
+    <string name="Retry">Réessayer</string>
+    <string name="FromCamera">Depuis la caméra</string>
+    <string name="FromGalley">Depuis la galerie</string>
+    <string name="DeletePhoto">Supprimer la photo</string>
+    <string name="Set">Définir</string>
+    <string name="OK">OK</string>
+    <string name="Crop">DÉCOUPER</string>
+    <!--messages-->
+    <string name="AttachPhoto">Photo</string>
+    <string name="AttachVideo">Vidéo</string>
+    <string name="AttachGif">GIF</string>
+    <string name="AttachLocation">Localisation</string>
+    <string name="AttachContact">Contact</string>
+    <string name="AttachDocument">Fichier</string>
+    <string name="AttachSticker">Autocollant</string>
+    <string name="AttachAudio">Message vocal</string>
+    <string name="FromSelf">Moi</string>
+    <!--Alert messages-->
+    <string name="Loading">Chargement…</string>
+    <string name="NoPlayerInstalled">Vous n\'avez pas de lecteur vidéo, installez-en un pour continuer</string>
+    <string name="NoHandleAppInstalled">Vous n\'avez pas d\'application qui peut gérer le type \'%1$s\', veuillez en installer un pour continuer</string>
+    <string name="AddToTheGroupTitle">Ajouter %1$s à la conversation %2$s?</string>
+    <string name="AddToTheGroup">Ajouter %1$s au groupe ?</string>
+    <string name="UserAlreadyInGroup">Ce contact est déjà dans ce groupe</string>
+    <string name="ForwardMessagesTo">Renvoyer les messages sélectionnés à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
+    <string name="SendMessagesTo">Envoyer les messages à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
+    <string name="SendContactTo">Envoyer le contact à %1$s ?</string>
+    <string name="AreYouSureDeleteAndExit">Êtes-vous sûr de vouloir quitter le groupe ? Vous ne recevrez plus de message de ce groupe.</string>
+    <string name="AreYouSureDeleteThisChat">Êtes-vous sûr de vouloir supprimer cette conversation ? La conversation n\'apparaîtra plus dans la liste des conversations, mais les messages resteront sur le serveur.</string>
+    <string name="ShareYouLocationUnable">L\'application n\'a pas pu déterminer votre localisation actuelle</string>
+    <string name="ShareYouLocationUnableManually">Choisir manuellement</string>
+    <string name="AreYouSureBlockContact">Êtes-vous sûr de vouloir bloquer cet utilisateur ?</string>
+    <string name="AreYouSureDeleteContact">Êtes-vous sûr de vouloir supprimer cet utilisateur ?</string>
+    <string name="RaiseToSpeakAlert">Voulez-vous activer le "Soulever pour parler" pour les messages vocaux ?</string>
+    <!--permissions-->
+    <string name="PermissionContacts">Delta Chat a besoin d\'accéder aux contacts de façon à pouvoir vous connecter avec vos amis avec tous vos appareils.</string>
+    <string name="PermissionStorage">Delta Chat a besoin d\'accéder au stockage pour envoyer vos photos, vidéos, musiques et autres médias.</string>
+    <string name="PermissionNoAudio">Delta Chat a besoin d\'accéder à votre microphone pour envoyer des messages vocaux.</string>
+    <string name="PermissionNoLocation">Delta Chat a besoin d\'accéder à votre localisation pour le partager avec vos amis.</string>
+    <string name="PermissionNoLocationPosition">Delta Chat a besoin d\'accéder à votre localisation.</string>
+    <string name="PermissionOpenSettings">Paramètres</string>
+    <!--Intro view-->
+    <string name="Intro1Headline">Delta Chat</string>
+    <string name="Intro1Message">La messagerie avec <![CDATA[<b>le plus grande portée</b>]]> dans le monde.<![CDATA[<br/><b>Libre</b>]]> et <![CDATA[<b>sécurisé</b>]]>.</string>
+
+    <string name="Intro2Headline">Indépendent</string>
+    <string name="Intro2Message"><![CDATA[<b>Aucune dépendance</b>]]> à des ordinateurs ou services tiers. L\'application utilise juste votre serveur d\'e-mail.</string>
+
+    <string name="Intro3Headline">Rapide</string>
+    <string name="Intro3Message">Envoyez des messages<![CDATA[<b>en quelques secondes</b>]]>.<![CDATA[<br/>]]>Interface rapide.</string>
+
+    <string name="Intro4Headline">Puissant</string>
+    <string name="Intro4Message">Envoyer et recevez des messages, des photo, des vidéos, des messages audios et plus <![CDATA[<b>sans limite</b>]]>. Compatible multi-plateforme.</string>
+
+    <string name="Intro5Headline">Libre</string>
+    <string name="Intro5Message"><![CDATA[<b>Delta Chat</b>]]> sera toujours libre.<![CDATA[<br/>]]>OpenSource. Pas de pub. Pas d\'inscription.</string>
+
+    <string name="Intro6Headline">Sûr</string>
+    <string name="Intro6Message"><![CDATA[<b>Chiffré</b>]]> avec des algorithmes communs. Les messages restent sur vos serveurs.</string>
+
+    <string name="Intro7Headline">Fiable</string>
+
+    <string name="IntroStartMessaging">Commencez à converser</string>
+    <!--plural-->
+    <plurals name="Members">
+        <item quantity="one">%d membre</item>
+        <item quantity="other">%d membres</item>
+    </plurals>
+    <plurals name="MeAndMembers">
+        <item quantity="one">Moi et %d membre</item>
+        <item quantity="other">Moi et %d membres</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nouveau message</item>
+        <item quantity="other">%d nouveaux messages</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <string name="FromChats_zero">d\'aucune conversation</string>
+    <string name="FromChats_one">de %1$d conversation</string>
+    <string name="FromChats_two">de %1$d conversations</string>
+    <string name="FromChats_few">de %1$d conversations</string>
+    <string name="FromChats_many">de %1$d conversations</string>
+    <string name="FromChats_other">de %1$d conversations</string>
+
+    <plurals name="Chats">
+        <item quantity="one">%d conversation</item>
+        <item quantity="other">%d conversations</item>
+    </plurals>
+
+    <string name="Minutes_zero">%1$d minute</string>
+    <string name="Minutes_one">%1$d minute</string>
+    <string name="Minutes_two">%1$d minutes</string>
+    <string name="Minutes_few">%1$d minutes</string>
+    <string name="Minutes_many">%1$d minutes</string>
+    <string name="Minutes_other">%1$d minutes</string>
+    <string name="Hours_zero">%1$d heure</string>
+    <string name="Hours_one">%1$d heure</string>
+    <string name="Hours_two">%1$d heures</string>
+    <string name="Hours_few">%1$d heures</string>
+    <string name="Hours_many">%1$d heures</string>
+    <string name="Hours_other">%1$d heures</string>
+    <string name="Days_zero">%1$d jour</string>
+    <string name="Days_one">%1$d jour</string>
+    <string name="Days_two">%1$d jours</string>
+    <string name="Days_few">%1$d jours</string>
+    <string name="Days_many">%1$d jours</string>
+    <string name="Days_other">%1$d jours</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d semaine</item>
+        <item quantity="other">%d semaines</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d mois</item>
+        <item quantity="other">%d mois</item>
+    </plurals>
+    <string name="Times_zero">%1$d fois</string>
+    <string name="Times_one">%1$d fois</string>
+    <string name="Times_two">%1$d fois</string>
+    <string name="Times_few">%1$d fois</string>
+    <string name="Times_many">%1$d fois</string>
+    <string name="Times_other">%1$d fois</string>
+    <string name="Stickers_zero">%1$d autocollant</string>
+    <string name="Stickers_one">%1$d autocollant</string>
+    <string name="Stickers_two">%1$d autocollants</string>
+    <string name="Stickers_few">%1$d autocollants</string>
+    <string name="Stickers_many">%1$d autocollants</string>
+    <string name="Stickers_other">%1$d autocollants</string>
+    <string name="Photos_zero">%1$d photo</string>
+    <string name="Photos_one">%1$d photo</string>
+    <string name="Photos_two">%1$d photos</string>
+    <string name="Photos_few">%1$d photos</string>
+    <string name="Photos_many">%1$d photos</string>
+    <string name="Photos_other">%1$d photos</string>
+    <!--date formatters-->
+    <string name="formatterMonthYear">MMMM yyyy</string>
+    <string name="formatterMonth">dd MMM</string>
+    <string name="formatterYear">dd.MM.yyyy</string>
+    <string name="chatDate">EEE, d MMMM</string>
+    <string name="chatFullDate">EEE, d MMMM yyyy</string>
+    <string name="formatterWeek">EEE</string>
+    <string name="formatterDay24H">HH:mm</string>
+    <string name="formatterDay12H">h:mm a</string>
+    <string name="formatDateAtTime">%1$s à %2$s</string>
+    <string name="AccountSettings">Paramètres du compte</string>
+    <string name="MyAccount">Mon compte</string>
+    <string name="Yes">Oui</string>
+    <string name="No">Non</string>
+    <string name="MyName">Mon nom</string>
+    <string name="MyNameExplain">Votre nom, tel que montré par les destinataires.\n\nSi vous ne saisissez pas un nom, les destinataires ne verront que votre adresse e-mail renseignée dans les paramètres de compte.</string>
+    <string name="MyEmailAddress">Mon adresse e-mail</string>
+    <string name="Password">Mot de passe</string>
+    <string name="SmtpPassword">Mot de passe SMTP</string>
+    <string name="FromAbove">de ci-dessus</string>
+    <string name="SmtpLoginname">Identifiant SMTP</string>
+    <string name="SmtpPort">Port SMTP</string>
+    <string name="Automatic">automatique</string>
+    <string name="ImapServer">Serveur IMAP</string>
+    <string name="ImapLoginname">Identifiant IMAP</string>
+    <string name="SmtpServer">Serveur SMTP</string>
+    <string name="ImapPort">Port IMAP</string>
+    <string name="InboxHeadline">Boîte de reception</string>
+    <string name="OutboxHeadline">Boîte d\'envoi</string>
+    <string name="BasicSettings">Paramètres de base</string>
+    <string name="MyAccountExplain">Pour les fournisseurs e-mails connus, les paramètres suivants sont déterminés automatiquement.</string>
+    <string name="MyAccountExplain2" >Parfois, les protocoles IMAP/SMTP doivent êtres activés depuis l\'interface web.\n\nSi vous rencontrez des problème, demandez à votre fournisseur ou à vos amis.</string>
+    <string name="AccountNotConfigured">Compte non configuré</string>
+    <string name="AboutThisProgram">À propos Delta Chat</string>
+    <string name="NotSet">Non défini</string>
+    <string name="NewChat">Nouvelle conversation</string>
+    <string name="MemberSg">## membre</string>
+    <string name="MemberPl">## membres</string>
+    <string name="ContactSg">## contact</string>
+    <string name="ContactPl">## contacts</string>
+    <string name="Deaddrop">Boîte de reception</string>
+    <string name="Media">Média</string>
+    <string name="DeaddropInChatlist">Montrer la boîte de reception dans la liste des conversations</string>
+    <string name="MuteAlways">Toujours muet</string>
+    <string name="AskStartChatWith">Lancer une conversation avec <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ?</string>
+    <string name="DeaddropHint">Pour lancer une conversation, cliquez sur le bouton de réponse en forme de flèche.</string>
+    <string name="NotYetImplemented">This function is not available or incomplete.</string>
+    <string name="DefaultStatusText">Envoyé avec ma messagerie Delta Chat</string>
+    <string name="SubjectPrefix">Message instantanné</string>
+    <string name="SeachUser">Recherche un contact</string>
+    <string name="Name" >Nom</string>
+    <string name="EmailAddress">Adresse e-mail</string>
+    <string name="CannotDeleteContact">Impossible de supprimer les contacts en cours d\'utilisation, bloquez-les à la place.</string>
+    <string name="BadEmailAddress">Mauvaise adresse e-mail.</string>
+    <string name="ContactDeleted">Utilisateur supprimé.</string>
+    <string name="ContactCreated">Utilisateur créé.</string>
+    <string name="ViewProfile">Voir le profil</string>
+    <string name="OneMomentPlease">Un moment…</string>
+    <string name="CannotDeleteChat">Impossible de supprimer la conversation.</string>
+    <string name="NoChatsHelp">Lancez une conversation en appuyant sur le bouton dans le coin inférieur droit ou appuyez sur le bouton menu pour plus d\'options.</string>
+    <string name="ConfiguringAccount">Configuration du compte en cours…</string>
+    <string name="CannotConnect">Connexion impossible, veuillez vérifier la configuration.</string>
+    <string name="Intro7Message"><![CDATA[<b>Delta Chat</b>]]> est sûr pour une utilisation professionnelle, compatible et basé sur des standards.</string>
+    <string name="InviteMenuEntry">Envoyer des invitations</string>
+    <string name="InviteText">J\'utilise la messagerie Delta Chat maintenant - %1$s - vous pouvez me contacter à %2$s</string>
+    <string name="AdvancedSettings">Paramètres avancés</string>
+    <string name="AskResetNotifications" >Êtes-vous sûr de vouloir réinitialiser toutes les paramètres de notification et les sons de cette page et de vos contacts et groups ?</string>
+    <string name="AttachFiles">Joindre des fichiers</string>
+    <string name="Chats">Conversations</string>
+    <string name="ErrGroupNameEmpty">Merci de saisir un nom pour le groupe.</string>
+    <string name="MsgNewGroupDraftHint">Écrivez un premier message pour permettre aux autres de répondre dans ce group.\n\n• C\'est bon si tout les membres n\'utilisent pas Delta Chat.\n\n• La livraison du premier message peut prendre un moment.</string>
+    <string name="MsgNewGroupDraft">Bonjour, je viens juste de créer le groupe \"##\" pour nous.</string>
+    <string name="MsgGroupNameChanged">Le nom du group a changé de \"##\" à \"##\".</string>
+    <string name="MsgGroupImageChanged">L\'image du groupe a changé.</string>
+    <string name="MsgMemberAddedToGroup">Le membre ## vient d\'être ajouté.</string>
+    <string name="MsgMemberRemovedFromToGroup">Le membre ## vient d\'être retiré.</string>
+    <string name="AskAddMemberToGroup">Voulez-vous ajouter <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> au groupe ?</string>
+    <string name="AskRemoveMemberFromGroup">Voulez-vous retirer <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> du groupe ?</string>
+    <string name="ErrSelfNotInGroup">Vous devez être membre du groupe pour effectuer cette action.</string>
+    <string name="MsgGroupLeft">Groupe quitté.</string>
+    <string name="NoMessagesHint">Envoyez un message à <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>:\n\n• C\'est bon si <![CDATA[<b>]]>%2$s<![CDATA[</b>]]> .n\'utilise pas Delta Chat\n\n• La livraison du premier message peut prendre un moment.</string>
+    <string name="SendNRcvReadReceipts">Recevoir et envoyer les accusés de lecture</string>
+    <string name="E2EEncryption">Chiffrement bout à bout</string>
+    <string name="E2EManagePrivateKeys">Gérer les clefs privées</string>
+    <string name="E2ECompareKeys">Comparer les clefs</string>
+    <string name="ResetUserKey">Reinitialiser les clefs de l\'utilisateur</string>
+    <string name="ForwardToTitle">Renvoyer à…</string>
+</resources>

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

@@ -78,8 +78,6 @@
     <string name="NoContacts">Ancora nessun contatto</string>
     <string name="TodayAt">alle</string>
     <string name="YesterdayAt">ieri alle</string>
-    <string name="LastSeen">ultimo accesso</string>
-    <string name="LastSeenDate">ultimo accesso</string>
     <!--group create view-->
     <string name="SendMessageTo">Invia messaggio a…</string>
     <string name="EnterGroupNamePlaceholder">Immetti il nome del gruppo</string>
@@ -308,7 +306,6 @@
     <string name="ShareYouLocationUnableManually">Scegli manualmente</string>
     <string name="AreYouSureBlockContact">Vuoi bloccare questo contatto?</string>
     <string name="AreYouSureDeleteContact">Sei sicuro di voler eliminare questo contatto?</string>
-    <string name="AreYouSureDeleteMessages">Sei sicuro di voler eliminare %1$s?</string>
     <string name="RaiseToSpeakAlert">Vuoi attivare \"Alza per parlare\" per i messaggi vocali?</string>
     <!--permissions-->
     <string name="PermissionContacts">Delta Chat deve accedere ai tuoi contatti per poterti connettere con i tuoi amici su tutti i tuoi dispositivi.</string>
@@ -320,30 +317,18 @@
     <!--Intro view-->
     <string name="IntroStartMessaging">Inizia a chattare</string>
     <!--plural-->
-    <string name="Members_zero">%1$d membri</string>
-    <string name="Members_one">%1$d membro</string>
-    <string name="Members_two">%1$d membri</string>
-    <string name="Members_few">%1$d membri</string>
-    <string name="Members_many">%1$d membri</string>
-    <string name="Members_other">%1$d membri</string>
-    <string name="NewMessages_zero">nessun nuovo messaggio</string>
-    <string name="NewMessages_one">%1$d nuovo messaggio</string>
-    <string name="NewMessages_two">%1$d nuovi messaggi</string>
-    <string name="NewMessages_few">%1$d nuovi messaggi</string>
-    <string name="NewMessages_many">%1$d nuovi messaggi</string>
-    <string name="NewMessages_other">%1$d nuovi messaggi</string>
-    <string name="messages_zero">nessun messaggio</string>
-    <string name="messages_one">%1$d messaggio</string>
-    <string name="messages_two">%1$d messaggi</string>
-    <string name="messages_few">%1$d messaggi</string>
-    <string name="messages_many">%1$d messaggi</string>
-    <string name="messages_other">%1$d messaggi</string>
-    <string name="items_zero">nessun oggetto</string>
-    <string name="items_one">%1$d oggetto</string>
-    <string name="items_two">%1$d oggetti</string>
-    <string name="items_few">%1$d oggetti</string>
-    <string name="items_many">%1$d oggetti</string>
-    <string name="items_other">%1$d oggetti</string>
+    <plurals name="Members">
+        <item quantity="one">%d membro</item>
+        <item quantity="other">%d membri</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nuovo messaggio</item>
+        <item quantity="other">%d nuovi messaggi</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d messaggio</item>
+        <item quantity="other">%d messaggi</item>
+    </plurals>
     <string name="FromChats_zero">da nessuna chat</string>
     <string name="FromChats_one">da %1$d chat</string>
     <string name="FromChats_two">da %1$d chat</string>
@@ -351,19 +336,11 @@
     <string name="FromChats_many">da %1$d chat</string>
     <string name="FromChats_other">da %1$d chat</string>
 
-    <string name="Chats_zero">Nessuna chat</string>
-    <string name="Chats_one">%1$d chat</string>
-    <string name="Chats_two">%1$d chat</string>
-    <string name="Chats_few">%1$d chat</string>
-    <string name="Chats_many">%1$d chat</string>
-    <string name="Chats_other">%1$d chat</string>
+    <plurals name="Chats">
+        <item quantity="one">%d chat</item>
+        <item quantity="other">%d chat</item>
+    </plurals>
 
-    <string name="Seconds_zero">%1$d secondi</string>
-    <string name="Seconds_one">%1$d secondo</string>
-    <string name="Seconds_two">%1$d secondi</string>
-    <string name="Seconds_few">%1$d secondi</string>
-    <string name="Seconds_many">%1$d secondi</string>
-    <string name="Seconds_other">%1$d secondi</string>
     <string name="Minutes_zero">%1$d minuti</string>
     <string name="Minutes_one">%1$d minuto</string>
     <string name="Minutes_two">%1$d minuti</string>
@@ -382,42 +359,20 @@
     <string name="Days_few">%1$d giorni</string>
     <string name="Days_many">%1$d giorni</string>
     <string name="Days_other">%1$d giorni</string>
-    <string name="Weeks_zero">%1$d settimane</string>
-    <string name="Weeks_one">%1$d settimana</string>
-    <string name="Weeks_two">%1$d settimane</string>
-    <string name="Weeks_few">%1$d settimane</string>
-    <string name="Weeks_many">%1$d settimane</string>
-    <string name="Weeks_other">%1$d settimane</string>
-    <string name="Months_zero">%1$d mesi</string>
-    <string name="Months_one">%1$d mese</string>
-    <string name="Months_two">%1$d mesi</string>
-    <string name="Months_few">%1$d mesi</string>
-    <string name="Months_many">%1$d mesi</string>
-    <string name="Months_other">%1$d mesi</string>
-    <string name="Years_zero">%1$d anni</string>
-    <string name="Years_one">%1$d anno</string>
-    <string name="Years_two">%1$d anni</string>
-    <string name="Years_few">%1$d anni</string>
-    <string name="Years_many">%1$d ann</string>
-    <string name="Years_other">%1$d anni</string>
-    <string name="Users_zero">%1$d utenti</string>
-    <string name="Users_one">%1$d utente</string>
-    <string name="Users_two">%1$d utenti</string>
-    <string name="Users_few">%1$d utenti</string>
-    <string name="Users_many">%1$d utenti</string>
-    <string name="Users_other">%1$d utenti</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d settimana</item>
+        <item quantity="other">%d settimane</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d mese</item>
+        <item quantity="other">%d mesi</item>
+    </plurals>
     <string name="Times_zero">%1$d volte</string>
     <string name="Times_one">%1$d volta</string>
     <string name="Times_two">%1$d volte</string>
     <string name="Times_few">%1$d volte</string>
     <string name="Times_many">%1$d volte</string>
     <string name="Times_other">%1$d volte</string>
-    <string name="Meters_zero">%1$d metri</string>
-    <string name="Meters_one">%1$d metro</string>
-    <string name="Meters_two">%1$d metri</string>
-    <string name="Meters_few">%1$d metri</string>
-    <string name="Meters_many">%1$d metri</string>
-    <string name="Meters_other">%1$d metri</string>
     <string name="Stickers_zero">%1$d sticker</string>
     <string name="Stickers_one">%1$d sticker</string>
     <string name="Stickers_two">%1$d sticker</string>
@@ -430,18 +385,6 @@
     <string name="Photos_few">%1$d foto</string>
     <string name="Photos_many">%1$d foto</string>
     <string name="Photos_other">%1$d foto</string>
-    <string name="LastSeenMinutes_zero">ultimo accesso %1$d minuti fa</string>
-    <string name="LastSeenMinutes_one">ultimo accesso %1$d minuto fa</string>
-    <string name="LastSeenMinutes_two">ultimo accesso %1$d minuti fa</string>
-    <string name="LastSeenMinutes_few">ultimo accesso %1$d minuti fa</string>
-    <string name="LastSeenMinutes_many">ultimo accesso %1$d minuti fa</string>
-    <string name="LastSeenMinutes_other">ultimo accesso %1$d minuti fa</string>
-    <string name="LastSeenHours_zero">ultimo accesso %1$d ore fa</string>
-    <string name="LastSeenHours_one">ultimo accesso %1$d ora fa</string>
-    <string name="LastSeenHours_two">ultimo accesso %1$d ore fa</string>
-    <string name="LastSeenHours_few">ultimo accesso %1$d ore fa</string>
-    <string name="LastSeenHours_many">ultimo accesso %1$d ore fa</string>
-    <string name="LastSeenHours_other">ultimo accesso %1$d ore fa</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM yyyy</string>
     <string name="formatterMonth">dd MMM</string>

MessengerProj/src/main/res/values-nl/strings.xml

@@ -78,8 +78,6 @@
     <string name="NoContacts">Nog geen contacten</string>
     <string name="TodayAt">om</string>
     <string name="YesterdayAt">gisteren om</string>
-    <string name="LastSeen">gezien</string>
-    <string name="LastSeenDate">gezien</string>
     <!--group create view-->
     <string name="SendMessageTo">Bericht versturen naar</string>
     <string name="EnterGroupNamePlaceholder">Groepsnaam</string>
@@ -308,7 +306,6 @@
     <string name="ShareYouLocationUnableManually">Handmatig kiezen</string>
     <string name="AreYouSureBlockContact">Weet je zeker dat je deze persoon wilt blokkeren?</string>
     <string name="AreYouSureDeleteContact">Contact echt verwijderen?</string>
-    <string name="AreYouSureDeleteMessages">%1$s echt verwijderen?</string>
     <string name="RaiseToSpeakAlert">Wil je \"Houd bij oor\" inschakelen voor spraakberichten?</string>
     <!--permissions-->
     <string name="PermissionContacts">Delta Chat heeft toegang tot je contacten nodig zodat je kan chatten met je vrienden vanaf al je apparaten.</string>
@@ -320,42 +317,24 @@
     <!--Intro view-->
     <string name="IntroStartMessaging">Begin met chatten</string>
     <!--plural-->
-    <string name="Members_zero">%1$d leden</string>
-    <string name="Members_one">%1$d leden</string>
-    <string name="Members_two">%1$d leden</string>
-    <string name="Members_few">%1$d leden</string>
-    <string name="Members_many">%1$d leden</string>
-    <string name="Members_other">%1$d leden</string>
-    <string name="NewMessages_zero">geen nieuwe berichten</string>
-    <string name="NewMessages_one">%1$d nieuw bericht</string>
-    <string name="NewMessages_two">%1$d nieuwe berichten</string>
-    <string name="NewMessages_few">%1$d nieuwe berichten</string>
-    <string name="NewMessages_many">%1$d nieuwe berichten</string>
-    <string name="NewMessages_other">%1$d nieuwe berichten</string>
-    <string name="messages_zero">geen berichten</string>
-    <string name="messages_one">%1$d bericht</string>
-    <string name="messages_two">%1$d berichten</string>
-    <string name="messages_few">%1$d berichten</string>
-    <string name="messages_many">%1$d berichten</string>
-    <string name="messages_other">%1$d berichten</string>
-    <string name="items_zero">geen items</string>
-    <string name="items_one">%1$d item</string>
-    <string name="items_two">%1$d items</string>
-    <string name="items_few">%1$d items</string>
-    <string name="items_many">%1$d items</string>
-    <string name="items_other">%1$d items</string>
+    <plurals name="Members">
+        <item quantity="one">%d leden</item>
+        <item quantity="other">%d leden</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nieuw bericht</item>
+        <item quantity="other">%d nieuwe berichten</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d bericht</item>
+        <item quantity="other">%d berichten</item>
+    </plurals>
     <string name="FromChats_zero">van geen chats</string>
     <string name="FromChats_one">van %1$d chat</string>
     <string name="FromChats_two">van %1$d chats</string>
     <string name="FromChats_few">van %1$d chats</string>
     <string name="FromChats_many">van %1$d chats</string>
     <string name="FromChats_other">van %1$d chats</string>
-    <string name="Seconds_zero">%1$d seconden</string>
-    <string name="Seconds_one">%1$d seconde</string>
-    <string name="Seconds_two">%1$d seconden</string>
-    <string name="Seconds_few">%1$d seconden</string>
-    <string name="Seconds_many">%1$d seconden</string>
-    <string name="Seconds_other">%1$d seconden</string>
     <string name="Minutes_zero">%1$d minuten</string>
     <string name="Minutes_one">%1$d minuut</string>
     <string name="Minutes_two">%1$d minuten</string>
@@ -374,42 +353,20 @@
     <string name="Days_few">%1$d dagen</string>
     <string name="Days_many">%1$d dagen</string>
     <string name="Days_other">%1$d dagen</string>
-    <string name="Weeks_zero">%1$d weken</string>
-    <string name="Weeks_one">%1$d week</string>
-    <string name="Weeks_two">%1$d weken</string>
-    <string name="Weeks_few">%1$d weken</string>
-    <string name="Weeks_many">%1$d weken</string>
-    <string name="Weeks_other">%1$d weken</string>
-    <string name="Months_zero">%1$d maanden</string>
-    <string name="Months_one">%1$d maand</string>
-    <string name="Months_two">%1$d maanden</string>
-    <string name="Months_few">%1$d maanden</string>
-    <string name="Months_many">%1$d maanden</string>
-    <string name="Months_other">%1$d maanden</string>
-    <string name="Years_zero">%1$d jaar</string>
-    <string name="Years_one">%1$d jaar</string>
-    <string name="Years_two">%1$d jaar</string>
-    <string name="Years_few">%1$d jaar</string>
-    <string name="Years_many">%1$d jaar</string>
-    <string name="Years_other">%1$d jaar</string>
-    <string name="Users_zero">%1$d gebruikers</string>
-    <string name="Users_one">%1$d gebruiker</string>
-    <string name="Users_two">%1$d gebruikers</string>
-    <string name="Users_few">%1$d gebruikers</string>
-    <string name="Users_many">%1$d gebruikers</string>
-    <string name="Users_other">%1$d gebruikers</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d week</item>
+        <item quantity="other">%d weken</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d maand</item>
+        <item quantity="other">%d maanden</item>
+    </plurals>
     <string name="Times_zero">%1$d keer</string>
     <string name="Times_one">%1$d keer</string>
     <string name="Times_two">%1$d keer</string>
     <string name="Times_few">%1$d keer</string>
     <string name="Times_many">%1$d keer</string>
     <string name="Times_other">%1$d keer</string>
-    <string name="Meters_zero">%1$d meter</string>
-    <string name="Meters_one">%1$d meter</string>
-    <string name="Meters_two">%1$d meter</string>
-    <string name="Meters_few">%1$d meter</string>
-    <string name="Meters_many">%1$d meter</string>
-    <string name="Meters_other">%1$d meter</string>
     <string name="Stickers_zero">%1$d stickers</string>
     <string name="Stickers_one">%1$d sticker</string>
     <string name="Stickers_two">%1$d stickers</string>
@@ -422,18 +379,6 @@
     <string name="Photos_few">%1$d foto\'s</string>
     <string name="Photos_many">%1$d foto\'s</string>
     <string name="Photos_other">%1$d foto\'s</string>
-    <string name="LastSeenMinutes_zero">laatst gezien %1$d min geleden</string>
-    <string name="LastSeenMinutes_one">laatst gezien %1$d minuut geleden</string>
-    <string name="LastSeenMinutes_two">laatst gezien %1$d min geleden</string>
-    <string name="LastSeenMinutes_few">laatst gezien %1$d min geleden</string>
-    <string name="LastSeenMinutes_many">laatst gezien %1$d min geleden</string>
-    <string name="LastSeenMinutes_other">laatst gezien %1$d min geleden</string>
-    <string name="LastSeenHours_zero">laatst gezien %1$d uur geleden</string>
-    <string name="LastSeenHours_one">laatst gezien %1$d uur geleden</string>
-    <string name="LastSeenHours_two">laatst gezien %1$d uur geleden</string>
-    <string name="LastSeenHours_few">laatst gezien %1$d uur geleden</string>
-    <string name="LastSeenHours_many">laatst gezien %1$d uur geleden</string>
-    <string name="LastSeenHours_other">laatst gezien %1$d uur geleden</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM yyyy</string>
     <string name="formatterMonth">dd MMM</string>

MessengerProj/src/main/res/values-pt/strings.xml

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 
-<!--https://www.transifex.com/projects/p/telegram/language/pt_PT/members/-->
 
-<resources xmlns:tools="http://schemas.android.com/tools">
+
+<resources>
     <string name="AppName">Delta Chat</string>
     <string name="LanguageName">Português</string>
     <string name="LanguageNameInEnglish">Portuguese</string>
@@ -78,8 +78,6 @@
     <string name="NoContacts">Ainda não há contatos</string>
     <string name="TodayAt">às</string>
     <string name="YesterdayAt">ontem às</string>
-    <string name="LastSeen">visto</string>
-    <string name="LastSeenDate">visto</string>
     <!--group create view-->
     <string name="SendMessageTo">Enviar mensagem para…</string>
     <string name="EnterGroupNamePlaceholder">Digite o nome do grupo</string>
@@ -128,7 +126,7 @@
     <string name="NotificationsAndSounds">Notificações e Sons</string>
     <string name="BlockedUsers">Usuários bloqueados</string>
     <string name="Default">Padrão</string>
-    <string name="OnlyIfSilent">Somente no silencioso </string>
+    <string name="OnlyIfSilent">Somente no silencioso</string>
     <string name="ChatBackground">Papel de Parede</string>
     <string name="SendByEnter">Enviar usando \'Enter\'</string>
     <string name="Language">Idioma</string>
@@ -297,7 +295,7 @@
     <string name="NoPlayerInstalled">Você não possui um reprodutor de vídeo, instale um para continuar</string>
     <string name="NoHandleAppInstalled">Você não possui um aplicativo que suporte o tipo de arquivo \'%1$s\', por favor instale um para continuar</string>
     <string name="AddToTheGroupTitle">Adcione %1$s ao chat %2$s?</string>
-    <string name="AskAddMemberToGroup">Adicionar <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> no grupo?</string>
+    <string name="AskAddMemberToGroup">Adicionar <![CDATA[<b>]]>%1$s<![CDATA[</b>]]> ao grupo?</string>
     <string name="UserAlreadyInGroup">Este usuário já está neste grupo</string>
     <string name="ForwardMessagesTo">Encaminhar mensagem para <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
     <string name="SendMessagesTo">Enviar mensagens para <![CDATA[<b>]]>%1$s<![CDATA[</b>]]>?</string>
@@ -308,7 +306,6 @@
     <string name="ShareYouLocationUnableManually">Escolher manualmente</string>
     <string name="AreYouSureBlockContact">Você tem certeza que deseja bloquear este contato?</string>
     <string name="AreYouSureDeleteContact">Você tem certeza que deseja apagar este contato?</string>
-    <string name="AreYouSureDeleteMessages">Você tem certeza que deseja apagar %1$s?</string>
     <string name="RaiseToSpeakAlert">Gostaria de habilitar o \"Levantar para Falar\" para mensagens de voz?</string>
     <!--permissions-->
     <string name="PermissionContacts">Delta Chat precisa acessar seus contatos para que você possa se conectar aos seus amigos em todos os seus dispositivos.</string>
@@ -318,44 +315,50 @@
     <string name="PermissionNoLocationPosition">O Delta Chat precisa acessar sua localização</string>
     <string name="PermissionOpenSettings">Configurações</string>
     <!--Intro view-->
+    <string name="Intro1Headline">Delta Chat</string>
+    <string name="Intro1Message">O aplicativo com o <![CDATA[<b>]]>maior número de usuários<![CDATA[</b>]]> do mundo.&lt;br/&gt;&lt;b&gt;Grátis&lt;/b&gt; e &lt;b&gt;seguro&lt;/b&gt;.</string>
+
+    <string name="Intro2Headline">Independente</string>
+    <string name="Intro2Message">&lt;b&gt;Independente&lt;/b&gt; de serviços estrangeiros. Este aplicativo só precisa de um e-mail para funcionar.</string>
+
+    <string name="Intro3Headline">Rápido</string>
+    <string name="Intro3Message">&lt;b&gt;Envie mensagens&lt;/b&gt; num átimo.&lt;br/&gt; Interface leve.</string>
+
+    <string name="Intro4Headline">Poderoso</string>
+    <string name="Intro4Message">&lt;b&gt;Sem limites&lt;/b&gt; para chats, imagens, vídeos, áudio e mais. Multicliente.</string>
+
+    <string name="Intro5Headline">Grátis</string>
+    <string name="Intro5Message">&lt;b&gt;Delta Chat&lt;/b&gt; será sempre grátis, de Código livre e sem propagandas.</string>
+
+    <string name="Intro6Headline">Seguro</string>
+    <string name="Intro6Message">&lt;b&gt;Criptografia&lt;/b&gt; com as tecnologias mais usadas. Suas mensagens ficam no servidor de e-mail.</string>
+
+    <string name="Intro7Headline">Confiável</string>
+
     <string name="IntroStartMessaging">Comece a conversar</string>
     <!--plural-->
-    <string name="Members_zero">%1$d membros</string>
-    <string name="Members_one">%1$d membro</string>
-    <string name="Members_two">%1$d membros</string>
-    <string name="Members_few">%1$d membros</string>
-    <string name="Members_many">%1$d membros</string>
-    <string name="Members_other">%1$d membros</string>
-    <string name="NewMessages_zero">sem novas mensagens</string>
-    <string name="NewMessages_one">%1$d nova mensagem</string>
-    <string name="NewMessages_two">%1$d novas mensagens</string>
-    <string name="NewMessages_few">%1$d novas mensagens</string>
-    <string name="NewMessages_many">%1$d novas mensagens</string>
-    <string name="NewMessages_other">%1$d novas mensagens</string>
-    <string name="messages_zero">sem mensagens</string>
-    <string name="messages_one">%1$d mensagem</string>
-    <string name="messages_two">%1$d mensagens</string>
-    <string name="messages_few">%1$d mensagens</string>
-    <string name="messages_many">%1$d mensagens</string>
-    <string name="messages_other">%1$d mensagens</string>
-    <string name="items_zero">nenhum item</string>
-    <string name="items_one">%1$d item</string>
-    <string name="items_two">%1$d itens</string>
-    <string name="items_few">%1$d itens</string>
-    <string name="items_many">%1$d itens</string>
-    <string name="items_other">%1$d itens</string>
+    <plurals name="Members">
+        <item quantity="one">%d membro</item>
+        <item quantity="other">%d membros</item>
+    </plurals>
+    <plurals name="MeAndMembers">
+        <item quantity="one">Eu e %d membro</item>
+        <item quantity="other">Eu e %d membros</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d nova mensagem</item>
+        <item quantity="other">%d novas mensagens</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d mensagem</item>
+        <item quantity="other">%d mensagens</item>
+    </plurals>
     <string name="FromChats_zero">de nenhum chat</string>
     <string name="FromChats_one">de %1$d chat</string>
     <string name="FromChats_two">de %1$d chats</string>
     <string name="FromChats_few">de %1$d chats</string>
     <string name="FromChats_many">de %1$d chats</string>
     <string name="FromChats_other">de %1$d chats</string>
-    <string name="Seconds_zero">%1$d segundos</string>
-    <string name="Seconds_one">%1$d segundo</string>
-    <string name="Seconds_two">%1$d segundos</string>
-    <string name="Seconds_few">%1$d segundos</string>
-    <string name="Seconds_many">%1$d segundos</string>
-    <string name="Seconds_other">%1$d segundos</string>
     <string name="Minutes_zero">%1$d minutos</string>
     <string name="Minutes_one">%1$d minuto</string>
     <string name="Minutes_two">%1$d minutos</string>
@@ -374,42 +377,20 @@
     <string name="Days_few">%1$d dias</string>
     <string name="Days_many">%1$d dias</string>
     <string name="Days_other">%1$d dias</string>
-    <string name="Weeks_zero">%1$d semanas</string>
-    <string name="Weeks_one">%1$d semana</string>
-    <string name="Weeks_two">%1$d semanas</string>
-    <string name="Weeks_few">%1$d semanas</string>
-    <string name="Weeks_many">%1$d semanas</string>
-    <string name="Weeks_other">%1$d semanas</string>
-    <string name="Months_zero">%1$d meses</string>
-    <string name="Months_one">%1$d mês</string>
-    <string name="Months_two">%1$d meses</string>
-    <string name="Months_few">%1$d meses</string>
-    <string name="Months_many">%1$d meses</string>
-    <string name="Months_other">%1$d meses</string>
-    <string name="Years_zero">%1$d anos</string>
-    <string name="Years_one">%1$d ano</string>
-    <string name="Years_two">%1$d anos</string>
-    <string name="Years_few">%1$d anos</string>
-    <string name="Years_many">%1$d anos</string>
-    <string name="Years_other">%1$d anos</string>
-    <string name="Users_zero">%1$d usuários</string>
-    <string name="Users_one">%1$d usuário</string>
-    <string name="Users_two">%1$d usuários</string>
-    <string name="Users_few">%1$d usuários</string>
-    <string name="Users_many">%1$d usuários</string>
-    <string name="Users_other">%1$d usuários</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d semana</item>
+        <item quantity="other">%d semanas</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d mês</item>
+        <item quantity="other">%d meses</item>
+    </plurals>
     <string name="Times_zero">%1$d vezes</string>
     <string name="Times_one">%1$d vez</string>
     <string name="Times_two">%1$d vezes</string>
     <string name="Times_few">%1$d vezes</string>
     <string name="Times_many">%1$d vezes</string>
     <string name="Times_other">%1$d vezes</string>
-    <string name="Meters_zero">%1$d metros</string>
-    <string name="Meters_one">%1$d metro</string>
-    <string name="Meters_two">%1$d metros</string>
-    <string name="Meters_few">%1$d metros</string>
-    <string name="Meters_many">%1$d metros</string>
-    <string name="Meters_other">%1$d metros</string>
     <string name="Stickers_zero">%1$d stickers</string>
     <string name="Stickers_one">%1$d sticker</string>
     <string name="Stickers_two">%1$d stickers</string>
@@ -422,18 +403,6 @@
     <string name="Photos_few">%1$d fotos</string>
     <string name="Photos_many">%1$d fotos</string>
     <string name="Photos_other">%1$d fotos</string>
-    <string name="LastSeenMinutes_zero">visto há %1$d minutos</string>
-    <string name="LastSeenMinutes_one">visto há %1$d minuto</string>
-    <string name="LastSeenMinutes_two">visto há %1$d minutos</string>
-    <string name="LastSeenMinutes_few">visto há %1$d minutos</string>
-    <string name="LastSeenMinutes_many">visto há %1$d minutos</string>
-    <string name="LastSeenMinutes_other">visto há %1$d minutos</string>
-    <string name="LastSeenHours_zero">visto há %1$d horas</string>
-    <string name="LastSeenHours_one">visto há %1$d hora</string>
-    <string name="LastSeenHours_two">visto há %1$d horas</string>
-    <string name="LastSeenHours_few">visto há %1$d horas</string>
-    <string name="LastSeenHours_many">visto há %1$d horas</string>
-    <string name="LastSeenHours_other">visto há %1$d horas</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM yyyy</string>
     <string name="formatterMonth">dd MMM</string>
@@ -444,9 +413,81 @@
     <string name="formatterDay24H">HH:mm</string>
     <string name="formatterDay12H">h:mm a</string>
     <string name="formatDateAtTime">%1$s às %2$s</string>
+    <string name="AccountSettings">Configurações de conta</string>
+    <string name="MyAccount">Minha conta</string>
+    <string name="Yes">Sim</string>
+    <string name="No">Não</string>
+    <string name="MyName">Meu nome</string>
+    <string name="MyNameExplain">Este nome será exibido aos seus contatos.\n\nSe não inseri-lo os destinatários visualizarão o seu endereço de e-mail.</string>
+    <string name="MyEmailAddress">Meu endereço de e-mail</string>
+    <string name="Password">Senha</string>
+    <string name="SmtpPassword">senha SMTP</string>
+    <string name="FromAbove">de acima</string>
+    <string name="SmtpLoginname">Nome de usuário SMTP</string>
+    <string name="SmtpPort">Porta SMTP</string>
+    <string name="Automatic">automático</string>
+    <string name="ImapServer">Servidor IMAP</string>
+    <string name="ImapLoginname">Nome de login IMAP</string>
+    <string name="SmtpServer">Servidor SMTP</string>
+    <string name="ImapPort">Porta IMAP</string>
+    <string name="InboxHeadline">Caixa de entrada</string>
+    <string name="OutboxHeadline">Caixa de saída</string>
+    <string name="BasicSettings">Configurações básicas</string>
+    <string name="MyAccountExplain">Para servidores de e-mail mais populares as configurações são detectadas automaticamente.</string>
+    <string name="MyAccountExplain2" >Por vezes é necessário habilitar as funcionalidades IMAP/SMTP nas configurações do provedor escolhido.\n\nNão exite em pedir ajuda ao provedor ou aos seus amigos.</string>
+    <string name="AccountNotConfigured">Conta não configurada</string>
+    <string name="AboutThisProgram">Sobre o Delta Chat</string>
+    <string name="NotSet">Não configurado</string>
     <string name="NewChat">Novo Chat</string>
+    <string name="MemberSg">## membro</string>
+    <string name="MemberPl">## membros</string>
+    <string name="ContactSg"># contato</string>
+    <string name="ContactPl">## contatos</string>
+    <string name="Deaddrop">Caixa de entrada</string>
     <string name="Media">Mídias</string>
+    <string name="DeaddropInChatlist">Exibir caixa de entrada na lista de conversas</string>
+    <string name="MuteAlways">Silenciar sempre</string>
+    <string name="AskStartChatWith">Conversar com &lt;b&gt;%1$s&lt;/b&gt;?</string>
+    <string name="DeaddropHint">Para conversar clique na seta.</string>
+    <string name="NotYetImplemented">Função ainda não implementada.</string>
+    <string name="DefaultStatusText">Enviado pelo Delta Chat Messenger</string>
+    <string name="SubjectPrefix">Mensagem instantânea</string>
     <string name="SeachUser">Busca</string>
+    <string name="Name" >Nome</string>
+    <string name="EmailAddress">Endereço de e-mail</string>
+    <string name="CannotDeleteContact">Impossível deletar usuários ativos, bloqueie-os.</string>
+    <string name="BadEmailAddress">E-mail inválido.</string>
+    <string name="ContactDeleted">Usuário deletado.</string>
+    <string name="ContactCreated">Usuário criado.</string>
+    <string name="ViewProfile">Ver perfil</string>
+    <string name="OneMomentPlease">Um momento, por favor…</string>
+    <string name="CannotDeleteChat">Impossível deletar a conversa.</string>
+    <string name="NoChatsHelp">Comece uma conversa pressionando o botão "+" no canto direito inferior. Alternativamente acesse a opção correspondente pelo menu.</string>
+    <string name="ConfiguringAccount">Configurando conta…</string>
+    <string name="CannotConnect">Não conectou! Revise as configurações.</string>
+    <string name="Intro7Message">&lt;b&gt;Delta Chat&lt;/b&gt; é seguro para fins comerciais e compatível com os padrões de uso.</string>
     <string name="InviteMenuEntry">Convidar Amigos</string>
+    <string name="InviteText">Agora estou usando o Delta Chat - %1$s - contate-me às %2$s</string>
+    <string name="AdvancedSettings">Configurações avançadas</string>
+    <string name="AskResetNotifications" >Zerar configurações de som e notificação desta página, usuários e grupos?</string>
+    <string name="AttachFiles">Anexar arquivos</string>
+    <string name="Chats">Conversas</string>
+    <string name="ErrGroupNameEmpty">Escolha o nome do grupo.</string>
+    <string name="MsgNewGroupDraftHint">Escreva a primeira mensagem para que os demais possam interagir no grupo.\n\n• Não é necessário que todos usem o Delta Chat.\n\n• A primeira mensagem pode demorar um pouco.</string>
+    <string name="MsgNewGroupDraft">Olá! Criei o grupo \"##\" para conversarmos.</string>
+    <string name="MsgGroupNameChanged">O nome do grupo mudou de \"##\" para \"##\".</string>
+    <string name="MsgGroupImageChanged">Imagem do grupo alterada.</string>
+    <string name="MsgMemberAddedToGroup">## adicionado.</string>
+    <string name="MsgMemberRemovedFromToGroup">## removido.</string>
+    <string name="AskRemoveMemberFromGroup">Remover &lt;b&gt;%1$s&lt;/b&gt; so grupo?</string>
+    <string name="ErrSelfNotInGroup">É preciso ser um membro do grupo para fazer isso.</string>
+    <string name="MsgGroupLeft">Deixou o grupo.</string>
+    <string name="NoMessagesHint">Enviar mensagem para &lt;b&gt;%1$s&lt;/b&gt;:\n\n•  &lt;b&gt;%2$s&lt;/b&gt; não precisa usar o Delta Chat.\n\n• A primeira mensagem pode demorar um pouco.</string>
+    <string name="SendNRcvReadReceipts">Enviar e receber confirmação</string>
+    <string name="E2EEncryption">Criptografia ponta-a-ponta</string>
+    <string name="E2EManagePrivateKeys">Gerir chaves privadas</string>
+    <string name="E2ECompareKeys">Comparar chaves</string>
+    <string name="ResetUserKey">Reconfigurar chave do usuário</string>
     <string name="ForwardToTitle">Selecione um Chat …</string>
 </resources>
+

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

@@ -78,8 +78,6 @@
     <string name="NoContacts">No users yet.</string>
     <string name="TodayAt">at</string>
     <string name="YesterdayAt">yesterday at</string>
-    <string name="LastSeen">last seen</string>
-    <string name="LastSeenDate">last seen</string>
     <!--group create view-->
     <string name="SendMessageTo">Send message to …</string>
     <string name="EnterGroupNamePlaceholder">Enter group name</string>
@@ -308,7 +306,6 @@
     <string name="ShareYouLocationUnableManually">Choose manually</string>
     <string name="AreYouSureBlockContact">Are you sure you want to block this user?</string>
     <string name="AreYouSureDeleteContact">Are you sure you want to delete this user?</string>
-    <string name="AreYouSureDeleteMessages">Delete %1$s? The messages will also be deleted from the server.</string>
     <string name="RaiseToSpeakAlert">Would you like to enable "Raise to speak" for voice messages?</string>
     <!--permissions-->
     <string name="PermissionContacts">Delta Chat needs access to your contacts so that you can connect with your friends across all your devices.</string>
@@ -340,30 +337,26 @@
 
     <string name="IntroStartMessaging">Start Messaging</string>
     <!--plural-->
-    <string name="Members_zero">%1$d members</string>
-    <string name="Members_one">%1$d member</string>
-    <string name="Members_two">%1$d members</string>
-    <string name="Members_few">%1$d members</string>
-    <string name="Members_many">%1$d members</string>
-    <string name="Members_other">%1$d members</string>
-    <string name="NewMessages_zero">no new messages</string>
-    <string name="NewMessages_one">%1$d new message</string>
-    <string name="NewMessages_two">%1$d new messages</string>
-    <string name="NewMessages_few">%1$d new messages</string>
-    <string name="NewMessages_many">%1$d new messages</string>
-    <string name="NewMessages_other">%1$d new messages</string>
-    <string name="messages_zero">no messages</string>
-    <string name="messages_one">%1$d message</string>
-    <string name="messages_two">%1$d messages</string>
-    <string name="messages_few">%1$d messages</string>
-    <string name="messages_many">%1$d messages</string>
-    <string name="messages_other">%1$d messages</string>
-    <string name="items_zero">no items</string>
-    <string name="items_one">%1$d item</string>
-    <string name="items_two">%1$d items</string>
-    <string name="items_few">%1$d items</string>
-    <string name="items_many">%1$d items</string>
-    <string name="items_other">%1$d items</string>
+    <plurals name="Members">
+        <item quantity="one">%d member</item>
+        <item quantity="other">%d members</item>
+    </plurals>
+    <plurals name="MeAndMembers">
+        <item quantity="one">Me and %d member</item>
+        <item quantity="other">Me and %d members</item>
+    </plurals>
+    <plurals name="NewMessages">
+        <item quantity="one">%d new message</item>
+        <item quantity="other">%d new messages</item>
+    </plurals>
+    <plurals name="messages">
+        <item quantity="one">%d message</item>
+        <item quantity="other">%d messages</item>
+    </plurals>
+    <plurals name="AreYouSureDeleteMessages">
+        <item quantity="one">Delete %d message? The message will also be deleted from the server.</item>
+        <item quantity="other">Delete %d messages? The messages will also be deleted from the server.</item>
+    </plurals>
     <string name="FromChats_zero">from no chats</string>
     <string name="FromChats_one">from %1$d chat</string>
     <string name="FromChats_two">from %1$d chats</string>
@@ -371,19 +364,11 @@
     <string name="FromChats_many">from %1$d chats</string>
     <string name="FromChats_other">from %1$d chats</string>
 
-    <string name="Chats_zero">No chats</string>
-    <string name="Chats_one">%1$d chat</string>
-    <string name="Chats_two">%1$d chats</string>
-    <string name="Chats_few">%1$d chats</string>
-    <string name="Chats_many">%1$d chats</string>
-    <string name="Chats_other">%1$d chats</string>
+    <plurals name="Chats">
+        <item quantity="one">%d chat</item>
+        <item quantity="other">%d chats</item>
+    </plurals>
 
-    <string name="Seconds_zero">%1$d seconds</string>
-    <string name="Seconds_one">%1$d second</string>
-    <string name="Seconds_two">%1$d seconds</string>
-    <string name="Seconds_few">%1$d seconds</string>
-    <string name="Seconds_many">%1$d seconds</string>
-    <string name="Seconds_other">%1$d seconds</string>
     <string name="Minutes_zero">%1$d minutes</string>
     <string name="Minutes_one">%1$d minute</string>
     <string name="Minutes_two">%1$d minutes</string>
@@ -402,42 +387,20 @@
     <string name="Days_few">%1$d days</string>
     <string name="Days_many">%1$d days</string>
     <string name="Days_other">%1$d days</string>
-    <string name="Weeks_zero">%1$d weeks</string>
-    <string name="Weeks_one">%1$d week</string>
-    <string name="Weeks_two">%1$d weeks</string>
-    <string name="Weeks_few">%1$d weeks</string>
-    <string name="Weeks_many">%1$d weeks</string>
-    <string name="Weeks_other">%1$d weeks</string>
-    <string name="Months_zero">%1$d months</string>
-    <string name="Months_one">%1$d month</string>
-    <string name="Months_two">%1$d months</string>
-    <string name="Months_few">%1$d months</string>
-    <string name="Months_many">%1$d months</string>
-    <string name="Months_other">%1$d months</string>
-    <string name="Years_zero">%1$d years</string>
-    <string name="Years_one">%1$d year</string>
-    <string name="Years_two">%1$d years</string>
-    <string name="Years_few">%1$d years</string>
-    <string name="Years_many">%1$d years</string>
-    <string name="Years_other">%1$d years</string>
-    <string name="Users_zero">%1$d users</string>
-    <string name="Users_one">%1$d user</string>
-    <string name="Users_two">%1$d users</string>
-    <string name="Users_few">%1$d users</string>
-    <string name="Users_many">%1$d users</string>
-    <string name="Users_other">%1$d users</string>
+    <plurals name="Weeks">
+        <item quantity="one">%d week</item>
+        <item quantity="other">%d weeks</item>
+    </plurals>
+    <plurals name="Months">
+        <item quantity="one">%d month</item>
+        <item quantity="other">%d months</item>
+    </plurals>
     <string name="Times_zero">%1$d times</string>
     <string name="Times_one">%1$d time</string>
     <string name="Times_two">%1$d times</string>
     <string name="Times_few">%1$d times</string>
     <string name="Times_many">%1$d times</string>
     <string name="Times_other">%1$d times</string>
-    <string name="Meters_zero">%1$d meters</string>
-    <string name="Meters_one">%1$d meter</string>
-    <string name="Meters_two">%1$d meters</string>
-    <string name="Meters_few">%1$d meters</string>
-    <string name="Meters_many">%1$d meters</string>
-    <string name="Meters_other">%1$d meters</string>
     <string name="Stickers_zero">%1$d stickers</string>
     <string name="Stickers_one">%1$d sticker</string>
     <string name="Stickers_two">%1$d stickers</string>
@@ -450,18 +413,6 @@
     <string name="Photos_few">%1$d photos</string>
     <string name="Photos_many">%1$d photos</string>
     <string name="Photos_other">%1$d photos</string>
-    <string name="LastSeenMinutes_zero">last seen %1$d minutes ago</string>
-    <string name="LastSeenMinutes_one">last seen %1$d minute ago</string>
-    <string name="LastSeenMinutes_two">last seen %1$d minutes ago</string>
-    <string name="LastSeenMinutes_few">last seen %1$d minutes ago</string>
-    <string name="LastSeenMinutes_many">last seen %1$d minutes ago</string>
-    <string name="LastSeenMinutes_other">last seen %1$d minutes ago</string>
-    <string name="LastSeenHours_zero">last seen %1$d hours ago</string>
-    <string name="LastSeenHours_one">last seen %1$d hour ago</string>
-    <string name="LastSeenHours_two">last seen %1$d hours ago</string>
-    <string name="LastSeenHours_few">last seen %1$d hours ago</string>
-    <string name="LastSeenHours_many">last seen %1$d hours ago</string>
-    <string name="LastSeenHours_other">last seen %1$d hours ago</string>
     <!--date formatters-->
     <string name="formatterMonthYear">MMMM yyyy</string>
     <string name="formatterMonth">MMM dd</string>
@@ -493,7 +444,7 @@
     <string name="OutboxHeadline">Outbox</string>
     <string name="BasicSettings">Basic settings</string>
     <string name="MyAccountExplain">For known e-mail providers, the following settings are determinated automatically.</string>
-    <string name="MyAccountExplain2" >Sometimes, IMAP/SMPT needs to be enabled in the e-mail web frontend.\n\nOn problems, ask your e-mail-provider or your friends.</string>
+    <string name="MyAccountExplain2" >Sometimes, IMAP/SMTP needs to be enabled in the e-mail web frontend.\n\nOn problems, ask your e-mail provider or your friends.</string>
     <string name="AccountNotConfigured">Account not configured</string>
     <string name="AboutThisProgram">About Delta Chat</string>
     <string name="NotSet">Not set</string>
@@ -514,7 +465,6 @@
     <string name="SeachUser">Search user</string>
     <string name="Name" >Name</string>
     <string name="EmailAddress">E-mail address</string>
-    <string name="MeAnd">Me and</string>
     <string name="CannotDeleteContact">Cannot delete users in use, block user instead.</string>
     <string name="BadEmailAddress">Bad e-mail address.</string>
     <string name="ContactDeleted">User deleted.</string>

build.gradle

@@ -5,6 +5,6 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.1.2'
+        classpath 'com.android.tools.build:gradle:2.2.3'
     }
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Fri Dec 04 13:44:40 MSK 2015
+#Tue Jan 31 20:49:39 CET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.11-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip