Remove R.string.copy, use R.string.action_copy (Fix clash with androidx.preferences private resource)

2024-11-27 20:06:51 +03:00 · 2020-09-16 19:51:43 +02:00 · 2020-09-16 19:51:43 +02:00 · a77069297d
commit a77069297d
parent 36899af36b
50 changed files with 1 additions and 50 deletions
--- a/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
+++ b/vector/src/main/java/im/vector/app/features/home/room/detail/timeline/action/EventSharedAction.kt
@ -36,7 +36,7 @@ sealed class EventSharedAction(@StringRes val titleRes: Int,
            EventSharedAction(R.string.message_add_reaction, R.drawable.ic_add_reaction)

    data class Copy(val content: String) :
-            EventSharedAction(R.string.copy, R.drawable.ic_copy)
+            EventSharedAction(R.string.action_copy, R.drawable.ic_copy)

    data class Edit(val eventId: String) :
            EventSharedAction(R.string.edit, R.drawable.ic_edit)
--- a/vector/src/main/res/values-ar/strings.xml
+++ b/vector/src/main/res/values-ar/strings.xml
@ -20,7 +20,6 @@
    <string name="save">احفظ</string>
    <string name="leave">اترك</string>
    <string name="send">أرسِل</string>
-    <string name="copy">انسخ</string>
    <string name="resend">أعِد الإرسال</string>
    <string name="quote">اقتبس</string>
    <string name="share">شارِك</string>
--- a/vector/src/main/res/values-b+sr+Latn/strings.xml
+++ b/vector/src/main/res/values-b+sr+Latn/strings.xml
@ -43,7 +43,6 @@
    <string name="leave">Napusti</string>
    <string name="stay">Ostani</string>
    <string name="send">Pošalji</string>
-    <string name="copy">Kopiraj</string>
    <string name="resend">Pošalji ponovo</string>
    <string name="redact">Ukloni</string>
    <string name="share">Podeli</string>
--- a/vector/src/main/res/values-bg/strings.xml
+++ b/vector/src/main/res/values-bg/strings.xml
@ -82,7 +82,6 @@
    <string name="save">Запази</string>
    <string name="leave">Напусни</string>
    <string name="send">Изпрати</string>
-    <string name="copy">Копирай</string>
    <string name="resend">Изпрати отново</string>
    <string name="redact">Премахни</string>
    <string name="quote">Цитирай</string>
--- a/vector/src/main/res/values-bn-rIN/strings.xml
+++ b/vector/src/main/res/values-bn-rIN/strings.xml
@ -45,7 +45,6 @@
    <string name="leave">ত্যাগ</string>
    <string name="stay">থাক</string>
    <string name="send">পাঠান</string>
-    <string name="copy">অনুলিপি</string>
    <string name="resend">আবার পাঠান</string>
    <string name="redact">অপসারণ</string>
    <string name="quote">উদ্ধৃতি</string>
--- a/vector/src/main/res/values-bs/strings.xml
+++ b/vector/src/main/res/values-bs/strings.xml
@ -24,7 +24,6 @@
    <string name="save">Snimi</string>
    <string name="leave">Napusti</string>
    <string name="send">Pošalji</string>
-    <string name="copy">Kopiraj</string>
    <string name="resend">Pošalji Ponovo</string>
    <string name="redact">Uredi</string>
    <string name="quote">Citat</string>
--- a/vector/src/main/res/values-ca/strings.xml
+++ b/vector/src/main/res/values-ca/strings.xml
@ -32,7 +32,6 @@
    <string name="save">Desa</string>
    <string name="leave">Abandona la sala</string>
    <string name="send">Envia</string>
-    <string name="copy">Còpia</string>
    <string name="resend">Reenvia</string>
    <string name="redact">Suprimeix</string>
    <string name="quote">Cita</string>
--- a/vector/src/main/res/values-cs/strings.xml
+++ b/vector/src/main/res/values-cs/strings.xml
@ -15,7 +15,6 @@
    <string name="send">Odeslat</string>
    <string name="leave">Opustit</string>
    <string name="share">Sdílet</string>
-    <string name="copy">Kopírovat</string>
    <string name="forward">Předat</string>
    <string name="view_source">Zobrazit zdroj</string>
    <string name="delete">Odstranit</string>
--- a/vector/src/main/res/values-da/strings.xml
+++ b/vector/src/main/res/values-da/strings.xml
@ -21,7 +21,6 @@
    <string name="save">Gem</string>
    <string name="leave">Forlad</string>
    <string name="send">Send</string>
-    <string name="copy">Kopier</string>
    <string name="resend">Send igen</string>
    <string name="redact">Tilbagehold</string>
    <string name="quote">Citér</string>
--- a/vector/src/main/res/values-de/strings.xml
+++ b/vector/src/main/res/values-de/strings.xml
@ -22,7 +22,6 @@
    <string name="save">Speichern</string>
    <string name="leave">Verlassen</string>
    <string name="send">Senden</string>
-    <string name="copy">Kopieren</string>
    <string name="resend">Erneut senden</string>
    <string name="redact">Entfernen</string>
    <string name="quote">Zitieren</string>
--- a/vector/src/main/res/values-el/strings.xml
+++ b/vector/src/main/res/values-el/strings.xml
@ -67,7 +67,6 @@

    <string name="dialog_title_third_party_licences">Άδειες τρίτων</string>

-    <string name="copy">Αντιγραφή</string>
    <string name="later">Αργότερα</string>
    <string name="forward">Μπροστά</string>
    <string name="delete">Διαγαρφή</string>
--- a/vector/src/main/res/values-eo/strings.xml
+++ b/vector/src/main/res/values-eo/strings.xml
@ -28,7 +28,6 @@
    <string name="save">Konservi</string>
    <string name="leave">Eliri</string>
    <string name="send">Sendi</string>
-    <string name="copy">Kopii</string>
    <string name="resend">Resendi</string>
    <string name="redact">Forigi</string>
    <string name="quote">Citi</string>
--- a/vector/src/main/res/values-es-rMX/strings.xml
+++ b/vector/src/main/res/values-es-rMX/strings.xml
@ -18,7 +18,6 @@
    <string name="save">Guardar</string>
    <string name="leave">Salir</string>
    <string name="send">Enviar</string>
-    <string name="copy">Copiar</string>
    <string name="resend">Reenviar</string>
    <string name="redact">Borrar</string>
    <string name="quote">Citar</string>
--- a/vector/src/main/res/values-es/strings.xml
+++ b/vector/src/main/res/values-es/strings.xml
@ -18,7 +18,6 @@
    <string name="save">Guardar</string>
    <string name="leave">Salir</string>
    <string name="send">Enviar</string>
-    <string name="copy">Copiar</string>
    <string name="resend">Reenviar</string>
    <string name="redact">Eliminar</string>
    <string name="quote">Citar</string>
--- a/vector/src/main/res/values-et/strings.xml
+++ b/vector/src/main/res/values-et/strings.xml
@ -50,7 +50,6 @@
    <string name="leave">Lahku</string>
    <string name="stay">Jää</string>
    <string name="send">Saada</string>
-    <string name="copy">Kopeeri</string>
    <string name="resend">Saada uuesti</string>
    <string name="redact">Eemalda</string>
    <string name="quote">Tsiteeri</string>
--- a/vector/src/main/res/values-eu/strings.xml
+++ b/vector/src/main/res/values-eu/strings.xml
@ -14,7 +14,6 @@
    <string name="save">Gorde</string>
    <string name="leave">Atera</string>
    <string name="send">Bidali</string>
-    <string name="copy">Kopiatu</string>
    <string name="resend">Birbidali</string>
    <string name="redact">Kendu</string>
    <string name="quote">Aipua</string>
--- a/vector/src/main/res/values-fa/strings.xml
+++ b/vector/src/main/res/values-fa/strings.xml
@ -20,7 +20,6 @@
    <string name="save">ذخیره</string>
    <string name="leave">ترک کردن</string>
    <string name="send">ارسال</string>
-    <string name="copy">روگرفت</string>
    <string name="resend">ارسال مجدد</string>
    <string name="quote">نقل قول</string>
    <string name="share">اشتراک گذاری</string>
--- a/vector/src/main/res/values-fi/strings.xml
+++ b/vector/src/main/res/values-fi/strings.xml
@ -18,7 +18,6 @@
    <string name="save">Säästä</string>
    <string name="leave">Poistu</string>
    <string name="send">Lähetä</string>
-    <string name="copy">Kopioi</string>
    <string name="resend">Lähetä uudelleen</string>
    <string name="redact">Poista</string> <!-- ??? -->
    <string name="quote">Lainaa</string>
--- a/vector/src/main/res/values-fr/strings.xml
+++ b/vector/src/main/res/values-fr/strings.xml
@ -14,7 +14,6 @@
    <string name="cancel">Annuler</string>
    <string name="save">Enregistrer</string>
    <string name="send">Envoyer</string>
-    <string name="copy">Copier</string>
    <string name="resend">Renvoyer</string>
    <string name="share">Partager</string>
    <string name="later">Plus tard</string>
--- a/vector/src/main/res/values-fy/strings.xml
+++ b/vector/src/main/res/values-fy/strings.xml
@ -48,7 +48,6 @@
    <string name="leave">Ferlitte</string>
    <string name="stay">Bliuwe</string>
    <string name="send">Ferstjoere</string>
-    <string name="copy">Kopiearje</string>
    <string name="resend">Opnij ferstjoere</string>
    <string name="redact">Fuortsmite</string>
    <string name="quote">Sitearje</string>
--- a/vector/src/main/res/values-gl/strings.xml
+++ b/vector/src/main/res/values-gl/strings.xml
@ -26,7 +26,6 @@
    <string name="save">Gardar</string>
    <string name="leave">Saír</string>
    <string name="send">Enviar</string>
-    <string name="copy">Copiar</string>
    <string name="resend">Enviar de novo</string>
    <string name="redact">Redactar</string>
    <string name="quote">Citar</string>
--- a/vector/src/main/res/values-hr/strings.xml
+++ b/vector/src/main/res/values-hr/strings.xml
@ -48,7 +48,6 @@
    <string name="leave">Napusti</string>
    <string name="stay">Ostani</string>
    <string name="send">Pošalji</string>
-    <string name="copy">Kopiraj</string>
    <string name="resend">Pošalji ponovno</string>
    <string name="redact">Ukloni</string>
    <string name="quote">Citiraj</string>
--- a/vector/src/main/res/values-hu/strings.xml
+++ b/vector/src/main/res/values-hu/strings.xml
@ -15,7 +15,6 @@
    <string name="save">Mentés</string>
    <string name="leave">Elhagyás</string>
    <string name="send">Küldés</string>
-    <string name="copy">Másolás</string>
    <string name="resend">Újraküldés</string>
    <string name="redact">Törlés</string>
    <string name="quote">Idézés</string>
--- a/vector/src/main/res/values-id/strings.xml
+++ b/vector/src/main/res/values-id/strings.xml
@ -69,7 +69,6 @@
    <string name="auth_opt_phone_number_placeholder">Nomor Telpon (piihan)</string>
    <string name="auth_repeat_password_placeholder">Ulangi password</string>
    <string name="auth_repeat_new_password_placeholder">Konfirmasi password baru</string>
-    <string name="copy">Gandakan</string>
    <string name="resend">Kirim Ulang</string>
    <string name="forward">Teruskan</string>
    <string name="view_source">Tampilkan Sumber</string>
--- a/vector/src/main/res/values-in/strings.xml
+++ b/vector/src/main/res/values-in/strings.xml
@ -69,7 +69,6 @@
    <string name="auth_opt_phone_number_placeholder">Nomor Telpon (piihan)</string>
    <string name="auth_repeat_password_placeholder">Ulangi password</string>
    <string name="auth_repeat_new_password_placeholder">Konfirmasi password baru</string>
-    <string name="copy">Gandakan</string>
    <string name="resend">Kirim Ulang</string>
    <string name="forward">Teruskan</string>
    <string name="view_source">Tampilkan Sumber</string>
--- a/vector/src/main/res/values-is/strings.xml
+++ b/vector/src/main/res/values-is/strings.xml
@ -27,7 +27,6 @@
    <string name="save">Vista</string>
    <string name="leave">Fara út</string>
    <string name="send">Senda</string>
-    <string name="copy">Afrita</string>
    <string name="resend">Endursenda</string>
    <string name="redact">Ritstýra</string>
    <string name="quote">Tilvitnun</string>
--- a/vector/src/main/res/values-it/strings.xml
+++ b/vector/src/main/res/values-it/strings.xml
@ -19,7 +19,6 @@
    <string name="save">Salva</string>
    <string name="leave">Esci</string>
    <string name="send">Invia</string>
-    <string name="copy">Copia</string>
    <string name="resend">Rispedisci</string>
    <string name="redact">Rimuovi</string>
    <string name="quote">Citazione</string>
--- a/vector/src/main/res/values-ja/strings.xml
+++ b/vector/src/main/res/values-ja/strings.xml
@ -12,7 +12,6 @@
    <string name="save">保存</string>
    <string name="leave">退室</string>
    <string name="send">送信</string>
-    <string name="copy">コピー</string>
    <string name="resend">再送信</string>
    <string name="redact">削除</string>
    <string name="share">共有</string>
--- a/vector/src/main/res/values-kab/strings.xml
+++ b/vector/src/main/res/values-kab/strings.xml
@ -22,7 +22,6 @@
    <string name="save">Sekles</string>
    <string name="leave">Ffeɣ</string>
    <string name="send">Azen</string>
-    <string name="copy">Nɣel</string>
    <string name="resend">Ɛawed azen</string>
    <string name="redact">Sfeḍ</string>
    <string name="quote">Tanebdurt</string>
--- a/vector/src/main/res/values-ko/strings.xml
+++ b/vector/src/main/res/values-ko/strings.xml
@ -24,7 +24,6 @@
    <string name="save">저장</string>
    <string name="leave">떠나기</string>
    <string name="send">보내기</string>
-    <string name="copy">복사</string>
    <string name="resend">다시 보내기</string>
    <string name="redact">감추기</string>
    <string name="quote">인용</string>
--- a/vector/src/main/res/values-lv/strings.xml
+++ b/vector/src/main/res/values-lv/strings.xml
@ -16,7 +16,6 @@
    <string name="save">Saglabāt</string>
    <string name="leave">Atstāt</string>
    <string name="send">Nosūtīt</string>
-    <string name="copy">Kopēt</string>
    <string name="resend">Sūtīt atkārtoti</string>
    <string name="redact">Rediģēt</string>
    <string name="quote">Citāts</string>
--- a/vector/src/main/res/values-nb-rNO/strings.xml
+++ b/vector/src/main/res/values-nb-rNO/strings.xml
@ -24,7 +24,6 @@
    <string name="save">Lagre</string>
    <string name="leave">Forlat</string>
    <string name="send">Send</string>
-    <string name="copy">Kopier</string>
    <string name="resend">Send på nytt</string>
    <string name="redact">Fjern</string>
    <string name="quote">Sitering</string>
--- a/vector/src/main/res/values-nl/strings.xml
+++ b/vector/src/main/res/values-nl/strings.xml
@ -18,7 +18,6 @@
    <string name="save">Opslaan</string>
    <string name="leave">Verlaten</string>
    <string name="send">Versturen</string>
-    <string name="copy">Kopiëren</string>
    <string name="resend">Opnieuw versturen</string>
    <string name="redact">Verwijderen</string>
    <string name="quote">Citeren</string>
--- a/vector/src/main/res/values-nn/strings.xml
+++ b/vector/src/main/res/values-nn/strings.xml
@ -30,7 +30,6 @@
    <string name="save">Lagra</string>
    <string name="leave">Forlat</string>
    <string name="send">Send</string>
-    <string name="copy">Kopier</string>
    <string name="resend">Send på nytt</string>
    <string name="redact">Fjern</string>
    <string name="quote">Siter</string>
--- a/vector/src/main/res/values-pl/strings.xml
+++ b/vector/src/main/res/values-pl/strings.xml
@ -11,7 +11,6 @@
    <string name="save">Zapisz</string>
    <string name="leave">Opuść</string>
    <string name="send">Wyślij</string>
-    <string name="copy">Kopiuj</string>
    <string name="resend">Wyślij ponownie</string>
    <string name="redact">Usuń</string>
    <string name="quote">Cytuj</string>
--- a/vector/src/main/res/values-pt-rBR/strings.xml
+++ b/vector/src/main/res/values-pt-rBR/strings.xml
@ -22,7 +22,6 @@
    <string name="save">Salvar</string>
    <string name="leave">Sair da sala</string>
    <string name="send">Enviar</string>
-    <string name="copy">Copiar</string>
    <string name="resend">Reenviar</string>
    <string name="redact">Apagar</string>
    <string name="quote">Citar</string>
--- a/vector/src/main/res/values-pt/strings.xml
+++ b/vector/src/main/res/values-pt/strings.xml
@ -18,7 +18,6 @@
    <string name="save">Guardar</string>
    <string name="leave">Sair</string>
    <string name="send">Enviar</string>
-    <string name="copy">Copiar</string>
    <string name="resend">Reenviar</string>
    <string name="redact">Apagar</string>
    <string name="quote">Citar</string>
--- a/vector/src/main/res/values-ru/strings.xml
+++ b/vector/src/main/res/values-ru/strings.xml
@ -22,7 +22,6 @@
    <string name="save">Сохранить</string>
    <string name="leave">Покинуть</string>
    <string name="send">Отправить</string>
-    <string name="copy">Копировать</string>
    <string name="resend">Повторить отправку</string>
    <string name="redact">Удалить</string>
    <string name="quote">Цитировать</string>
--- a/vector/src/main/res/values-sk/strings.xml
+++ b/vector/src/main/res/values-sk/strings.xml
@ -25,7 +25,6 @@
    <string name="save">Uložiť</string>
    <string name="leave">Opustiť</string>
    <string name="send">Odoslať</string>
-    <string name="copy">Kopírovať</string>
    <string name="resend">Odoslať znovu</string>
    <string name="redact">Vymazať</string>
    <string name="quote">Citovať</string>
--- a/vector/src/main/res/values-sq/strings.xml
+++ b/vector/src/main/res/values-sq/strings.xml
@ -26,7 +26,6 @@
    <string name="save">Ruaje</string>
    <string name="leave">Dil</string>
    <string name="send">Dërgoje</string>
-    <string name="copy">Kopjoje</string>
    <string name="resend">Ridërgoje</string>
    <string name="quote">Citim</string>
    <string name="download">Shkarkoje</string>
--- a/vector/src/main/res/values-sr/strings.xml
+++ b/vector/src/main/res/values-sr/strings.xml
@ -43,7 +43,6 @@
    <string name="leave">Напусти</string>
    <string name="stay">Остани</string>
    <string name="send">Пошаљи</string>
-    <string name="copy">Копирај</string>
    <string name="resend">Пошаљи поново</string>
    <string name="redact">Уклони</string>
    <string name="share">Подели</string>
--- a/vector/src/main/res/values-sv/strings.xml
+++ b/vector/src/main/res/values-sv/strings.xml
@ -48,7 +48,6 @@
    <string name="leave">Lämna</string>
    <string name="stay">Stanna</string>
    <string name="send">Skicka</string>
-    <string name="copy">Kopiera</string>
    <string name="resend">Skicka igen</string>
    <string name="redact">Ta bort</string>
    <string name="quote">Citat</string>
--- a/vector/src/main/res/values-te/strings.xml
+++ b/vector/src/main/res/values-te/strings.xml
@ -16,7 +16,6 @@
    <string name="title_activity_historical">చారిత్రిక</string>

    <string name="leave">వదిలివేయు</string>
-    <string name="copy">నకలుతీయు</string>
    <string name="resend">తిరిగిపంపు</string>
    <string name="title_activity_home">సందేశాలు</string>
    <string name="title_activity_settings">అమరికలు</string>
--- a/vector/src/main/res/values-th/strings.xml
+++ b/vector/src/main/res/values-th/strings.xml
@ -29,7 +29,6 @@
    <string name="save">บันทึก</string>
    <string name="leave">ออก</string>
    <string name="send">ส่ง</string>
-    <string name="copy">คัดลอก</string>
    <string name="download">ดาวน์โหลด</string>
    <string name="share">แชร์</string>
    <string name="speak">พูด</string>
--- a/vector/src/main/res/values-tlh/strings.xml
+++ b/vector/src/main/res/values-tlh/strings.xml
@ -27,7 +27,6 @@
    <string name="save">choq</string>
    <string name="leave">mej</string>
    <string name="send">ngeH</string>
-    <string name="copy">velqa\' chenmoH</string>
    <string name="resend">ngeHqa\'</string>
    <string name="quote">jatlhqa\'</string>
    <string name="download">lI\'</string>
--- a/vector/src/main/res/values-tr/strings.xml
+++ b/vector/src/main/res/values-tr/strings.xml
@ -33,7 +33,6 @@

    <string name="leave">Ayrıl</string>
    <string name="send">Gönder</string>
-    <string name="copy">Kopyala</string>
    <string name="resend">Tekrar gönder</string>
    <string name="redact">Sil</string>
    <string name="quote">Alıntı</string>
--- a/vector/src/main/res/values-uk/strings.xml
+++ b/vector/src/main/res/values-uk/strings.xml
@ -29,7 +29,6 @@
    <string name="save">Зберегти</string>
    <string name="leave">Залишити</string>
    <string name="send">Надіслати</string>
-    <string name="copy">Копіювати</string>
    <string name="resend">Надіслати ще раз</string>
    <string name="redact">Прибрати</string>
    <string name="quote">Цитата</string>
--- a/vector/src/main/res/values-zh-rCN/strings.xml
+++ b/vector/src/main/res/values-zh-rCN/strings.xml
@ -66,7 +66,6 @@
    <string name="save">保存</string>
    <string name="leave">离开</string>
    <string name="send">发送</string>
-    <string name="copy">复制</string>
    <string name="view_source">查看源代码</string>
    <string name="view_decrypted_source">查看解密后的源代码</string>
    <string name="or">或</string>
--- a/vector/src/main/res/values-zh-rTW/strings.xml
+++ b/vector/src/main/res/values-zh-rTW/strings.xml
@ -35,7 +35,6 @@
    <string name="title_activity_historical">歷史</string>
    <string name="title_activity_group_details">社群細節</string>

-    <string name="copy">複製</string>
    <string name="redact">移除</string>
    <string name="quote">引用</string>
    <string name="later">稍後</string>
--- a/vector/src/main/res/values/strings.xml
+++ b/vector/src/main/res/values/strings.xml
@ -56,7 +56,6 @@
    <string name="leave">Leave</string>
    <string name="stay">Stay</string>
    <string name="send">Send</string>
-    <string name="copy">Copy</string>
    <string name="resend">Resend</string>
    <string name="redact">Remove</string>
    <string name="quote">Quote</string>