fix system account

TMessagesProj/src/main/java/org/telegram/messenger/ContactsController.java

@@ -312,9 +312,6 @@ public class ContactsController extends BaseController {
     }
 
     public void checkAppAccount() {
-        if (NekoConfig.disableSystemAccount) {
-            return;
-        }
         AccountManager am = AccountManager.get(ApplicationLoader.applicationContext);
         try {
             Account[] accounts = am.getAccountsByType(BuildConfig.APPLICATION_ID);
@@ -334,7 +331,7 @@ public class ContactsController extends BaseController {
                         }
                     }
                 }
-                if (!found) {
+                if (!found || NekoConfig.disableSystemAccount) {
                     try {
                         am.removeAccount(accounts[a], null, null);
                     } catch (Exception ignore) {
@@ -342,17 +339,18 @@ public class ContactsController extends BaseController {
                 }
 
             }
-        } catch (Throwable ignore) {
-
+        } catch (Throwable e) {
+            FileLog.e(e);
         }
         if (getUserConfig().isClientActivated()) {
             readContacts();
-            if (systemAccount == null) {
+            if (systemAccount == null && !NekoConfig.disableSystemAccount) {
                 try {
                     TLRPC.User user = UserConfig.getInstance(currentAccount).getCurrentUser();
                     systemAccount = new Account(formatName(user.first_name, user.last_name), BuildConfig.APPLICATION_ID);
                     am.addAccountExplicitly(systemAccount, "", null);
-                } catch (Exception ignore) {
+                } catch (Exception e) {
+                    FileLog.e(e);
                 }
             }
         }

TMessagesProj/src/main/java/org/telegram/tgnet/ConnectionsManager.java

@@ -678,8 +678,6 @@ public class ConnectionsManager extends BaseController {
 
     public static native void native_setSystemLangCode(int currentAccount, String langCode);
 
-    public static native void native_seSystemLangCode(int currentAccount, String langCode);
-
     public static native void native_setJava(boolean useJavaByteBuffers);
 
     public static native void native_setPushConnectionEnabled(int currentAccount, boolean value);
@@ -720,22 +718,13 @@ public class ConnectionsManager extends BaseController {
                     if (!networkInterface.isUp() || networkInterface.isLoopback() || networkInterface.getInterfaceAddresses().isEmpty()) {
                         continue;
                     }
-                    if (BuildVars.LOGS_ENABLED) {
-                        FileLog.d("valid interface: " + networkInterface);
-                    }
                     List<InterfaceAddress> interfaceAddresses = networkInterface.getInterfaceAddresses();
                     for (int a = 0; a < interfaceAddresses.size(); a++) {
                         InterfaceAddress address = interfaceAddresses.get(a);
                         InetAddress inetAddress = address.getAddress();
-                        if (BuildVars.LOGS_ENABLED) {
-                            FileLog.d("address: " + inetAddress.getHostAddress());
-                        }
                         if (inetAddress.isLinkLocalAddress() || inetAddress.isLoopbackAddress() || inetAddress.isMulticastAddress()) {
                             continue;
                         }
-                        if (BuildVars.LOGS_ENABLED) {
-                            FileLog.d("address is good");
-                        }
                     }
                 }
             } catch (Throwable e) {

TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoConfig.java

@@ -19,6 +19,10 @@ import tw.nekomimi.nekogram.utils.UIUtil;
 
 public class NekoConfig {
 
+    public static final int TITLE_TYPE_TEXT = 0;
+    public static final int TITLE_TYPE_ICON = 1;
+    public static final int TITLE_TYPE_MIX = 2;
+
     private static SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("nekoconfig", Activity.MODE_PRIVATE);
 
     public static boolean useIPv6;
@@ -32,9 +36,12 @@ public class NekoConfig {
     public static boolean chatMessageAnimation;
     public static boolean rearVideoMessages;
     public static boolean hideAllTab;
+    public static boolean confirmAVMessage = true;
+    public static boolean askBeforeCall = true;
     public static int mapPreviewProvider;
     public static float stickerSize;
     public static int translationProvider;
+    public static int tabsTitleType = TITLE_TYPE_TEXT;
 
     public static boolean showAddToSavedMessages;
     public static boolean showReport;
@@ -190,6 +197,10 @@ public class NekoConfig {
         translateToLang = preferences.getString("trans_to_lang", null);
         translateInputLang = preferences.getString("trans_input_to_lang", "en");
 
+        tabsTitleType = preferences.getInt("tabsTitleType", TITLE_TYPE_TEXT);
+        confirmAVMessage = preferences.getBoolean("confirmAVMessage", true);
+        askBeforeCall = preferences.getBoolean("askBeforeCall", true);
+
     }
 
     public static void toggleShowAddToSavedMessages() {
@@ -634,4 +645,28 @@ public class NekoConfig {
 
     }
 
+    public static void setTabsTitleType(int type) {
+        tabsTitleType = type;
+        SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("nekoconfig", Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putInt("tabsTitleType", tabsTitleType);
+        editor.apply();
+    }
+
+    public static void toggleConfirmAVMessage() {
+        confirmAVMessage = !confirmAVMessage;
+        SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("nekoconfig", Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean("confirmAVMessage", confirmAVMessage);
+        editor.apply();
+    }
+
+    public static void toggleAskBeforeCall() {
+        askBeforeCall = !askBeforeCall;
+        SharedPreferences preferences = ApplicationLoader.applicationContext.getSharedPreferences("nekoconfig", Activity.MODE_PRIVATE);
+        SharedPreferences.Editor editor = preferences.edit();
+        editor.putBoolean("askBeforeCall", askBeforeCall);
+        editor.commit();
+    }
+
 }

TMessagesProj/src/main/java/tw/nekomimi/nekogram/NekoSettingsActivity.java

@@ -99,9 +99,11 @@ public class NekoSettingsActivity extends BaseFragment {
     private int rearVideoMessagesRow;
     private int hideAllTabRow;
     private int confirmAVRow;
+    private int askBeforeCallRow;
     private int mapPreviewRow;
     private int stickerSizeRow;
     private int messageMenuRow;
+    private int tabsTitleTypeRow;
     private int chat2Row;
 
     private int transRow;
@@ -676,6 +678,11 @@ public class NekoSettingsActivity extends BaseFragment {
                 if (view instanceof TextCheckCell) {
                     ((TextCheckCell) view).setChecked(NekoConfig.confirmAVMessage);
                 }
+            } else if (position == askBeforeCallRow) {
+                NekoConfig.toggleAskBeforeCall();
+                if (view instanceof TextCheckCell) {
+                    ((TextCheckCell) view).setChecked(NekoConfig.askBeforeCall);
+                }
             }
         });
 
@@ -719,9 +726,11 @@ public class NekoSettingsActivity extends BaseFragment {
         rearVideoMessagesRow = rowCount++;
         hideAllTabRow = rowCount++;
         confirmAVRow = rowCount++;
+        askBeforeCallRow = rowCount++;
         mapPreviewRow = rowCount++;
         stickerSizeRow = rowCount++;
         messageMenuRow = rowCount++;
+        tabsTitleTypeRow = rowCount++;
         chat2Row = rowCount++;
 
         transRow = rowCount++;
@@ -1278,6 +1287,20 @@ public class NekoSettingsActivity extends BaseFragment {
                                 value = "Unknown";
                         }
                         textCell.setTextAndValue(LocaleController.getString("TranslationProvider", R.string.TranslationProvider), value, false);
+                    } else if (position == tabsTitleTypeRow) {
+                        String value;
+                        switch (NekoConfig.tabsTitleType) {
+                            case NekoConfig.TITLE_TYPE_TEXT:
+                                value = LocaleController.getString("TabTitleTypeText", R.string.TabTitleTypeText);
+                                break;
+                            case NekoConfig.TITLE_TYPE_ICON:
+                                value = LocaleController.getString("TabTitleTypeIcon", R.string.TabTitleTypeIcon);
+                                break;
+                            case NekoConfig.TITLE_TYPE_MIX:
+                            default:
+                                value = LocaleController.getString("TabTitleTypeMix", R.string.TabTitleTypeMix);
+                        }
+                        textCell.setTextAndValue(LocaleController.getString("TabTitleType", R.string.TabTitleType), value, false);
                     }
                     break;
                 }
@@ -1351,8 +1374,9 @@ public class NekoSettingsActivity extends BaseFragment {
                         textCell.setTextAndValueAndCheck(LocaleController.getString("HideAllTab", R.string.HideAllTab), LocaleController.getString("HideAllTabAbout", R.string.HideAllTabAbout), NekoConfig.hideAllTab, true, true);
                     } else if (position == confirmAVRow) {
                         textCell.setTextAndCheck(LocaleController.getString("ConfirmAVMessage", R.string.ConfirmAVMessage), NekoConfig.confirmAVMessage, true);
+                    } else if (position == askBeforeCallRow) {
+                        textCell.setTextAndCheck(LocaleController.getString("AskBeforeCalling", R.string.AskBeforeCalling), NekoConfig.askBeforeCall, true);
                     }
-
                     break;
                 }
                 case 4: {
@@ -1400,7 +1424,8 @@ public class NekoSettingsActivity extends BaseFragment {
                     position == hideKeyboardOnChatScrollRow || position == sortMenuRow || position == disableSystemAccountRow ||
                     position == avatarAsDrawerBackgroundRow || position == removeTitleEmojiRow || position == ignoreMutedCountRow ||
                     position == useDefaultThemeRow || position == showIdAndDcRow || position == showTabsOnForwardRow ||
-                    position == chatMessageAnimationRow || position == rearVideoMessagesRow || position == hideAllTabRow || position == cachePathRow || position == tabsTitleTypeRow || position == confirmAVRow;
+                    position == chatMessageAnimationRow || position == rearVideoMessagesRow || position == hideAllTabRow || position == cachePathRow ||
+                    position == tabsTitleTypeRow || position == confirmAVRow || position == askBeforeCallRow;
         }
 
         @Override
@@ -1460,10 +1485,9 @@ public class NekoSettingsActivity extends BaseFragment {
                     position == removeTitleEmojiRow || position == ignoreMutedCountRow ||
                     position == useDefaultThemeRow || position == showIdAndDcRow || position == showTabsOnForwardRow ||
                     position == chatMessageAnimationRow || position == rearVideoMessagesRow || position == hideAllTabRow ||
-            ||position == confirmAVRow){
+                    position == confirmAVRow || position == askBeforeCallRow) {
                 return 3;
-            } else
-            if (position == settingsRow || position == connectionRow || position == chatRow || position == transRow || position == experimentRow || position == dialogsRow || position == privacyRow) {
+            } else if (position == settingsRow || position == connectionRow || position == chatRow || position == transRow || position == experimentRow || position == dialogsRow || position == privacyRow) {
                 return 4;
             } else if (position == needRestartRow) {
                 return 7;

TMessagesProj/src/main/res/values-b+zh+Duang/strings_neko.xml

@@ -91,4 +91,8 @@
     <string name="TabTitleTypeText">标题</string>
     <string name="TabTitleTypeIcon">图标</string>
     <string name="TabTitleTypeMix">图标与标题</string>
+    <string name="ConfirmAVMessage">发送视频/语音留言前确认</string>
+    <string name="AskBeforeCalling">呼叫前确认</string>
+    <string name="ConfirmCall">确认呼叫</string>
+    <string name="CallTo">呼叫 **%1$s**？</string>
 </resources>

TMessagesProj/src/main/res/values-es/strings_neko.xml

@@ -91,4 +91,8 @@
     <string name="TabTitleTypeText">Títulos</string>
     <string name="TabTitleTypeIcon">Emojis</string>
     <string name="TabTitleTypeMix">Emojis con títulos</string>
+    <string name="ConfirmAVMessage">Confirmar el envío de mensaje de video/voz</string>
+    <string name="AskBeforeCalling">Preguntar antes de llamar</string>
+    <string name="ConfirmCall">Confirmar llamada</string>
+    <string name="CallTo">¿Llamar a **%1$s**?</string>
 </resources>

TMessagesProj/src/main/res/values-id/strings_neko.xml

@@ -1,28 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="NekoSettings">Setelan Neko</string>
-    <string name="IPv6">Coba koneksi melalui IPv6</string>
-    <string name="MessageMenu">Menu pesan</string>
+    <string name="NekoSettings">Pengaturan Neko</string>
+    <string name="IPv6">Coba koneksikan melalui IPv6</string>
+    <string name="MessageMenu">Menu Mengambang</string>
     <string name="HidePhone">Sembunyikan nomor telepon saya</string>
-    <string name="Hide">Sembunyi</string>
-    <string name="DeleteAllFromSelf">Hapus semua pesanmu</string>
-    <string name="DeleteAllFromSelfAlert">Perhatian! Ini akan **menghapus semua pesan darimu** di obrolan ini untuk **semua** orang.</string>
-    <string name="BotLogin">Login Bot</string>
-    <string name="InvalidAccessToken">Akses token tidak sah</string>
-    <string name="IgnoreBlocked">Abaikan pengguna yg diblokir di grup</string>
+    <string name="Hide">Sembunyikan</string>
+    <string name="DeleteAllFromSelf">Hapus semua pesan anda</string>
+    <string name="DeleteAllFromSelfAlert">Peringatan! Ini akan **menghapus semua pesan milik anda** dalam obrolan ini untuk **semua** peserta.</string>
+    <string name="BotLogin">Bot Login</string>
+    <string name="InvalidAccessToken">Token akses tidak valid</string>
+    <string name="IgnoreBlocked">Abaikan pengguna yang diblokir dalam grup</string>
     <string name="Connection">Koneksi</string>
     <string name="Chat">Obrolan</string>
     <string name="NameOrder">Urutan nama*</string>
     <string name="FirstLast">Nama Belakang</string>
     <string name="LastFirst">Nama Depan</string>
-    <string name="TypefaceUseDefault">Gunakan font bawaan sistem*</string>
-    <string name="NoQuoteForward">Teruskan TanpaPetik</string>
+    <string name="TypefaceUseDefault">Gunakan font default sistem*</string>
+    <string name="NoQuoteForward">Teruskan Tanpa Kutip</string>
     <string name="Repeat">Ulangi</string>
     <string name="AddToSavedMessages">Simpan pesan</string>
-    <string name="CreateMention">Buat sebutan</string>
+    <string name="CreateMention">Buat Mention</string>
     <string name="ForceTabletMode">Paksa mode tablet*</string>
     <string name="Prpr">Peropero</string>
-    <string name="TransparentStatusBar">Status bar transparan</string>
+    <string name="TransparentStatusBar">Bilah status transparan</string>
     <string name="EnableResidentNotification">Tampilkan pemberitahuan penduduk</string>
     <string name="DisableResidentNotification">Nonaktifkan pemberitahuan penduduk</string>
     <string name="NekogramRunning">Nekogram sedang berjalan</string>
@@ -34,48 +34,48 @@
     <string name="Valentine">Hari valentine</string>
     <string name="Snowflakes">Kepingan salju</string>
     <string name="Fireworks">Kembang api</string>
-    <string name="SomeItemsNeedRestart">Pilihan dengan * mungkin perlu me-restart untuk melihat pengaruhnya.</string>
+    <string name="SomeItemsNeedRestart">Opsi dengan tanda * mungkin akan perlu mulai ulang agar berkerja.</string>
     <string name="DeleteDownloadedFile">Hapus berkas unduhan</string>
     <string name="TestBackend">Uji Backend</string>
     <string name="TestBackendOn">Akun ini akan dihubungkan ke pengujian backend.</string>
     <string name="TestBackendOff">Akun ini akan dihubungkan ke produksi backend.</string>
-    <string name="HideProxySponsorChannel">Sembunyikan kanal proksi sponsor</string>
+    <string name="HideProxySponsorChannel">Sembunyikan channel sponsor proxy</string>
     <string name="ViewHistory">Lihat riwayat</string>
-    <string name="Nya">Meong!</string>
-    <string name="SaveCacheToPrivateDirectory">Simpan cache di direktori pribadi*</string>
-    <string name="SensitiveDisableFiltering">Nonaktifkan filter konten sensitif</string>
-    <string name="SensitiveAbout">Tampilkan media sensitif di kanal publik di semua perangkat.</string>
+    <string name="Nya">Meow!</string>
+    <string name="SaveCacheToPrivateDirectory">Simpan cache ke direktori pribadi*</string>
+    <string name="SensitiveDisableFiltering">Nonaktifkan pemfilteran konten sensitif</string>
+    <string name="SensitiveAbout">Tampilkan media sensitif di channel publik di semua perangkat anda.</string>
     <string name="StickerSize">Ukuran stiker</string>
-    <string name="StickerSizeDialogMessageBigOne">Yg besar</string>
-    <string name="StickerSizeDialogMessageSmallOne">Yg kecil</string>
-    <string name="StickerSizeDialogMessageReplyTo">Meong</string>
-    <string name="StickerSizeDialogName">Duang</string>
+    <string name="StickerSizeDialogMessageBigOne">Stiker ini besar</string>
+    <string name="StickerSizeDialogMessageSmallOne">Stiker ini mengecil</string>
+    <string name="StickerSizeDialogMessageReplyTo">Meow</string>
+    <string name="StickerSizeDialogName">Dewi</string>
     <string name="Experiment">Eksperimental</string>
-    <string name="UnlimitedFavoredStickers">Stiker favorit tak terbatas</string>
-    <string name="UnlimitedFavoredStickersAbout">Tambahkan stiker tak terbatas ke favorit. Stiker mungkin tidak tersinkronisasi dengan perangkat lain.</string>
+    <string name="UnlimitedFavoredStickers">Stiker difavoritkan tanpa batas</string>
+    <string name="UnlimitedFavoredStickersAbout">Tambahkan stiker tak terbatas ke favorit. Stiker mungkin tidak dapat disinkronkan ke perangkat lain.</string>
     <string name="MessageDetails">Detail</string>
     <string name="ExportAsJson">Ekspor sebagai JSON</string>
-    <string name="Translate">Terjemahan</string>
+    <string name="Translate">Terjemahkan</string>
     <string name="JoinedFormatted">bergabung %1$s</string>
     <string name="JoinedDateFormatted">bergabung pada %1$s</string>
     <string name="DeleteAccount">Hapus akun Telegram</string>
-    <string name="TranslateFailed">Server terjemahan eror</string>
-    <string name="TranslationProvider">Penyedia translasi</string>
-    <string name="ProviderGoogleTranslate">Google Translate</string>
-    <string name="ProviderGoogleTranslateWeb">Google Translate (Web)</string>
-    <string name="ProviderGoogleTranslateCN">Google Translate CN</string>
-    <string name="ProviderGoogleTranslateCNWeb">Google Translate CN (Web)</string>
-    <string name="ProviderBaiduFanyiWeb">Baidu Translate (Web)</string>
-    <string name="TranslateApiUnsupported">Penyedia terjemahan yang kamu pilih tidak mendukung bahasa anda.</string>
+    <string name="TranslateFailed">Server terjemahan error</string>
+    <string name="TranslationProvider">Penyedia terjemahan</string>
+    <string name="ProviderGoogleTranslate">Google Terjemahan</string>
+    <string name="ProviderGoogleTranslateWeb">Google Terjemahan (Web)</string>
+    <string name="ProviderGoogleTranslateCN">Google Terjemahan CN</string>
+    <string name="ProviderGoogleTranslateCNWeb">Google Terjemahan CN (Web)</string>
+    <string name="ProviderBaiduFanyiWeb">Baidu Terjemahan (Web)</string>
+    <string name="TranslateApiUnsupported">Penyedia terjemahan yang anda pilih tidak mendukung bahasa Anda.</string>
     <string name="ProviderLingocloud">Lingocloud</string>
-    <string name="UndoTranslate">Batalkan terjemahan</string>
-    <string name="CopyDetails">Salin detail</string>
-    <string name="DisablePhotoViewerSideAction">Matikan flip foto dengan sentuh</string>
+    <string name="UndoTranslate">Batal menerjemahkan</string>
+    <string name="CopyDetails">Salin Detail</string>
+    <string name="DisablePhotoViewerSideAction">Nonaktifkan Balikkan Foto dengan mengetuk</string>
     <string name="BotToken">Token</string>
-    <string name="UnlimitedPinnedDialogs">Pin dialog tak terbatas</string>
-    <string name="UnlimitedPinnedDialogsAbout">Pin dialog tak terbatas dengan mematikan sync nya.</string>
-    <string name="OpenArchiveOnPull">Buka arsip saat ditarik ke bawah</string>
-    <string name="HideKeyboardOnChatScroll">Sembunyikan keyboard saat men-scroll</string>
+    <string name="UnlimitedPinnedDialogs">Dialog sematkan tanpa batas</string>
+    <string name="UnlimitedPinnedDialogsAbout">Sematkan dialog tak terbatas dengan mematikan sinkronisasi.</string>
+    <string name="OpenArchiveOnPull">Buka Arsip pada saat pulldown</string>
+    <string name="HideKeyboardOnChatScroll">Sembunyikan keyboard saat gulir obrolan</string>
     <string name="UserRestrictionsSendStickers2">Kirim Stiker</string>
     <string name="UserRestrictionsSendGifs">Mengirim Gif</string>
     <string name="UseAvatarAsDrawerBackground">Menggunakan Photo Profil sebagai latar belakang laci</string>

TMessagesProj/src/main/res/values-ko/strings_neko.xml

@@ -86,4 +86,13 @@
     <string name="RearVideoMessages">비디오 메세지에 후면 카메라 사용</string>
     <string name="HideAllTab">\"모든 채팅\" 탭 숨기기</string>
     <string name="HideAllTabAbout">홈페이지의 \"뒤로\" 버튼 눌러서 열기.</string>
+    <string name="TabTitleType">탭에 표시</string>
+    <string name="TabTitleTypeTip">이모티콘이 텔레그램 클라우드에 동기화 됩니다.</string>
+    <string name="TabTitleTypeText">제목</string>
+    <string name="TabTitleTypeIcon">이모티콘</string>
+    <string name="TabTitleTypeMix">제목이 있는 이모티콘</string>
+    <string name="ConfirmAVMessage">비디오/오디오 메세지 보내기 확인</string>
+    <string name="AskBeforeCalling">통화 연결 전에 묻기</string>
+    <string name="ConfirmCall">통화 연결 확인</string>
+    <string name="CallTo">%1$s 에게 통화 하기</string>
 </resources>

TMessagesProj/src/main/res/values-pt-rBR/strings_neko.xml

@@ -3,7 +3,7 @@
     <string name="NekoSettings">Configurações Neko</string>
     <string name="IPv6">Tentar conexão via IPv6</string>
     <string name="MessageMenu">Menu de mensagens</string>
-    <string name="HidePhone">Ocultar meu número de telefone</string>
+    <string name="HidePhone">Ocultar o meu número de telefone</string>
     <string name="Hide">Ocultar</string>
     <string name="DeleteAllFromSelf">Excluir minhas mensagens</string>
     <string name="DeleteAllFromSelfAlert">Aviso! Isso irá **excluir todas as suas mensagens** nesse chat para **todos** os participantes.</string>
@@ -43,7 +43,7 @@
     <string name="ViewHistory">Ver histórico</string>
     <string name="Nya">Miau!</string>
     <string name="SaveCacheToPrivateDirectory">Salvar cache no diretório privado*</string>
-    <string name="SensitiveDisableFiltering">Desabilitar filtragem de conteúdo sensível</string>
+    <string name="SensitiveDisableFiltering">Desabilitar filtro de conteúdo sensível</string>
     <string name="SensitiveAbout">Exiba mídia sensível em canais públicos em todos os seus dispositivos.</string>
     <string name="StickerSize">Tamanho dos stickers</string>
     <string name="StickerSizeDialogMessageBigOne">Um grande</string>
@@ -51,13 +51,13 @@
     <string name="StickerSizeDialogMessageReplyTo">Miau</string>
     <string name="StickerSizeDialogName">Duang</string>
     <string name="Experiment">Experimental</string>
-    <string name="UnlimitedFavoredStickers">Adesivos favoritos ilimitados</string>
+    <string name="UnlimitedFavoredStickers">Stickers favoritos ilimitados</string>
     <string name="UnlimitedFavoredStickersAbout">Adicione adesivos ilimitados aos favoritos. Os adesivos podem não estar sincronizados com outros dispositivos</string>
     <string name="MessageDetails">Detalhes</string>
     <string name="ExportAsJson">Exportar como JSON</string>
     <string name="Translate">Traduzir</string>
-    <string name="JoinedFormatted">visto por último %1$s</string>
-    <string name="JoinedDateFormatted">visto por último às %1$s</string>
+    <string name="JoinedFormatted">entrou %1$s</string>
+    <string name="JoinedDateFormatted">entrou em %1$s</string>
     <string name="DeleteAccount">Excluir conta do telegram</string>
     <string name="TranslateFailed">Erro no servidor de tradução</string>
     <string name="TranslationProvider">Provedor de tradução</string>
@@ -70,7 +70,7 @@
     <string name="ProviderLingocloud">Lingocloud</string>
     <string name="UndoTranslate">Desfazer tradução</string>
     <string name="CopyDetails">Copiar Detalhes</string>
-    <string name="DisablePhotoViewerSideAction">Desativar mudança de fotos ao tocar nos cantos</string>
+    <string name="DisablePhotoViewerSideAction">Desativar toque lateral para mudar fotos</string>
     <string name="BotToken">Token</string>
     <string name="UnlimitedPinnedDialogs">Chats fixados ilimitados</string>
     <string name="UnlimitedPinnedDialogsAbout">Fixar chats ilimitados desativar a sincronização.</string>
@@ -86,4 +86,9 @@
     <string name="RearVideoMessages">Câmera traseira em mensagens de vídeo</string>
     <string name="HideAllTab">Ocultar aba \"Todos os bate-papos\"</string>
     <string name="HideAllTabAbout">Pressione o botão \"Voltar\" na página inicial, para abri-lo.</string>
+    <string name="TabTitleType">Mostrar em abas</string>
+    <string name="TabTitleTypeTip">Os emoticons são sincronizados em nuvem pelo Telegram.</string>
+    <string name="TabTitleTypeText">Títulos</string>
+    <string name="TabTitleTypeIcon">Emoticons</string>
+    <string name="TabTitleTypeMix">Emoticons com títulos</string>
 </resources>

TMessagesProj/src/main/res/values-zh-rCN/strings_neko.xml

@@ -91,4 +91,8 @@
     <string name="TabTitleTypeText">标题</string>
     <string name="TabTitleTypeIcon">图标</string>
     <string name="TabTitleTypeMix">图标与标题</string>
+    <string name="ConfirmAVMessage">发送视频/语音留言前确认</string>
+    <string name="AskBeforeCalling">呼叫前确认</string>
+    <string name="ConfirmCall">确认呼叫</string>
+    <string name="CallTo">呼叫 **%1$s**？</string>
 </resources>

TMessagesProj/src/main/res/values/strings_neko.xml

@@ -96,4 +96,8 @@
     <string name="TabTitleTypeText">Titles</string>
     <string name="TabTitleTypeIcon">Emoticons</string>
     <string name="TabTitleTypeMix">Emoticons with titles</string>
+    <string name="ConfirmAVMessage">Confirm sending video/voice message</string>
+    <string name="AskBeforeCalling">Ask before calling</string>
+    <string name="ConfirmCall">Confirm calling</string>
+    <string name="CallTo">Call to **%1$s**?</string>
 </resources>

TMessagesProj/src/main/res/xml/auth.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 
 <account-authenticator xmlns:android="http://schemas.android.com/apk/res/android"
-    android:accountType="moe.wataru.nekogram"
+    android:accountType="nekox.messenger"
     android:icon="@mipmap/ic_launcher"
     android:smallIcon="@mipmap/ic_launcher"
     android:label="@string/AppName"

TMessagesProj/src/main/res/xml/auth_menu.xml

@@ -6,7 +6,7 @@
         android:title="@string/AccountSettings"
         android:summary="">
         <intent android:action="org.telegram.messenger.OPEN_ACCOUNT"
-            android:targetPackage="moe.wataru.nekogram"
+            android:targetPackage="nekox.messenger"
             android:targetClass="org.telegram.ui.LaunchActivity"/>
     </PreferenceScreen>
 </PreferenceScreen>

TMessagesProj/src/main/res/xml/sync_contacts.xml

@@ -1,3 +1,3 @@
 <sync-adapter xmlns:android="http://schemas.android.com/apk/res/android"
     android:contentAuthority="com.android.contacts"
-    android:accountType="moe.wataru.nekogram"/>
+    android:accountType="nekox.messenger"/>