srctree

Roee Hershberg parent d2223ef1 ec74b613
Remove cancel string and use android's built-in

inlinesplit
atox/src/main/kotlin/ui/chat/ChatFragment.kt added: 45, removed: 73, total 0
@@ -153,7 +153,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>(FragmentChatBinding::infl
Toast.makeText(requireContext(), R.string.clear_history_cleared, Toast.LENGTH_LONG).show()
viewModel.clearHistory()
}
.setNegativeButton(R.string.cancel, null).show()
.setNegativeButton(android.R.string.cancel, null).show()
true
}
R.id.call -> {
@@ -375,7 +375,7 @@ class ChatFragment : BaseFragment<FragmentChatBinding>(FragmentChatBinding::infl
.setPositiveButton(R.string.delete) { _, _ ->
viewModel.delete(message)
}
.setNegativeButton(R.string.cancel, null).show()
.setNegativeButton(android.R.string.cancel, null).show()
true
}
R.id.send_action -> {
 
atox/src/main/kotlin/ui/contactlist/ContactListFragment.kt added: 45, removed: 73, total 0
@@ -263,7 +263,7 @@ class ContactListFragment :
.setPositiveButton(R.string.delete) { _, _ ->
viewModel.deleteContact(PublicKey(contact.publicKey))
}
.setNegativeButton(R.string.cancel, null).show()
.setNegativeButton(android.R.string.cancel, null).show()
}
}
true
@@ -287,7 +287,7 @@ class ContactListFragment :
viewModel.quitTox()
activity?.finishAffinity()
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(android.R.string.cancel, null)
.show()
}
}
@@ -351,7 +351,7 @@ class ContactListFragment :
).show()
}
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(android.R.string.cancel, null)
.setOnDismissListener {
passwordDialog = null
if (!viewModel.isToxRunning()) {
 
atox/src/main/kotlin/ui/create_profile/CreateProfileFragment.kt added: 45, removed: 73, total 0
@@ -62,7 +62,7 @@ class CreateProfileFragment : BaseFragment<FragmentProfileBinding>(FragmentProfi
).show()
}
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(android.R.string.cancel, null)
.show()
}
else -> Toast.makeText(
 
atox/src/main/kotlin/ui/user_profile/UserProfileFragment.kt added: 45, removed: 73, total 0
@@ -110,7 +110,7 @@ class UserProfileFragment : BaseFragment<FragmentUserProfileBinding>(FragmentUse
.setPositiveButton(R.string.update) { _, _ ->
vm.setName(nameEdit.text.toString())
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(android.R.string.cancel, null)
.show()
}
 
@@ -126,7 +126,7 @@ class UserProfileFragment : BaseFragment<FragmentUserProfileBinding>(FragmentUse
.setPositiveButton(R.string.update) { _, _ ->
vm.setStatusMessage(statusMessageEdit.text.toString())
}
.setNegativeButton(R.string.cancel, null)
.setNegativeButton(android.R.string.cancel, null)
.show()
}
 
@@ -194,7 +194,7 @@ class UserProfileFragment : BaseFragment<FragmentUserProfileBinding>(FragmentUse
startActivity(Intent.createChooser(shareIntent, getString(R.string.tox_id_share)))
}
}
.setNegativeButton(getString(R.string.cancel), null)
.setNegativeButton(getString(android.R.string.cancel), null)
.create()
}
 
 
atox/src/main/res/layout/chat_filetransfer.xml added: 45, removed: 73, total 0
@@ -62,7 +62,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minHeight="0dp"
android:text="@string/cancel"/>
android:text="@android:string/cancel"/>
</LinearLayout>
<LinearLayout android:id="@+id/completedLayout"
android:layout_width="wrap_content"
 
atox/src/main/res/layout/dialog_status.xml added: 45, removed: 73, total 0
@@ -141,7 +141,7 @@
android:layout_height="wrap_content"
android:backgroundTint="@color/dialogIconButton"
android:fontFamily="sans-serif-light"
android:text="@string/cancel"
android:text="@android:string/cancel"
android:textColor="@color/dialogTextButton" />
</LinearLayout>
</androidx.cardview.widget.CardView>
 
atox/src/main/res/values-ar/strings.xml added: 45, removed: 73, total 0
@@ -5,7 +5,6 @@
<string name="copied">نُسخ</string>
<string name="contact_typing">يكتب…</string>
<string name="connecting">يتصل…</string>
<string name="cancel">ألغ</string>
<string name="confirm">تأكيد</string>
<string name="add_contact_message_error_empty">اكتب شيء كي تُرسل اولاً</string>
<string name="add_contact">أضف جهة اتصال</string>
 
atox/src/main/res/values-bs/strings.xml added: 45, removed: 73, total 0
@@ -115,7 +115,6 @@
<string name="copied">Kopirano</string>
<string name="contact_typing">Pise…</string>
<string name="connecting">Povezivanje…</string>
<string name="cancel">Odustani</string>
<string name="confirm">Potvrdi</string>
<string name="add_contact_message_error_empty">Napisi poruku za slanje</string>
<string name="add_contact_message_default">Razgovaraj sa mnom na aTox kao razumno ljudsko biće.</string>
 
atox/src/main/res/values-de/strings.xml added: 45, removed: 73, total 0
@@ -5,7 +5,6 @@
<string name="add_contact">Kontakt hinzufügen</string>
<string name="add_contact_message_error_empty">Schreibe zuerst etwas, bevor du es sendest</string>
<string name="confirm">Bestätigen</string>
<string name="cancel">Abbrechen</string>
<string name="connecting">Verbindet …</string>
<string name="contact_typing">tippt …</string>
<string name="copied">Kopiert</string>
 
atox/src/main/res/values-el/strings.xml added: 45, removed: 73, total 0
@@ -104,7 +104,6 @@
<string name="copy_atox">Αντιγραφή</string>
<string name="copied">Αντιγράφηκε</string>
<string name="connecting">Σύνδεση…</string>
<string name="cancel">Ακύρωση</string>
<string name="confirm">Επιβεβαίωση</string>
<string name="add_contact_message_error_empty">Το μήνυμα δεν μπορεί να είναι κενό</string>
<string name="add_contact_message_default">Μίλα μου στο aTox σαν λογικός άνθρωπος.</string>
 
atox/src/main/res/values-es/strings.xml added: 45, removed: 73, total 0
@@ -6,7 +6,6 @@
<string name="add_contact_message_default">Háblame en aTox como un ser humano razonable.</string>
<string name="add_contact_message_error_empty">Escribe algo antes de enviar</string>
<string name="confirm">Confirmar</string>
<string name="cancel">Cancelar</string>
<string name="connecting">Conectando…</string>
<string name="contact_typing">Escribiendo…</string>
<string name="copied">Copiado</string>
 
atox/src/main/res/values-et/strings.xml added: 45, removed: 73, total 0
@@ -108,7 +108,6 @@
<string name="copied">Kopeeritud</string>
<string name="contact_typing">Tippimine …</string>
<string name="connecting">Ühendamine …</string>
<string name="cancel">Tühista</string>
<string name="confirm">Kinnitage</string>
<string name="add_contact_message_error_empty">Kirjuta midagi enne saatmist</string>
<string name="add_contact_message_default">Räägi minuga aToxis nagu mõistlik inimene.</string>
 
atox/src/main/res/values-eu/strings.xml added: 45, removed: 73, total 0
@@ -35,7 +35,6 @@
<string name="copied">Kopiatuta</string>
<string name="contact_typing">Idazten…</string>
<string name="connecting">Konektatzen…</string>
<string name="cancel">Utzi</string>
<string name="confirm">Baieztatu</string>
<string name="add_contact_message_error_empty">Idatzi zerbait bidali aurretik</string>
<string name="add_contact_message_default">Hitz egin nirekin aTox bidez pertsona zentzudun batek gisa.</string>
 
atox/src/main/res/values-fa/strings.xml added: 45, removed: 73, total 0
@@ -62,7 +62,6 @@
<string name="copied">کپی شد</string>
<string name="contact_typing">درحال تایپ…</string>
<string name="connecting">درحال اتصال…</string>
<string name="cancel">انصراف</string>
<string name="confirm">تایید</string>
<string name="add_contact_message_error_empty">چیزی بنویسید تا اول فرستاده شود</string>
<string name="add_contact_message_default">در aTox همچون یک انسان متمدن با من سخن بگو</string>
 
atox/src/main/res/values-fr/strings.xml added: 45, removed: 73, total 0
@@ -100,7 +100,6 @@
<string name="copied">Copié</string>
<string name="contact_typing">Écrit…</string>
<string name="connecting">Connexion…</string>
<string name="cancel">Annuler</string>
<string name="confirm">Confirmer</string>
<string name="add_contact_message_error_empty">Écrivez d’abord quelque chose à envoyer</string>
<string name="add_contact_message_default">Parlez-moi sur aTox comme un être humain raisonnable.</string>
 
atox/src/main/res/values-hr/strings.xml added: 45, removed: 73, total 0
@@ -32,7 +32,6 @@
<string name="copied">Kopirano</string>
<string name="contact_typing">Piše …</string>
<string name="connecting">Povezivanje …</string>
<string name="cancel">Odustani</string>
<string name="confirm">Potvrdi</string>
<string name="add_contact_message_error_empty">Najprije nešto napiši</string>
<string name="add_contact_message_default">Pričaj sa mnom na aTox-u kao razumno ljudsko biće.</string>
 
atox/src/main/res/values-hu/strings.xml added: 45, removed: 73, total 0
@@ -69,7 +69,6 @@
<string name="copied">Másolva</string>
<string name="contact_typing">Ír…</string>
<string name="connecting">Kapcsolódás…</string>
<string name="cancel">Mégsem</string>
<string name="confirm">Megerősítés</string>
<string name="add_contact_message_error_empty">Írj valamit, mielőtt elküldöd</string>
<string name="add_contact_message_default">Beszélj velem az aToxon, mint egy ésszerű ember.</string>
 
atox/src/main/res/values-hy/strings.xml added: 45, removed: 73, total 0
@@ -22,7 +22,6 @@
<string name="copied">Պատճենված է</string>
<string name="contact_typing">Գրում է…</string>
<string name="connecting">Կապի հաստատում…</string>
<string name="cancel">Չեղարկել</string>
<string name="confirm">Հաստատել</string>
<string name="add_contact_message_error_empty">Գրիր ինչ-որ բան ուղարկելու համար</string>
<string name="add_contact_message_default">Շփվենք aTox-ում, ոնց նորմալ մարդիկ:</string>
 
atox/src/main/res/values-it/strings.xml added: 45, removed: 73, total 0
@@ -100,7 +100,6 @@
<string name="copied">Copiato</string>
<string name="contact_typing">digitando…</string>
<string name="connecting">Connessione…</string>
<string name="cancel">Annulla</string>
<string name="confirm">Conferma</string>
<string name="add_contact_message_error_empty">Scrivi prima qualcosa da inviare</string>
<string name="add_contact_message_default">Parlami su aTox come un essere umano ragionevole.</string>
 
atox/src/main/res/values-iw/strings.xml added: 45, removed: 73, total 0
@@ -37,7 +37,6 @@
<string name="delete_contact">מחק איש קשר</string>
<string name="name">שם</string>
<string name="navigation_drawer_open">פתח תפריט</string>
<string name="cancel">ביטול</string>
<string name="create_a_tox_profile">צור פרופיל Tox</string>
<string name="message">הודעה</string>
<string name="messages_incoming">הודעות נכנסות</string>
 
atox/src/main/res/values-lt/strings.xml added: 45, removed: 73, total 0
@@ -91,7 +91,6 @@
<string name="copied">Nukopijuoti</string>
<string name="contact_typing">Rašo…</string>
<string name="connecting">Jungiamasi…</string>
<string name="cancel">Atšaukti</string>
<string name="confirm">Patvirtinti</string>
<string name="add_contact_message_error_empty">Įrašykite ką nors prieš siųsdami</string>
<string name="add_contact_message_default">Bendraukite aTox sistemoje kaip normalus žmogus.</string>
 
atox/src/main/res/values-nb-rNO/strings.xml added: 45, removed: 73, total 0
@@ -94,7 +94,6 @@
<string name="copy_atox">Kopier</string>
<string name="copied">Kopiert</string>
<string name="connecting">Kobler til …</string>
<string name="cancel">Avbryt</string>
<string name="confirm">Bekreft</string>
<string name="add_contact_message_error_empty">Skriv noe å sende først</string>
<string name="add_contact_message_default">Snakk med meg på aTox som et ansvarlig menneske.</string>
 
atox/src/main/res/values-pl/strings.xml added: 45, removed: 73, total 0
@@ -46,7 +46,6 @@
<string name="copied">Skopiowano</string>
<string name="contact_typing">pisze…</string>
<string name="connecting">Łączenie…</string>
<string name="cancel">Anuluj</string>
<string name="confirm">Potwierdź</string>
<string name="add_contact">Dodaj kontakt</string>
<string name="messages">Wiadomości</string>
 
atox/src/main/res/values-pt-rBR/strings.xml added: 45, removed: 73, total 0
@@ -6,7 +6,6 @@
<string name="add_contact_message_default">Fale comigo no aTox como um ser humano razoável.</string>
<string name="add_contact_message_error_empty">Escreva algo para enviar primeiro</string>
<string name="confirm">Confirmar</string>
<string name="cancel">Cancelar</string>
<string name="connecting">Conectado…</string>
<string name="contact_typing">Escrevendo…</string>
<string name="copied">Copiado</string>
 
atox/src/main/res/values-pt/strings.xml added: 45, removed: 73, total 0
@@ -99,7 +99,6 @@
<string name="copied">Copiado</string>
<string name="contact_typing">A escrever…</string>
<string name="connecting">A ligar…</string>
<string name="cancel">Cancelar</string>
<string name="confirm">Confirmar</string>
<string name="add_contact_message_error_empty">Escreva algo para enviar primeiro</string>
<string name="add_contact_message_default">Conversa comigo no aTox como uma pessoa normal.</string>
 
atox/src/main/res/values-ro/strings.xml added: 45, removed: 73, total 0
@@ -6,7 +6,6 @@
<string name="add_contact_message_default">Fii rațional, comunică cu mine în aTox.</string>
<string name="add_contact_message_error_empty">Mai întâi să scriem ceva</string>
<string name="confirm">Confirmă</string>
<string name="cancel">Anulează</string>
<string name="connecting">Conectare…</string>
<string name="contact_typing">Tastează…</string>
<string name="copied">Copiat</string>
 
atox/src/main/res/values-ru/strings.xml added: 45, removed: 73, total 0
@@ -6,7 +6,6 @@
<string name="add_contact_message_default">Общайся со мной в aTox, как разумный человек.</string>
<string name="add_contact_message_error_empty">Напишите что-нибудь для отправки</string>
<string name="confirm">Подтвердить</string>
<string name="cancel">Отменить</string>
<string name="connecting">Подключение…</string>
<string name="contact_typing">Печатает…</string>
<string name="copied">Скопировано</string>
 
atox/src/main/res/values-sk/strings.xml added: 45, removed: 73, total 0
@@ -142,7 +142,6 @@
<string name="copied">Skopírované</string>
<string name="contact_typing">Píše…</string>
<string name="connecting">Pripájam…</string>
<string name="cancel">Zrušiť</string>
<string name="confirm">Potvrdiť</string>
<string name="add_contact_message_error_empty">Najprv niečo napíš na odoslanie</string>
<string name="share">Zdieľaj</string>
 
atox/src/main/res/values-sv/strings.xml added: 45, removed: 73, total 0
@@ -3,7 +3,6 @@
<string name="accept">Acceptera</string>
<string name="add">Lägg till</string>
<string name="add_contact">Lägg till kontakt</string>
<string name="cancel">Avbryt</string>
<string name="clear_history">Rensa historik</string>
<string name="clear_history_cleared">Historik rensad</string>
<string name="clear_history_confirm">Är du säker på att du vill rensa din historik med %1$s?</string>
 
atox/src/main/res/values-tr/strings.xml added: 45, removed: 73, total 0
@@ -139,7 +139,6 @@
<string name="copied">Kopyalandı</string>
<string name="contact_typing">Yazıyor…</string>
<string name="connecting">Bağlanıyor…</string>
<string name="cancel">İptal Et</string>
<string name="confirm">Onayla</string>
<string name="add_contact_message_error_empty">Göndermek için öncelikle birşeyler yazılmalı</string>
<string name="add_contact_message_default">Benimle aTox\'ta mantıklı bir insan gibi konuş.</string>
 
atox/src/main/res/values-uk/strings.xml added: 45, removed: 73, total 0
@@ -85,7 +85,6 @@
<string name="add_contact_message_error_empty">Напишіть що-небудь для відправки</string>
<string name="add_contact_message_default">Спількуйся зі мною в aTox, як розумна людина.</string>
<string name="contact_typing">Друкує…</string>
<string name="cancel">Скасувати</string>
<string name="confirm">Пiдтвердити</string>
<string name="add_contact">Додати контакт</string>
<string name="add">Додати</string>
 
atox/src/main/res/values-uz/strings.xml added: 45, removed: 73, total 0
@@ -4,7 +4,6 @@
<string name="add">Qo\'shish</string>
<string name="add_contact">Kontaktga qo\'shish</string>
<string name="confirm">Tasdiqlash</string>
<string name="cancel">Bekor qilish</string>
<string name="connecting">Ulanmoqda…</string>
<string name="contact_typing">Yozmoqda…</string>
<string name="copied">Nusxa olindi</string>
 
atox/src/main/res/values-zh-rCN/strings.xml added: 45, removed: 73, total 0
@@ -116,7 +116,6 @@
<string name="copied">已复制</string>
<string name="contact_typing">正在输入…</string>
<string name="connecting">正在连接…</string>
<string name="cancel">取消</string>
<string name="confirm">确认</string>
<string name="add_contact_message_error_empty">先写点要发送的内容</string>
<string name="add_contact_message_default">像一个理性的人一样在 aTox 上与我交谈。</string>
 
atox/src/main/res/values/strings.xml added: 45, removed: 73, total 0
@@ -7,7 +7,6 @@
<string name="add_contact_message_error_empty">Write something to send first</string>
<string name="app_name" translatable="false">aTox</string>
<string name="confirm">Confirm</string>
<string name="cancel">Cancel</string>
<string name="connecting">Connecting…</string>
<string name="contact_typing">Typing…</string>
<string name="copied">Copied</string>