From a77069297d054c9c6c1330e397628b8161c63f01 Mon Sep 17 00:00:00 2001 From: Benoit Marty Date: Wed, 16 Sep 2020 19:51:43 +0200 Subject: [PATCH] Remove R.string.copy, use R.string.action_copy (Fix clash with androidx.preferences private resource) --- .../home/room/detail/timeline/action/EventSharedAction.kt | 2 +- vector/src/main/res/values-ar/strings.xml | 1 - vector/src/main/res/values-b+sr+Latn/strings.xml | 1 - vector/src/main/res/values-bg/strings.xml | 1 - vector/src/main/res/values-bn-rIN/strings.xml | 1 - vector/src/main/res/values-bs/strings.xml | 1 - vector/src/main/res/values-ca/strings.xml | 1 - vector/src/main/res/values-cs/strings.xml | 1 - vector/src/main/res/values-da/strings.xml | 1 - vector/src/main/res/values-de/strings.xml | 1 - vector/src/main/res/values-el/strings.xml | 1 - vector/src/main/res/values-eo/strings.xml | 1 - vector/src/main/res/values-es-rMX/strings.xml | 1 - vector/src/main/res/values-es/strings.xml | 1 - vector/src/main/res/values-et/strings.xml | 1 - vector/src/main/res/values-eu/strings.xml | 1 - vector/src/main/res/values-fa/strings.xml | 1 - vector/src/main/res/values-fi/strings.xml | 1 - vector/src/main/res/values-fr/strings.xml | 1 - vector/src/main/res/values-fy/strings.xml | 1 - vector/src/main/res/values-gl/strings.xml | 1 - vector/src/main/res/values-hr/strings.xml | 1 - vector/src/main/res/values-hu/strings.xml | 1 - vector/src/main/res/values-id/strings.xml | 1 - vector/src/main/res/values-in/strings.xml | 1 - vector/src/main/res/values-is/strings.xml | 1 - vector/src/main/res/values-it/strings.xml | 1 - vector/src/main/res/values-ja/strings.xml | 1 - vector/src/main/res/values-kab/strings.xml | 1 - vector/src/main/res/values-ko/strings.xml | 1 - vector/src/main/res/values-lv/strings.xml | 1 - vector/src/main/res/values-nb-rNO/strings.xml | 1 - vector/src/main/res/values-nl/strings.xml | 1 - vector/src/main/res/values-nn/strings.xml | 1 - vector/src/main/res/values-pl/strings.xml | 1 - vector/src/main/res/values-pt-rBR/strings.xml | 1 - vector/src/main/res/values-pt/strings.xml | 1 - vector/src/main/res/values-ru/strings.xml | 1 - vector/src/main/res/values-sk/strings.xml | 1 - vector/src/main/res/values-sq/strings.xml | 1 - vector/src/main/res/values-sr/strings.xml | 1 - vector/src/main/res/values-sv/strings.xml | 1 - vector/src/main/res/values-te/strings.xml | 1 - vector/src/main/res/values-th/strings.xml | 1 - vector/src/main/res/values-tlh/strings.xml | 1 - vector/src/main/res/values-tr/strings.xml | 1 - vector/src/main/res/values-uk/strings.xml | 1 - vector/src/main/res/values-zh-rCN/strings.xml | 1 - vector/src/main/res/values-zh-rTW/strings.xml | 1 - vector/src/main/res/values/strings.xml | 1 - 50 files changed, 1 insertion(+), 50 deletions(-) diff --git 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 index cffd576057..7693d97c35 100644 --- 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) diff --git a/vector/src/main/res/values-ar/strings.xml b/vector/src/main/res/values-ar/strings.xml index 1c6f0d9fb5..f7c6abea4e 100644 --- a/vector/src/main/res/values-ar/strings.xml +++ b/vector/src/main/res/values-ar/strings.xml @@ -20,7 +20,6 @@ احفظ اترك أرسِل - انسخ أعِد الإرسال اقتبس شارِك diff --git a/vector/src/main/res/values-b+sr+Latn/strings.xml b/vector/src/main/res/values-b+sr+Latn/strings.xml index 0710775d57..c66e754216 100644 --- 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 @@ Napusti Ostani Pošalji - Kopiraj Pošalji ponovo Ukloni Podeli diff --git a/vector/src/main/res/values-bg/strings.xml b/vector/src/main/res/values-bg/strings.xml index ad0d85116a..2dfb212dcb 100644 --- a/vector/src/main/res/values-bg/strings.xml +++ b/vector/src/main/res/values-bg/strings.xml @@ -82,7 +82,6 @@ Запази Напусни Изпрати - Копирай Изпрати отново Премахни Цитирай diff --git a/vector/src/main/res/values-bn-rIN/strings.xml b/vector/src/main/res/values-bn-rIN/strings.xml index 349450990f..a0c0f92cb5 100644 --- a/vector/src/main/res/values-bn-rIN/strings.xml +++ b/vector/src/main/res/values-bn-rIN/strings.xml @@ -45,7 +45,6 @@ ত্যাগ থাক পাঠান - অনুলিপি আবার পাঠান অপসারণ উদ্ধৃতি diff --git a/vector/src/main/res/values-bs/strings.xml b/vector/src/main/res/values-bs/strings.xml index 98747e2ff7..4d342912a0 100644 --- a/vector/src/main/res/values-bs/strings.xml +++ b/vector/src/main/res/values-bs/strings.xml @@ -24,7 +24,6 @@ Snimi Napusti Pošalji - Kopiraj Pošalji Ponovo Uredi Citat diff --git a/vector/src/main/res/values-ca/strings.xml b/vector/src/main/res/values-ca/strings.xml index 8126cd1c2b..d711d778ca 100644 --- a/vector/src/main/res/values-ca/strings.xml +++ b/vector/src/main/res/values-ca/strings.xml @@ -32,7 +32,6 @@ Desa Abandona la sala Envia - Còpia Reenvia Suprimeix Cita diff --git a/vector/src/main/res/values-cs/strings.xml b/vector/src/main/res/values-cs/strings.xml index a62d1996d0..f20bdff2d3 100644 --- a/vector/src/main/res/values-cs/strings.xml +++ b/vector/src/main/res/values-cs/strings.xml @@ -15,7 +15,6 @@ Odeslat Opustit Sdílet - Kopírovat Předat Zobrazit zdroj Odstranit diff --git a/vector/src/main/res/values-da/strings.xml b/vector/src/main/res/values-da/strings.xml index af4cb6d4cc..2fa102399a 100644 --- a/vector/src/main/res/values-da/strings.xml +++ b/vector/src/main/res/values-da/strings.xml @@ -21,7 +21,6 @@ Gem Forlad Send - Kopier Send igen Tilbagehold Citér diff --git a/vector/src/main/res/values-de/strings.xml b/vector/src/main/res/values-de/strings.xml index 455021aabe..da2e2886a1 100644 --- a/vector/src/main/res/values-de/strings.xml +++ b/vector/src/main/res/values-de/strings.xml @@ -22,7 +22,6 @@ Speichern Verlassen Senden - Kopieren Erneut senden Entfernen Zitieren diff --git a/vector/src/main/res/values-el/strings.xml b/vector/src/main/res/values-el/strings.xml index 4abc074d4b..499f4a0549 100644 --- a/vector/src/main/res/values-el/strings.xml +++ b/vector/src/main/res/values-el/strings.xml @@ -67,7 +67,6 @@ Άδειες τρίτων - Αντιγραφή Αργότερα Μπροστά Διαγαρφή diff --git a/vector/src/main/res/values-eo/strings.xml b/vector/src/main/res/values-eo/strings.xml index 21a805c2ad..c648efaf2a 100644 --- a/vector/src/main/res/values-eo/strings.xml +++ b/vector/src/main/res/values-eo/strings.xml @@ -28,7 +28,6 @@ Konservi Eliri Sendi - Kopii Resendi Forigi Citi diff --git a/vector/src/main/res/values-es-rMX/strings.xml b/vector/src/main/res/values-es-rMX/strings.xml index 950425648c..7981f1e4f8 100644 --- a/vector/src/main/res/values-es-rMX/strings.xml +++ b/vector/src/main/res/values-es-rMX/strings.xml @@ -18,7 +18,6 @@ Guardar Salir Enviar - Copiar Reenviar Borrar Citar diff --git a/vector/src/main/res/values-es/strings.xml b/vector/src/main/res/values-es/strings.xml index b57b03e6d9..4687fffa77 100644 --- a/vector/src/main/res/values-es/strings.xml +++ b/vector/src/main/res/values-es/strings.xml @@ -18,7 +18,6 @@ Guardar Salir Enviar - Copiar Reenviar Eliminar Citar diff --git a/vector/src/main/res/values-et/strings.xml b/vector/src/main/res/values-et/strings.xml index 7243557176..778abdb290 100644 --- a/vector/src/main/res/values-et/strings.xml +++ b/vector/src/main/res/values-et/strings.xml @@ -50,7 +50,6 @@ Lahku Jää Saada - Kopeeri Saada uuesti Eemalda Tsiteeri diff --git a/vector/src/main/res/values-eu/strings.xml b/vector/src/main/res/values-eu/strings.xml index ccb7568ca9..12d437d6c3 100644 --- a/vector/src/main/res/values-eu/strings.xml +++ b/vector/src/main/res/values-eu/strings.xml @@ -14,7 +14,6 @@ Gorde Atera Bidali - Kopiatu Birbidali Kendu Aipua diff --git a/vector/src/main/res/values-fa/strings.xml b/vector/src/main/res/values-fa/strings.xml index 335d2d9c66..34aaeb3599 100644 --- a/vector/src/main/res/values-fa/strings.xml +++ b/vector/src/main/res/values-fa/strings.xml @@ -20,7 +20,6 @@ ذخیره ترک کردن ارسال - روگرفت ارسال مجدد نقل قول اشتراک گذاری diff --git a/vector/src/main/res/values-fi/strings.xml b/vector/src/main/res/values-fi/strings.xml index aa16c14542..07a5d3f84a 100644 --- a/vector/src/main/res/values-fi/strings.xml +++ b/vector/src/main/res/values-fi/strings.xml @@ -18,7 +18,6 @@ Säästä Poistu Lähetä - Kopioi Lähetä uudelleen Poista Lainaa diff --git a/vector/src/main/res/values-fr/strings.xml b/vector/src/main/res/values-fr/strings.xml index c092beff9f..d58f22b399 100644 --- a/vector/src/main/res/values-fr/strings.xml +++ b/vector/src/main/res/values-fr/strings.xml @@ -14,7 +14,6 @@ Annuler Enregistrer Envoyer - Copier Renvoyer Partager Plus tard diff --git a/vector/src/main/res/values-fy/strings.xml b/vector/src/main/res/values-fy/strings.xml index b0999ff8e7..d43f2d5b01 100644 --- a/vector/src/main/res/values-fy/strings.xml +++ b/vector/src/main/res/values-fy/strings.xml @@ -48,7 +48,6 @@ Ferlitte Bliuwe Ferstjoere - Kopiearje Opnij ferstjoere Fuortsmite Sitearje diff --git a/vector/src/main/res/values-gl/strings.xml b/vector/src/main/res/values-gl/strings.xml index c6cc39ceae..6ef0b9437d 100644 --- a/vector/src/main/res/values-gl/strings.xml +++ b/vector/src/main/res/values-gl/strings.xml @@ -26,7 +26,6 @@ Gardar Saír Enviar - Copiar Enviar de novo Redactar Citar diff --git a/vector/src/main/res/values-hr/strings.xml b/vector/src/main/res/values-hr/strings.xml index 84dc520db1..83a479d79f 100644 --- a/vector/src/main/res/values-hr/strings.xml +++ b/vector/src/main/res/values-hr/strings.xml @@ -48,7 +48,6 @@ Napusti Ostani Pošalji - Kopiraj Pošalji ponovno Ukloni Citiraj diff --git a/vector/src/main/res/values-hu/strings.xml b/vector/src/main/res/values-hu/strings.xml index 712a465ad3..2516d203e0 100644 --- a/vector/src/main/res/values-hu/strings.xml +++ b/vector/src/main/res/values-hu/strings.xml @@ -15,7 +15,6 @@ Mentés Elhagyás Küldés - Másolás Újraküldés Törlés Idézés diff --git a/vector/src/main/res/values-id/strings.xml b/vector/src/main/res/values-id/strings.xml index 76accdfe0c..a05fde63f7 100644 --- a/vector/src/main/res/values-id/strings.xml +++ b/vector/src/main/res/values-id/strings.xml @@ -69,7 +69,6 @@ Nomor Telpon (piihan) Ulangi password Konfirmasi password baru - Gandakan Kirim Ulang Teruskan Tampilkan Sumber diff --git a/vector/src/main/res/values-in/strings.xml b/vector/src/main/res/values-in/strings.xml index 76accdfe0c..a05fde63f7 100644 --- a/vector/src/main/res/values-in/strings.xml +++ b/vector/src/main/res/values-in/strings.xml @@ -69,7 +69,6 @@ Nomor Telpon (piihan) Ulangi password Konfirmasi password baru - Gandakan Kirim Ulang Teruskan Tampilkan Sumber diff --git a/vector/src/main/res/values-is/strings.xml b/vector/src/main/res/values-is/strings.xml index a148e3c855..e20805590b 100644 --- a/vector/src/main/res/values-is/strings.xml +++ b/vector/src/main/res/values-is/strings.xml @@ -27,7 +27,6 @@ Vista Fara út Senda - Afrita Endursenda Ritstýra Tilvitnun diff --git a/vector/src/main/res/values-it/strings.xml b/vector/src/main/res/values-it/strings.xml index b566ac5733..190e1610aa 100644 --- a/vector/src/main/res/values-it/strings.xml +++ b/vector/src/main/res/values-it/strings.xml @@ -19,7 +19,6 @@ Salva Esci Invia - Copia Rispedisci Rimuovi Citazione diff --git a/vector/src/main/res/values-ja/strings.xml b/vector/src/main/res/values-ja/strings.xml index b5080e4d17..66c6eb53d3 100644 --- a/vector/src/main/res/values-ja/strings.xml +++ b/vector/src/main/res/values-ja/strings.xml @@ -12,7 +12,6 @@ 保存 退室 送信 - コピー 再送信 削除 共有 diff --git a/vector/src/main/res/values-kab/strings.xml b/vector/src/main/res/values-kab/strings.xml index 56fa00d017..75e1f19aa6 100644 --- a/vector/src/main/res/values-kab/strings.xml +++ b/vector/src/main/res/values-kab/strings.xml @@ -22,7 +22,6 @@ Sekles Ffeɣ Azen - Nɣel Ɛawed azen Sfeḍ Tanebdurt diff --git a/vector/src/main/res/values-ko/strings.xml b/vector/src/main/res/values-ko/strings.xml index defc379c1a..b2273a5782 100644 --- a/vector/src/main/res/values-ko/strings.xml +++ b/vector/src/main/res/values-ko/strings.xml @@ -24,7 +24,6 @@ 저장 떠나기 보내기 - 복사 다시 보내기 감추기 인용 diff --git a/vector/src/main/res/values-lv/strings.xml b/vector/src/main/res/values-lv/strings.xml index f716d62c9f..0a82c6882c 100644 --- a/vector/src/main/res/values-lv/strings.xml +++ b/vector/src/main/res/values-lv/strings.xml @@ -16,7 +16,6 @@ Saglabāt Atstāt Nosūtīt - Kopēt Sūtīt atkārtoti Rediģēt Citāts diff --git a/vector/src/main/res/values-nb-rNO/strings.xml b/vector/src/main/res/values-nb-rNO/strings.xml index 55f5c22460..48f9e87737 100644 --- a/vector/src/main/res/values-nb-rNO/strings.xml +++ b/vector/src/main/res/values-nb-rNO/strings.xml @@ -24,7 +24,6 @@ Lagre Forlat Send - Kopier Send på nytt Fjern Sitering diff --git a/vector/src/main/res/values-nl/strings.xml b/vector/src/main/res/values-nl/strings.xml index 1b07f38bd0..f10458970e 100644 --- a/vector/src/main/res/values-nl/strings.xml +++ b/vector/src/main/res/values-nl/strings.xml @@ -18,7 +18,6 @@ Opslaan Verlaten Versturen - Kopiëren Opnieuw versturen Verwijderen Citeren diff --git a/vector/src/main/res/values-nn/strings.xml b/vector/src/main/res/values-nn/strings.xml index fc94d52b74..fcd0ba9e15 100644 --- a/vector/src/main/res/values-nn/strings.xml +++ b/vector/src/main/res/values-nn/strings.xml @@ -30,7 +30,6 @@ Lagra Forlat Send - Kopier Send på nytt Fjern Siter diff --git a/vector/src/main/res/values-pl/strings.xml b/vector/src/main/res/values-pl/strings.xml index aadfc09bf5..690849ff6a 100644 --- a/vector/src/main/res/values-pl/strings.xml +++ b/vector/src/main/res/values-pl/strings.xml @@ -11,7 +11,6 @@ Zapisz Opuść Wyślij - Kopiuj Wyślij ponownie Usuń Cytuj diff --git a/vector/src/main/res/values-pt-rBR/strings.xml b/vector/src/main/res/values-pt-rBR/strings.xml index ef44f53cf4..4032fe0764 100644 --- a/vector/src/main/res/values-pt-rBR/strings.xml +++ b/vector/src/main/res/values-pt-rBR/strings.xml @@ -22,7 +22,6 @@ Salvar Sair da sala Enviar - Copiar Reenviar Apagar Citar diff --git a/vector/src/main/res/values-pt/strings.xml b/vector/src/main/res/values-pt/strings.xml index 03dc9f385a..52c7512b7c 100644 --- a/vector/src/main/res/values-pt/strings.xml +++ b/vector/src/main/res/values-pt/strings.xml @@ -18,7 +18,6 @@ Guardar Sair Enviar - Copiar Reenviar Apagar Citar diff --git a/vector/src/main/res/values-ru/strings.xml b/vector/src/main/res/values-ru/strings.xml index 60e5f6c388..457999e554 100644 --- a/vector/src/main/res/values-ru/strings.xml +++ b/vector/src/main/res/values-ru/strings.xml @@ -22,7 +22,6 @@ Сохранить Покинуть Отправить - Копировать Повторить отправку Удалить Цитировать diff --git a/vector/src/main/res/values-sk/strings.xml b/vector/src/main/res/values-sk/strings.xml index e8a9495b1f..66ba1f354d 100644 --- a/vector/src/main/res/values-sk/strings.xml +++ b/vector/src/main/res/values-sk/strings.xml @@ -25,7 +25,6 @@ Uložiť Opustiť Odoslať - Kopírovať Odoslať znovu Vymazať Citovať diff --git a/vector/src/main/res/values-sq/strings.xml b/vector/src/main/res/values-sq/strings.xml index ea84d963d1..43506d8798 100644 --- a/vector/src/main/res/values-sq/strings.xml +++ b/vector/src/main/res/values-sq/strings.xml @@ -26,7 +26,6 @@ Ruaje Dil Dërgoje - Kopjoje Ridërgoje Citim Shkarkoje diff --git a/vector/src/main/res/values-sr/strings.xml b/vector/src/main/res/values-sr/strings.xml index 121589a6cd..8701fc6eeb 100644 --- a/vector/src/main/res/values-sr/strings.xml +++ b/vector/src/main/res/values-sr/strings.xml @@ -43,7 +43,6 @@ Напусти Остани Пошаљи - Копирај Пошаљи поново Уклони Подели diff --git a/vector/src/main/res/values-sv/strings.xml b/vector/src/main/res/values-sv/strings.xml index 8b42d3db9f..3db9d3c48d 100644 --- a/vector/src/main/res/values-sv/strings.xml +++ b/vector/src/main/res/values-sv/strings.xml @@ -48,7 +48,6 @@ Lämna Stanna Skicka - Kopiera Skicka igen Ta bort Citat diff --git a/vector/src/main/res/values-te/strings.xml b/vector/src/main/res/values-te/strings.xml index 28609a17f7..c73b9f7b9c 100644 --- a/vector/src/main/res/values-te/strings.xml +++ b/vector/src/main/res/values-te/strings.xml @@ -16,7 +16,6 @@ చారిత్రిక వదిలివేయు - నకలుతీయు తిరిగిపంపు సందేశాలు అమరికలు diff --git a/vector/src/main/res/values-th/strings.xml b/vector/src/main/res/values-th/strings.xml index 3ca04aae89..fe0d0ff6f7 100644 --- a/vector/src/main/res/values-th/strings.xml +++ b/vector/src/main/res/values-th/strings.xml @@ -29,7 +29,6 @@ บันทึก ออก ส่ง - คัดลอก ดาวน์โหลด แชร์ พูด diff --git a/vector/src/main/res/values-tlh/strings.xml b/vector/src/main/res/values-tlh/strings.xml index 407e507396..5b9af280df 100644 --- a/vector/src/main/res/values-tlh/strings.xml +++ b/vector/src/main/res/values-tlh/strings.xml @@ -27,7 +27,6 @@ choq mej ngeH - velqa\' chenmoH ngeHqa\' jatlhqa\' lI\' diff --git a/vector/src/main/res/values-tr/strings.xml b/vector/src/main/res/values-tr/strings.xml index e906dafb39..31efd3eba7 100644 --- a/vector/src/main/res/values-tr/strings.xml +++ b/vector/src/main/res/values-tr/strings.xml @@ -33,7 +33,6 @@ Ayrıl Gönder - Kopyala Tekrar gönder Sil Alıntı diff --git a/vector/src/main/res/values-uk/strings.xml b/vector/src/main/res/values-uk/strings.xml index 5a0d12bd76..7ed1791908 100644 --- a/vector/src/main/res/values-uk/strings.xml +++ b/vector/src/main/res/values-uk/strings.xml @@ -29,7 +29,6 @@ Зберегти Залишити Надіслати - Копіювати Надіслати ще раз Прибрати Цитата diff --git a/vector/src/main/res/values-zh-rCN/strings.xml b/vector/src/main/res/values-zh-rCN/strings.xml index 6122f746e3..3cbcbb0875 100644 --- a/vector/src/main/res/values-zh-rCN/strings.xml +++ b/vector/src/main/res/values-zh-rCN/strings.xml @@ -66,7 +66,6 @@ 保存 离开 发送 - 复制 查看源代码 查看解密后的源代码 diff --git a/vector/src/main/res/values-zh-rTW/strings.xml b/vector/src/main/res/values-zh-rTW/strings.xml index 6bba7c9f11..9fa649b6da 100644 --- a/vector/src/main/res/values-zh-rTW/strings.xml +++ b/vector/src/main/res/values-zh-rTW/strings.xml @@ -35,7 +35,6 @@ 歷史 社群細節 - 複製 移除 引用 稍後 diff --git a/vector/src/main/res/values/strings.xml b/vector/src/main/res/values/strings.xml index d130bc910b..167655f800 100644 --- a/vector/src/main/res/values/strings.xml +++ b/vector/src/main/res/values/strings.xml @@ -56,7 +56,6 @@ Leave Stay Send - Copy Resend Remove Quote