Group strings and remove unused resources

Closes #342
parent b17fbcb1
......@@ -277,7 +277,7 @@
<activity
android:name=".android.SettingsActivity"
android:label="@string/settings_title"
android:label="@string/settings_button"
android:parentActivityName=".android.NavDrawerActivity">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
......
<?xml version="1.0" encoding="utf-8"?>
<!--
A FAB does not work, because even with fabSize="mini" it will be too big due to shadow drawing
on lower API levels
-->
<ripple
xmlns:android="http://schemas.android.com/apk/res/android"
android:color="@color/briar_primary_dark">
<item>
<shape android:shape="oval">
<solid android:color="@color/briar_primary"/>
</shape>
</item>
</ripple>
\ No newline at end of file
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M1,21h22L12,2 1,21zM13,18h-2v-2h2v2zM13,14h-2v-4h2v4z"/>
</vector>
<vector android:alpha="0.56" android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
</vector>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FF000000"
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
</vector>
......@@ -38,7 +38,6 @@
android:paddingTop="@dimen/margin_activity_vertical">
<TextView
android:id="@+id/yourNicknameView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -62,7 +61,6 @@
android:padding="@dimen/margin_large">
<ImageView
android:id="@+id/explanationView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
......@@ -70,7 +68,6 @@
android:src="@drawable/qr_code_explanation"/>
<TextView
android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -34,7 +34,6 @@
android:orientation="vertical">
<TextView
android:id="@+id/yourNicknameView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -51,7 +50,6 @@
android:visibility="gone"/>
<TextView
android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -11,7 +11,6 @@
<!-- The second child is the menu -->
<include
android:id="@+id/navigation_menu_drawer"
layout="@layout/navigation_menu"
android:layout_width="wrap_content"
android:layout_height="match_parent"
......
......@@ -7,7 +7,6 @@
android:padding="@dimen/margin_activity_horizontal">
<TextView
android:id="@+id/headlineView"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
style="@style/BriarTextTitle"
......
<?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout
android:id="@+id/coordinatorLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
......
......@@ -16,7 +16,6 @@
android:paddingTop="@dimen/margin_activity_vertical">
<TextView
android:id="@+id/yourNicknameView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -52,7 +51,6 @@
android:padding="@dimen/margin_large">
<ImageView
android:id="@+id/explanationView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:adjustViewBounds="true"
......@@ -60,7 +58,6 @@
android:src="@drawable/qr_code_explanation"/>
<TextView
android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -17,7 +17,6 @@
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/layoutContact1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toLeftOf="@+id/introductionIcon"
......@@ -56,7 +55,6 @@
tools:ignore="ContentDescription"/>
<LinearLayout
android:id="@+id/layoutContact2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_toEndOf="@+id/introductionIcon"
......
......@@ -16,7 +16,6 @@
android:paddingTop="@dimen/margin_activity_vertical">
<TextView
android:id="@+id/yourNicknameView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -42,7 +41,6 @@
android:src="@drawable/bluetooth"/>
<TextView
android:id="@+id/faceToFaceView"
style="@style/BriarTextBody"
android:layout_width="match_parent"
android:layout_height="wrap_content"
......
......@@ -49,7 +49,6 @@
</FrameLayout>
<LinearLayout
android:id="@+id/textViews"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
......
......@@ -11,7 +11,6 @@
layout="@layout/list_item_msg_in"/>
<RelativeLayout
android:id="@+id/introductionLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|start"
......@@ -50,7 +49,7 @@
android:layout_alignEnd="@+id/introductionText"
android:layout_alignRight="@+id/introductionText"
android:layout_below="@+id/introductionText"
android:text="@string/dialog_button_accept"/>
android:text="@string/accept"/>
<Button
android:id="@+id/declineButton"
......@@ -61,7 +60,7 @@
android:layout_below="@+id/introductionText"
android:layout_toLeftOf="@+id/acceptButton"
android:layout_toStartOf="@+id/acceptButton"
android:text="@string/dialog_button_decline"/>
android:text="@string/decline"/>
</RelativeLayout>
......
......@@ -67,7 +67,7 @@
android:layout_alignParentRight="true"
android:layout_below="@+id/forumSubscribedView"
android:layout_marginTop="-8dp"
android:text="@string/dialog_button_accept"/>
android:text="@string/accept"/>
<Button
android:id="@+id/declineButton"
......@@ -78,7 +78,7 @@
android:layout_marginTop="-8dp"
android:layout_toLeftOf="@+id/acceptButton"
android:layout_toStartOf="@+id/acceptButton"
android:text="@string/dialog_button_decline"/>
android:text="@string/decline"/>
<View
style="@style/Divider.ForumList"
......
......@@ -11,7 +11,6 @@
layout="@layout/list_item_msg_out"/>
<RelativeLayout
android:id="@+id/introductionLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end"
......
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
android:id="@+id/noticeLayout"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="wrap_content"
......
......@@ -7,7 +7,6 @@
android:orientation="vertical">
<RelativeLayout
android:id="@+id/noticeLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right|end"
......
......@@ -27,7 +27,7 @@
android:layout_alignParentTop="true"
android:layout_marginEnd="@dimen/listitem_horizontal_margin"
android:layout_marginRight="@dimen/listitem_horizontal_margin"
android:contentDescription="@string/delete_button"
android:contentDescription="@string/delete"
android:src="@drawable/action_delete_black"/>
<TextView
......
......@@ -11,7 +11,6 @@
layout="@layout/list_item_msg_in"/>
<RelativeLayout
android:id="@+id/introductionLayout"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="left|start"
......
......@@ -7,7 +7,6 @@
tools:showIn="@layout/navigation_menu">
<ImageView
android:id="@+id/imageView2"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_gravity="top|center_horizontal"
......
<?xml version="1.0" encoding="utf-8"?>
<menu
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/action_publish_blog_post"
android:title="@string/blogs_publish_blog_post"
android:icon="@drawable/social_send_now_white"
app:showAsAction="always"/>
</menu>
\ No newline at end of file
......@@ -10,18 +10,13 @@
<string name="name_too_long">Name ist zu lang</string>
<string name="password_too_weak">Passwort ist zu schwach</string>
<string name="create_account_button">Konto anlegen</string>
<string name="password_hint">Passwort</string>
<string name="forgotten_password">Ich habe mein Passwort vergessen</string>
<string name="sign_in_button">Anmelden</string>
<string name="startup_failed_notification_title">Briar konnte nicht gestartet werden</string>
<string name="startup_failed_activity_title">Fehler beim Starten von Briar</string>
<string name="contact_list_button">Kontakte</string>
<string name="delete_contact">Kontakt löschen</string>
<string name="contact_deleted_toast">Kontakt gelöscht</string>
<string name="forums_button">Foren</string>
<string name="settings_button">Einstellungen</string>
<string name="sign_out_button">Abmelden</string>
<string name="contact_list_title">Kontakte</string>
<string name="no_contacts">Keine Kontakte</string>
<string name="add_contact_title">Kontakt hinzufügen</string>
<string name="continue_button">Weiter</string>
......@@ -31,34 +26,27 @@
<string name="codes_do_not_match">Codes stimmen nicht überein</string>
<string name="contact_added_toast">Kontakt hinzugefügt: %s</string>
<string name="contact_already_exists">Kontakt %s existiert bereits</string>
<string name="scan_qr_code">QR-Code scannen</string>
<string name="qr_code_invalid">Der QR-Code ist ungültig</string>
<string name="no_private_messages">Keine Nachrichten</string>
<string name="message_sent_toast">Nachricht wurde versendet</string>
<string name="show_forums">Anzeigen</string>
<string name="show">Anzeigen</string>
<string name="forum_leave">Forum verlassen</string>
<string name="forum_left_toast">Forum wurde verlassen</string>
<string name="create_forum_title">Neues Forum</string>
<string name="forum_created_toast">Forum wurde erstellt</string>
<string name="forum_share_button">Forum teilen</string>
<string name="forum_compose_post">Neuer Forenbeitrag</string>
<string name="from">Von:</string>
<string name="anonymous">Anonym</string>
<string name="new_identity_item">Neue Identität\u2026</string>
<string name="new_identity_title">Neue Identität</string>
<string name="create_identity_button">Identität erstellen</string>
<string name="identity_created_toast">Identität wurde erstellt</string>
<string name="forum_post_hint">Forenbeitrag eingeben</string>
<string name="forum_declined_toast">Foreneinladung abgelehnt</string>
<string name="shared_by_format">Geteilt durch %s</string>
<string name="forum_shared_by">Geteilt durch</string>
<string name="forum_shared_with">Geteilt mit</string>
<string name="nobody">Niemand</string>
<string name="add_button">Hinzufügen</string>
<string name="cancel_button">Abbrechen</string>
<string name="done_button">Fertig</string>
<string name="delete_button">Löschen</string>
<string name="post_sent_toast">Forenbeitrag wurde versendet</string>
<string name="cancel">Abbrechen</string>
<string name="delete">Löschen</string>
<plurals name="private_message_notification_text">
<item quantity="one">Neue private Nachricht.</item>
<item quantity="other">%d neue private Nachrichten</item>
......@@ -68,7 +56,7 @@
<item quantity="other">%d neue Forenbeiträge</item>
</plurals>
<!--Settings-->
<string name="settings_title">Einstellungen</string>
<string name="settings_button">Einstellungen</string>
<string name="network_settings_title">Netzwerke</string>
<string name="bluetooth_setting">Mit Bluetooth verbinden</string>
<string name="bluetooth_setting_enabled">Sobald Kontakte in der Nähe sind</string>
......@@ -115,16 +103,14 @@
<string name="dialog_title_delete_contact">Löschen des Kontakts bestätigen</string>
<string name="dialog_title_welcome">Willkommen bei Briar</string>
<string name="dialog_title_leave_forum">Verlassen des Forums bestätigen</string>
<string name="dialog_button_ok">OK</string>
<string name="ok">OK</string>
<string name="dialog_button_leave">Verlassen</string>
<string name="dialog_button_accept">Annehmen</string>
<string name="dialog_button_decline">Ablehnen</string>
<string name="accept">Annehmen</string>
<string name="decline">Ablehnen</string>
<!--Toolbar headers-->
<string name="dashboard_toolbar_header">Briar</string>
<string name="settings_toolbar_header">Einstellungen</string>
<string name="contacts_toolbar_header">Kontakte</string>
<string name="forums_toolbar_header">Foren</string>
<string name="contact_list_button">Kontakte</string>
<string name="forums_button">Foren</string>
<!--Progress titles-->
<string name="progress_title_please_wait">Bitte warten...</string>
<string name="progress_title_please_wait">Bitte warten</string>
<!--Blogs-->
</resources>
......@@ -18,9 +18,7 @@
<string name="delete_contact">Padam kenalan</string>
<string name="contact_deleted_toast">Kenalan telah dipadam</string>
<string name="forums_button">Forum</string>
<string name="settings_button">Tetapan</string>
<string name="sign_out_button">Daftar Keluar</string>
<string name="contact_list_title">Kenalan</string>
<string name="no_contacts">Tiada kenalan</string>
<string name="add_contact_title">Tambah kenalan</string>
<string name="continue_button">Teruskan</string>
......@@ -38,24 +36,19 @@
<string name="interfering">Ini menunjukkan bahawa seseorang sedang mengganggu sambungan anda</string>
<string name="contact_added_toast">Kenalan telah ditambah: %s</string>
<string name="no_private_messages">Tiada mesej</string>
<string name="private_message_hint">Taip mesej</string>
<string name="message_sent_toast">Mesej telah dihantar</string>
<string name="create_forum_title">Cipta forum baru</string>
<string name="choose_forum_name">Pilih nama untuk forum anda:</string>
<string name="forum_created_toast">Forum telah dicipta</string>
<string name="from">Daripada:</string>
<string name="anonymous">Tidak dikenali</string>
<string name="new_identity_item">Identiti baru\u2026</string>
<string name="new_identity_title">Identiti baru</string>
<string name="identity_created_toast">Identiti telah dicipta</string>
<string name="add_button">Tambah</string>
<string name="cancel_button">Batal</string>
<string name="done_button">Selesai</string>
<string name="cancel">Batal</string>
<plurals name="private_message_notification_text">
<item quantity="other">%d mesej peribadi baru.</item>
</plurals>
<!--Settings-->
<string name="settings_title">Tetapan</string>
<string name="settings_button">Tetapan</string>
<string name="bluetooth_setting_disabled">Hanya ketika menambah kenalan</string>
<string name="notify_private_messages_setting">Papar notifikasi untuk mesej peribadi</string>
<string name="notify_vibration_setting">Getar</string>
......
......@@ -22,7 +22,6 @@
<string name="passwords_do_not_match">As senhas não conferem</string>
<string name="create_account_button">Criar conta</string>
<string name="enter_password">Insira sua senha:</string>
<string name="password_hint">senha</string>
<string name="forgotten_password">Esqueci minha senha</string>
<string name="try_again">Senha Incorreta, tente novamente</string>
<string name="sign_in_button">Entrar</string>
......@@ -32,14 +31,10 @@
<string name="startup_failed_db_error">Por alguma razão, seus dados do Briar estão corrompidos e não podem ser reparados. Sua conta, seus dados e todas suas conexões com contatos estão perdidas. Infelizmente você terá que resintalar o Briar e criar uma nova conta.</string>
<string name="startup_failed_service_error">O Briar não pode iniciar devido a um plugin. Reinstalar o Briar geralmente resolve esse problema. Porém, note que ao fazer isso você perderá sua conta e todos os dados associados a ela, já que o Briar não usa um servidor central para armazenar seus dados.</string>
<string name="expiry_warning">Esse programa expirou.\nPor favor instale uma versão mais recente.</string>
<string name="contact_list_button">Contatos</string>
<string name="delete_contact">Apagar contato</string>
<string name="contact_deleted_toast">Contato apagado</string>
<string name="forums_button">Fóruns</string>
<string name="settings_button">Configurações</string>
<string name="sign_out_button">Sair</string>
<string name="now">agora</string>
<string name="contact_list_title">Contatos</string>
<string name="add_contact_title">Adicionar um contato</string>
<string name="your_nickname">Escolha a identidade que você quer usar:</string>
<string name="face_to_face">Você deve estar frente-a-frente com a pessoal que deseja adicionar como contato. Isso evita que alguém se passe por você ou leia suas mensagens no futuro.</string>
......@@ -61,29 +56,21 @@
<string name="contact_added_toast">Contato adicionado: %s</string>
<string name="contact_already_exists">Contato %s já existe</string>
<string name="contact_exchange_failed">Troca de contatos falhou</string>
<string name="scan_qr_code">Escanear QR code</string>
<string name="qr_code_invalid">O QR code é inválido</string>
<string name="connecting_to_device">Conectando a device\u2026</string>
<string name="authenticating_with_device">Autenticando com o dispositivo\u2026</string>
<string name="connection_aborted_local">Conexão interrompida por nós! Isso pode disgnificar que alguém está tentando interferir na sua conexão</string>
<string name="connection_aborted_remote">Conexão interrompida pelo seu contato! Isto pode significar que algúem está tentando interferir em sua conexão</string>
<string name="date_no_private_messages">Sem Mensagens</string>
<string name="private_message_hint">Escrever mensagem</string>
<string name="message_sent_toast">Mensagem enviada</string>
<plurals name="forums_shared">
<item quantity="one">%d fórum compartilhado por contatos</item>
<item quantity="other">%d fóruns compartilhados por contatos</item>
</plurals>
<string name="show">Mostrar</string>
<string name="show_forums">Mostrar</string>
<string name="forum_leave">Sair do fórum</string>
<string name="forum_left_toast">Saiu do fórum</string>
<string name="sharing_status">Status de compartilhamento</string>
<string name="no_posts">Sem Posts</string>
<plurals name="unread_posts">
<item quantity="one">%d post não lido</item>
<item quantity="other">%d posts não lidos</item>
</plurals>
<plurals name="posts">
<item quantity="one">%d Post</item>
<item quantity="other">%d Posts</item>
......@@ -100,13 +87,11 @@
<string name="forum_invitation_sent">Você compartilhou o fórum \"%1$s\" com %2$s.</string>
<string name="forum_show_invitations">Mostrar os convites de Forum</string>
<string name="forum_compose_post">Nova postagem em fórum</string>
<string name="from">De:</string>
<string name="anonymous">Anônimo</string>
<string name="new_identity_item">Nova identidade\u2026</string>
<string name="new_identity_title">Nova identidade</string>
<string name="create_identity_button">Criar identidade</string>
<string name="identity_created_toast">Identidade criada</string>
<string name="forum_post_hint">Digite sua postagem para o fórum</string>
<string name="forum_invitations_title">Convites para Foruns</string>
<string name="forum_joined_toast">Você entrou no fórum</string>
<string name="forum_declined_toast">Convite do fórum recusado</string>
......@@ -114,11 +99,8 @@
<string name="forum_shared_by">Compartilhado por</string>
<string name="forum_shared_with">Compartilhado com</string>
<string name="nobody">Ninguém</string>
<string name="add_button">Adicionar</string>
<string name="cancel_button">Cancelar</string>
<string name="done_button">Pronto</string>
<string name="delete_button">Apagar</string>
<string name="post_sent_toast">Postagem do fórum enviada</string>
<string name="cancel">Cancelar</string>
<string name="delete">Apagar</string>
<plurals name="private_message_notification_text">
<item quantity="one">Nova mensagem privada.</item>
<item quantity="other">%d novas mensagens privadas.</item>
......@@ -128,7 +110,7 @@
<item quantity="other">%d novas postagens em fóruns.</item>
</plurals>
<!--Settings-->
<string name="settings_title">Configurações</string>
<string name="settings_button">Configurações</string>
<string name="network_settings_title">Redes</string>
<string name="bluetooth_setting">Conectar via Bluetooth</string>
<string name="bluetooth_setting_enabled">Sempre que estiver perto de contatos</string>
......@@ -170,7 +152,6 @@
<string name="password_changed">Senha alterada com sucesso.</string>
<string name="feedback_settings_title">Feedback</string>
<string name="send_feedback">Enviar feedback</string>
<string name="step">Passo %1$d/%2$d</string>
<string name="online">Online</string>
<string name="offline">Offline</string>
<string name="send">Enviar</string>
......@@ -221,18 +202,16 @@
<string name="dialog_welcome_message">Adicione um contato para começar uma comunicação segura ou pressione o ícone na parte superior direita da tela para mais opções.</string>
<string name="dialog_title_leave_forum">Confirmar saída do fórum</string>
<string name="dialog_message_leave_forum">Você tem certeza que deseja sair deste fórum? Seus contatos com quem você o compartilhou podem deixar de receber notificações dele.</string>
<string name="dialog_button_ok">OK</string>
<string name="ok">OK</string>
<string name="dialog_button_leave">Sair</string>
<string name="dialog_button_introduce">Apresentar</string>
<string name="dialog_button_accept">Aceitar</string>
<string name="dialog_button_decline">Negar</string>
<string name="accept">Aceitar</string>
<string name="decline">Negar</string>
<!--Toolbar headers-->
<string name="dashboard_toolbar_header">Briar</string>
<string name="settings_toolbar_header">Configurações</string>
<string name="contacts_toolbar_header">Contatos</string>
<string name="forums_toolbar_header">Fóruns</string>
<string name="contact_list_button">Contatos</string>
<string name="forums_button">Fóruns</string>
<!--Progress titles-->
<string name="progress_title_logout">Desconectando do Briar...</string>
<string name="progress_title_logout">Desconectando do Briar</string>
<string name="progress_title_please_wait">Por favor, aguarde</string>
<!--Blogs-->
<string name="blogs_button">Micro Blogs</string>
......@@ -244,13 +223,12 @@
<string name="blogs_my_blogs_create_hint_desc">Uma pequena descrição do seu novo Blog</string>
<string name="blogs_my_blogs_create_hint_desc_explanation">Leitores Potenciais podem se inscrever ou não no seu Blog baseado no conteúdo da descrição. </string>
<string name="blogs_my_blogs_empty_state">Você não tem nenhum Blog.
Por que não cria um clicando no simbolo mais no topo direito da tela? </string>
Por que não cria um clicando no símbolo mais no topo direito da tela? </string>
<string name="blogs_my_blogs_created">Blog Criado</string>
<string name="blogs_blog_is_empty">Esse blog está vazio</string>
<string name="blogs_other_blog_empty_state">Esse Blog atualmente está vazio.
Ou o autor não não postou nada ainda, ou a pessoa que compartilhou esse Blog contigo precisa estar online, assim os Posts serão sincronizados.</string>