Merge remote-tracking branch 'origin/master' into dev

This commit is contained in:
Tobias Kaminsky 2022-09-21 02:33:01 +02:00
commit d407810c1b
3 changed files with 3 additions and 1 deletions

View file

@ -2,4 +2,5 @@
<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android"> <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
<background android:drawable="@drawable/ic_launcher_background"/> <background android:drawable="@drawable/ic_launcher_background"/>
<foreground android:drawable="@drawable/ic_launcher_foreground"/> <foreground android:drawable="@drawable/ic_launcher_foreground"/>
<monochrome android:drawable="@drawable/ic_launcher_foreground"/>
</adaptive-icon> </adaptive-icon>

View file

@ -385,6 +385,7 @@
<string name="logs_status_loading">Hleð inn…</string> <string name="logs_status_loading">Hleð inn…</string>
<string name="logs_status_not_filtered">Atvikaskráning: %1$d kB, engin sía</string> <string name="logs_status_not_filtered">Atvikaskráning: %1$d kB, engin sía</string>
<string name="logs_title">Aðgerðaskrár</string> <string name="logs_title">Aðgerðaskrár</string>
<string name="maintenance_mode">Þjónn er í viðhaldsham</string>
<string name="manage_space_clear_data">Hreinsa gögn</string> <string name="manage_space_clear_data">Hreinsa gögn</string>
<string name="manage_space_description">Stillingum, gagnagrunni og skilríkjum vefþjóns úr gögnum %1$s verður eytt endanlega. \n\nSóttar skrár verða ekki snertar.\n\nÞetta ferli getur tekið drjúga stund.</string> <string name="manage_space_description">Stillingum, gagnagrunni og skilríkjum vefþjóns úr gögnum %1$s verður eytt endanlega. \n\nSóttar skrár verða ekki snertar.\n\nÞetta ferli getur tekið drjúga stund.</string>
<string name="manage_space_title">Sýsla með geymslurými</string> <string name="manage_space_title">Sýsla með geymslurými</string>

View file

@ -687,7 +687,7 @@
<string name="store_short_dev_desc">A plataforma de produtividade auto alojada que o mantém em controle (versão \"preview dev\")</string> <string name="store_short_dev_desc">A plataforma de produtividade auto alojada que o mantém em controle (versão \"preview dev\")</string>
<string name="stream">Transmita com…</string> <string name="stream">Transmita com…</string>
<string name="stream_not_possible_headline">Transmissão interna não é possível</string> <string name="stream_not_possible_headline">Transmissão interna não é possível</string>
<string name="stream_not_possible_message">Por favor, como opção, transfira media ou utilize uma aplicação externa.</string> <string name="stream_not_possible_message">Em vez disso, por favor, transfira mediateca ou utilize uma aplicação externa.</string>
<string name="subject_shared_with_you">\"%1$s\" foi partilhado consigo</string> <string name="subject_shared_with_you">\"%1$s\" foi partilhado consigo</string>
<string name="subject_user_shared_with_you">%1$s partilhou \"%2$s\" consigo</string> <string name="subject_user_shared_with_you">%1$s partilhou \"%2$s\" consigo</string>
<string name="suggest">Sugerir </string> <string name="suggest">Sugerir </string>