Skip to content

Commit

Permalink
Merge branch 'master' into structured-addresses-pr
Browse files Browse the repository at this point in the history
  • Loading branch information
@naveensingh
naveensingh authored Oct 25, 2024
2 parents 941227c + 96242ef commit b068c6e
Show file tree
Hide file tree
Showing 20 changed files with 156 additions and 60 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/image-minimizer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module.exports = async ({github, context}) => {

// Regex for finding images (simple variant) ![ALT_TEXT](https://*.githubusercontent.com/<number>/<variousHexStringsAnd->.<fileExtension>)
const REGEX_USER_CONTENT_IMAGE_LOOKUP = /\!\[(.*)\]\((https:\/\/[-a-z0-9]+\.githubusercontent\.com\/\d+\/[-0-9a-f]{32,512}\.(jpg|gif|png))\)/gm;
const REGEX_ASSETS_IMAGE_LOCKUP = /\!\[(.*)\]\((https:\/\/github\.com\/[-\w\d]+\/[-\w\d]+\/assets\/\d+\/[\-0-9a-f]{32,512})\)/gm;
const REGEX_ASSETS_IMAGE_LOCKUP = /\!\[(.*)\]\((https:\/\/github\.com\/user-attachments\/assets\/[\-0-9a-f]{36,})\)/gm;

// Check if we found something
let foundSimpleImages = REGEX_USER_CONTENT_IMAGE_LOOKUP.test(initialBody)
Expand Down
7 changes: 5 additions & 2 deletions app/src/main/res/values-cy/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -61,13 +61,16 @@
<string name="websites">Gwefannau</string>
<string name="groups">Grwpiau</string>
<string name="contact_source">Ffynhonnell gyswllt</string>
<string name="instant_messaging">Negesu ar unwaith (IM)</string> <plurals name="delete_groups">
<string name="instant_messaging">Negesu ar unwaith (IM)</string>
<plurals name="delete_groups">
<item quantity="zero">%d group</item>
<item quantity="one">%d groups</item>
<item quantity="two">%d groups</item>
<item quantity="few">%d groups</item>
<item quantity="many">%d groups</item>
<item quantity="other">%d groups</item>
</plurals> <string name="faq_1_title">Hoffwn newid pa feysydd sydd i\'w gweld ar gyfer cysylltiadau. Ydy hyn yn bosib?</string>
</plurals>
<string name="faq_1_title">Hoffwn newid pa feysydd sydd i\'w gweld ar gyfer cysylltiadau. Ydy hyn yn bosib?</string>
<string name="faq_1_text">Ydy. Y cwbl sy\'n rhaid gwneud ydy mynd i Gosodiadau -&gt; Rheoli pa feysydd cysylltiadau i\'w dangos. Yna, gellir dewis pa feysydd sydd i\'w gweld. Bydd rhai wedi eu gosod i beidio ymddangos fel arfer, felly mae\'n bosib byddi\'n dod o hyd i rai newydd yno.</string>
<string name="toggle_favorite">Hoffi</string>
</resources>
1 change: 1 addition & 0 deletions app/src/main/res/values-hr/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@
<string name="faq_1_title">Želim promijeniti polja koja su vidljiva u kontaktima. Mogu li to napraviti\?</string>
<string name="faq_1_text">Da, idi u Postavke -&gt; Upravljaj prikazanim poljima kontakta. Tamo možeš odabrati vidljiva polja. Neka od njih su čak standardno deaktivirana, tako da možeš pronaći neka nova.</string>
<string name="show_private_contacts">Prikaži privatne kontakte u aplikacijama Fossify telefon, Fossify SMS Messenger i Fossify kalendar</string>
<string name="format_phone_numbers">Formatiraj telefonske brojeve</string>
</resources>
21 changes: 12 additions & 9 deletions app/src/main/res/values-ja/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,25 @@
<resources>
<string name="app_launcher_name">連絡先</string>
<string name="address">住所</string>
<string name="inserting">挿入中…</string>
<string name="updating">更新中…</string>
<string name="inserting">挿入しています…</string>
<string name="updating">更新しています…</string>
<string name="phone_storage">内部ストレージ</string>
<string name="phone_storage_hidden">内部ストレージ (他のアプリからは表示されません)</string>
<string name="phone_storage_hidden">内部ストレージ（他のアプリには表示されません）</string>
<string name="company">会社</string>
<string name="job_position">役職</string>
<string name="send_sms_to_contacts">連絡先にSMSを送信</string>
<string name="send_email_to_contacts">連絡先にメールを送信</string>
<string name="send_sms_to_group">グループにSMSを送信</string>
<string name="send_email_to_group">グループにメールを送信</string>
<string name="fields_empty">少なくとも1つのフィールドに入力する必要があります</string>
<string name="fields_empty">少なくとも1つの入力欄に入力する必要があります</string>
<string name="must_be_at_edit">連絡先を編集するには編集画面に切り替えてください</string>
<string name="no_contacts_with_emails">メールアドレスが登録された連絡先が見つかりません</string>
<string name="no_contacts_with_phone_numbers">電話番号が登録された連絡先が見つかりません</string>
<string name="new_contact">新しい連絡先</string>
<string name="edit_contact">連絡先を編集</string>
<string name="select_contact">連絡先を選択</string>
<string name="nickname">ニックネーム</string>
<string name="no_groups">グループなし</string>
<string name="no_groups">グループがありません</string>
<string name="create_new_group">新しいグループを作成</string>
<string name="remove_from_group">グループから削除</string>
<string name="no_group_participants">このグループは空です</string>
Expand All @@ -37,10 +37,10 @@
<string name="on_contact_click">連絡先をタップ</string>
<string name="call_contact">連絡先に発信</string>
<string name="view_contact">連絡先の詳細を表示</string>
<string name="manage_shown_contact_fields">連絡先に表示するフィールドを管理</string>
<string name="manage_shown_contact_fields">表示する連絡先の入力欄を管理</string>
<string name="contacts">連絡先</string>
<string name="show_only_contacts_with_numbers">電話番号が登録された連絡先のみ表示する</string>
<string name="merge_duplicate_contacts">重複した連絡先を統合する</string>
<string name="show_only_contacts_with_numbers">電話番号が登録された連絡先のみ表示</string>
<string name="merge_duplicate_contacts">重複した連絡先を統合</string>
<string name="no_favorites">お気に入りの連絡先はまだありません。</string>
<string name="toggle_favorite">お気に入りの切り替え</string>
<string name="search_contacts">連絡先を検索</string>
Expand Down Expand Up @@ -72,6 +72,9 @@
<plurals name="delete_groups">
<item quantity="one">%d件のグループ</item>
<item quantity="other">%d件のグループ</item>
</plurals> <string name="faq_1_title">連絡先に表示される項目(フィールド)を変更することはできますか？</string>
</plurals>
<string name="faq_1_title">連絡先に表示される項目(フィールド)を変更することはできますか？</string>
<string name="faq_1_text">可能です。[設定] -&gt; [連絡先に表示するフィールドを管理] から、表示されるフィールドを選択することができます。これらの中にはデフォルトで無効になっているものもあるので、あなたは新しいものを見つけるかもしれません。</string>
<string name="format_phone_numbers">電話番号の形式</string>
<string name="show_private_contacts">非公開の連絡先をFossify電話、Fossify SMSメッセンジャー、Fossifyカレンダーに表示</string>
</resources>
88 changes: 49 additions & 39 deletions app/src/main/res/values-pt-rPT/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,71 +1,81 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="dialpad">Marcador</string>
<string name="phone_storage_hidden">Armazenamento do telefone (Não visível para outras aplicações)</string>
<string name="no_favorites">Parece que ainda não adicionou qualquer contacto aos favoritos.</string>
<string name="phone_storage_hidden">Armazenamento do telefone (não visível por outras alicações)</string>
<string name="no_favorites">Ainda não adicionou contactos aos favoritos.</string>
<string name="app_launcher_name">Contactos</string>
<string name="address">Endereço</string>
<string name="phone_storage">Armazenamento do telefone</string>
<string name="send_sms_to_contacts">Enviar mensagem a contactos</string>
<string name="send_sms_to_contacts">Enviar SMS aos contactos</string>
<string name="new_contact">Novo contacto</string>
<string name="inserting">A inserir…</string>
<string name="company">Companhia</string>
<string name="send_sms_to_group">Enviar mensagem a grupo(s)</string>
<string name="company">Empresa</string>
<string name="send_sms_to_group">Enviar SMS para o grupo</string>
<string name="updating">A atualizar…</string>
<string name="job_position">Trabalho</string>
<string name="send_email_to_group">Enviar email a grupo</string>
<string name="must_be_at_edit">Necessita de estar no menu Editar para modificar o contacto</string>
<string name="send_email_to_contacts">Enviar email a contactos</string>
<string name="no_contacts_with_emails">Não foram encontrados contactos com email</string>
<string name="job_position">Cargo</string>
<string name="send_email_to_group">Enviar e-mail para o grupo</string>
<string name="must_be_at_edit">Tem que estar no ecrã de edição para alterar um contacto</string>
<string name="send_email_to_contacts">Enviar e-mail aos contactos</string>
<string name="no_contacts_with_emails">Não existem contactos com endereço de e-mail</string>
<string name="edit_contact">Editar contacto</string>
<string name="select_contact">Selecionar contacto</string>
<string name="create_new_group">Criar novo grupo</string>
<string name="no_groups">Sem grupos</string>
<string name="create_new_group">Criar um novo grupo</string>
<string name="no_groups">Não existem grupos</string>
<string name="remove_from_group">Remover do grupo</string>
<string name="nickname">Alcunha</string>
<string name="no_group_participants">Este grupo está vazio</string>
<string name="add_contacts">Adicionar contactos</string>
<string name="no_group_created">Não existem grupos de contactos neste dispositivo</string>
<string name="add_to_group">Adicionar ao grupo</string>
<string name="create_group_under_account">Criar um grupo sob um contacto</string>
<string name="manage_shown_contact_fields">Gerir os campos a mostrar de um contacto</string>
<string name="create_group_under_account">Criar grupo na conta</string>
<string name="manage_shown_contact_fields">Gerir campos a mostrar</string>
<string name="change_photo">Alterar foto</string>
<string name="show_phone_numbers">Mostrar números de telefone</string>
<string name="contacts">Contactos</string>
<string name="create_group">Criar grupo</string>
<string name="create_group">Criar um grupo</string>
<string name="remove_photo">Remover foto</string>
<string name="show_dialpad_button">Mostrar o botão de marcar números no menu inicial</string>
<string name="view_contact">Ver detalhes de contacto</string>
<string name="show_private_contacts">Mostrar contactos privados a Telefone Fossify, Mensagens de SMS Fossify e Calendário Fossify</string>
<string name="call_contact">Ligar a contacto</string>
<string name="show_only_contacts_with_numbers">Mostrar apenas contactos com números de telefone</string>
<string name="search_groups">Procurar grupos</string>
<string name="show_dialpad_button">Mostrar botão Marcador no ecrã principal</string>
<string name="view_contact">Ver detalhes</string>
<string name="show_private_contacts">Partilhar contactos entre Fossify Phone, Fossify SMS Messenger e Fossify Calendar</string>
<string name="call_contact">Ligar</string>
<string name="show_only_contacts_with_numbers">Mostrar apenas contactos com número de telefone</string>
<string name="search_groups">Pesquisar grupos</string>
<string name="export_contacts">Exportar contactos</string>
<string name="search_contacts">Procurar contactos</string>
<string name="search_favorites">Procurar favoritos</string>
<string name="search_contacts">Pesquisar contactos</string>
<string name="search_favorites">Pesquisar favoritos</string>
<string name="import_contacts">Importar contactos</string>
<string name="import_contacts_from_vcf">Importar contactos de um ficheiro .vcf</string>
<string name="import_contacts_from_vcf">Importar contactos de .vcf</string>
<string name="filename_without_vcf">Nome do ficheiro (sem .vcf)</string>
<string name="prefix">Prefixo</string>
<string name="phone_numbers">Números de telefone</string>
<string name="emails">E-mails</string>
<string name="phone_numbers">Número de telefone</string>
<string name="emails">E-mail</string>
<string name="addresses">Endereços</string>
<string name="contact_source">Fonte do contacto</string>
<string name="delete_from_all_sources">O contacto será removido da base de dados dos contactos.</string>
<string name="instant_messaging">Mensagem instantânea (MI)</string>
<string name="ringtone">Toque de telefone</string>
<string name="contact_source">Origem do contacto</string>
<string name="delete_from_all_sources">O contacto será removido de todas as origens.</string>
<string name="instant_messaging">Mensagem instantânea (IM)</string>
<string name="ringtone">Toque de chamada</string>
<plurals name="delete_groups">
<item quantity="one">grupo</item>
<item quantity="many">grupos</item>
<item quantity="other">grupo</item>
<item quantity="one">%d grupo</item>
<item quantity="many">%d grupos</item>
<item quantity="other"></item>
</plurals>
<string name="organization">Organização</string>
<string name="faq_1_title">Desejo mudar os campos a mostrar nos contactos. É possível?</string>
<string name="events">Eventos (aniversários)</string>
<string name="export_contacts_to_vcf">Exportar contactos para um ficheiro .vcf</string>
<string name="faq_1_title">Pretendo alterar os campos a mostrar nos contactos. É possível?</string>
<string name="events">Eventos (data de nascimento, aniversário)</string>
<string name="export_contacts_to_vcf">Exportar contactos para .vcf</string>
<string name="add_number_to_contact">Adicionar número a um contacto</string>
<string name="import_contacts_from_vcf_pro">Importar contactos de um ficheiro .vcf (Pro)</string>
<string name="no_contacts_with_phone_numbers">Não foram encontrados contactos com números de telefone</string>
<string name="websites">Websites</string>
<string name="import_contacts_from_vcf_pro">Importar contactos de .vcf (Pro)</string>
<string name="no_contacts_with_phone_numbers">Não existem contactos com número de telefone</string>
<string name="websites">Site</string>
<string name="groups">Grupos</string>
<string name="fields_empty">Deve preencher, pelo menos, um campo</string>
<string name="show_contact_thumbnails">Mostrar miniatura do contacto</string>
<string name="on_contact_click">Ao tocar no contacto</string>
<string name="merge_duplicate_contacts">Unir contactos duplicados</string>
<string name="toggle_favorite">Alternar favorito</string>
<string name="target_contact_source">Destino da origem do contacto</string>
<string name="include_contact_sources">Incluir origem dos contactos</string>
<string name="suffix">Sufixo</string>
<string name="faq_1_text">Sim, basta aceder a Definições -&gt; Gerir campos a mostrar. Aqui, pode escolher os campos que serão mostrados. Alguns dos campos estão ocultos e, assim, pode mostrar alguns destes.</string>
<string name="format_phone_numbers">Formatar números de telefone</string>
</resources>
3 changes: 2 additions & 1 deletion app/src/main/res/values-pt/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -77,4 +77,5 @@
<string name="faq_1_title">Pretendo alterar os campos a mostrar nos contactos. É possível\?</string>
<string name="faq_1_text">Sim, basta aceder a Definições -&gt; Gerir campos a mostrar. Aqui, pode escolher os campos que serão mostrados. Alguns dos campos estão ocultos e, assim, pode mostrar alguns destes.</string>
<string name="show_private_contacts">Partilhar contactos entre Fossify Phone, Fossify SMS Messenger e Fossify Calendar</string>
</resources>
<string name="format_phone_numbers">Formatar números de telefone</string>
</resources>
2 changes: 1 addition & 1 deletion app/src/main/res/values-ru/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
<string name="include_contact_sources">Включить источники контактов</string>
<string name="filename_without_vcf">Имя файла (без .vcf)</string>
<string name="dialpad">Номеронабиратель</string>
<string name="add_number_to_contact">Добавить номер к контакту</string>
<string name="add_number_to_contact">Добавить номер для контакта</string>
<string name="prefix">Префикс</string>
<string name="suffix">Суффикс</string>
<string name="phone_numbers">Телефонные номера</string>
Expand Down
6 changes: 3 additions & 3 deletions app/src/main/res/values-zh-rCN/strings.xml
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<string name="app_launcher_name">通讯录</string>
<string name="app_launcher_name">联系人</string>
<string name="address">地址</string>
<string name="inserting">添加中…</string>
<string name="updating">正在更新…</string>
Expand Down Expand Up @@ -56,7 +56,7 @@
<string name="include_contact_sources">包含联系人来源</string>
<string name="filename_without_vcf">文件名称 (不含.vcf)</string>
<string name="dialpad">拨号界面</string>
<string name="add_number_to_contact">添加号码至通讯录</string>
<string name="add_number_to_contact">将号码添加到联系人</string>
<string name="prefix">前缀</string>
<string name="suffix">后缀</string>
<string name="phone_numbers">电话号码</string>
Expand All @@ -74,7 +74,7 @@
<item quantity="one">%d 群组</item>
<item quantity="other">%d 群组</item>
</plurals>
<string name="faq_1_title">我想要更改在通讯录会看到哪些字段。我能这么做吗?</string>
<string name="faq_1_title">我想要更改在联系人会看到哪些字段。我能这么做吗?</string>
<string name="faq_1_text">可以，您要做的是到[设置] -&gt; [管理显示的联系人字段]。在那里，您可以选择应该看到什么字段。其中有些甚至默认是关闭的，所以您可能会在那里发现一些新的。</string>
<string name="format_phone_numbers">调整电话号码格式</string>
</resources>
3 changes: 3 additions & 0 deletions app/src/main/res/values-zh-rTW/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,4 +74,7 @@
</plurals>
<string name="faq_1_title">我想要更改在通訊錄會看到哪些欄位。我能這麼做嗎?</string>
<string name="faq_1_text">可以，你要做的是到[設定] -&gt; [管理顯示的聯絡人欄位]。在那裡，你可以選擇應該看到什麼欄位。其中有些甚至預設是關閉的，所以你可能會在那裡發現一些新的。</string>
<string name="show_private_contacts">顯示私人聯絡人給 Fossify 電話、Fossify 簡訊與 Fossify 行事曆</string>
<string name="format_phone_numbers">設定電話號碼格式</string>
<string name="toggle_favorite">切換我的最愛</string>
</resources>
1 change: 1 addition & 0 deletions fastlane/metadata/android/eu-ES/changelogs/2.txt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
* vcf inportatzailea konpondu da
Loading

0 comments on commit b068c6e

Please sign in to comment.