From 72906acaeec94ee7b40d4f4819d85d5c422a30db Mon Sep 17 00:00:00 2001
From: Torsten Grote <t@grobox.de>
Date: Tue, 9 Aug 2016 15:06:11 -0300
Subject: [PATCH] Group strings and remove unused resources
Closes #342
---
briar-android/AndroidManifest.xml | 2 +-
.../res/drawable-hdpi/content_attachment.png | Bin 1502 -> 0 bytes
.../drawable-hdpi/device_access_accounts.png | Bin 1759 -> 0 bytes
.../res/drawable-hdpi/msg_in_unread.9.png | Bin 1560 -> 0 bytes
.../drawable-hdpi/navigation_next_item.png | Bin 1470 -> 0 bytes
.../navigation_previous_item.png | Bin 1494 -> 0 bytes
.../res/drawable-hdpi/navigation_refresh.png | Bin 3171 -> 0 bytes
.../res/drawable-mdpi/content_attachment.png | Bin 1318 -> 0 bytes
.../drawable-mdpi/device_access_accounts.png | Bin 1479 -> 0 bytes
.../res/drawable-mdpi/msg_in_unread.9.png | Bin 1014 -> 0 bytes
.../drawable-mdpi/navigation_next_item.png | Bin 1253 -> 0 bytes
.../navigation_previous_item.png | Bin 1275 -> 0 bytes
.../res/drawable-mdpi/navigation_refresh.png | Bin 3058 -> 0 bytes
.../res/drawable-v21/round_button.xml | 16 -
.../res/drawable-xhdpi/content_attachment.png | Bin 1717 -> 0 bytes
.../res/drawable-xhdpi/msg_in_unread.9.png | Bin 2374 -> 0 bytes
.../drawable-xhdpi/navigation_next_item.png | Bin 1721 -> 0 bytes
.../navigation_previous_item.png | Bin 1725 -> 0 bytes
.../res/drawable-xhdpi/navigation_refresh.png | Bin 3272 -> 0 bytes
.../res/drawable-xxhdpi/msg_in_unread.9.png | Bin 3680 -> 0 bytes
.../res/drawable/ic_warning_black_24dp.xml | 9 -
.../res/drawable/social_send_now.xml | 5 -
briar-android/res/drawable/social_share.xml | 9 -
.../layout-land/fragment_keyagreement_id.xml | 3 -
.../invitation_bluetooth_start.xml | 2 -
.../res/layout/activity_nav_drawer.xml | 1 -
.../res/layout/activity_startup_failure.xml | 1 -
.../res/layout/fragment_forum_list.xml | 1 -
.../res/layout/fragment_keyagreement_id.xml | 3 -
.../res/layout/introduction_message.xml | 2 -
.../res/layout/invitation_bluetooth_start.xml | 2 -
.../res/layout/list_item_contact.xml | 1 -
.../res/layout/list_item_introduction_in.xml | 5 +-
.../res/layout/list_item_invitations.xml | 4 +-
.../res/layout/list_item_msg_notice_out.xml | 1 -
.../res/layout/list_item_notice_in.xml | 1 -
.../res/layout/list_item_notice_out.xml | 1 -
.../res/layout/list_item_rss_feed.xml | 2 +-
.../list_item_shareable_invitation_in.xml | 1 -
.../res/layout/navigation_header.xml | 1 -
.../menu/blogs_write_blog_post_actions.xml | 12 -
briar-android/res/values-de/strings.xml | 34 +-
briar-android/res/values-ms/strings.xml | 11 +-
briar-android/res/values-pt-rBR/strings.xml | 44 +-
briar-android/res/values/color.xml | 10 -
briar-android/res/values/dimens.xml | 2 -
briar-android/res/values/strings.xml | 385 +++++++++---------
.../android/BriarFragmentActivity.java | 6 +-
.../android/PasswordActivity.java | 4 +-
.../android/blogs/BlogFragment.java | 2 +-
.../android/blogs/RssFeedImportActivity.java | 2 +-
.../android/forum/ForumListFragment.java | 2 +-
52 files changed, 230 insertions(+), 357 deletions(-)
delete mode 100644 briar-android/res/drawable-hdpi/content_attachment.png
delete mode 100644 briar-android/res/drawable-hdpi/device_access_accounts.png
delete mode 100644 briar-android/res/drawable-hdpi/msg_in_unread.9.png
delete mode 100644 briar-android/res/drawable-hdpi/navigation_next_item.png
delete mode 100644 briar-android/res/drawable-hdpi/navigation_previous_item.png
delete mode 100644 briar-android/res/drawable-hdpi/navigation_refresh.png
delete mode 100644 briar-android/res/drawable-mdpi/content_attachment.png
delete mode 100644 briar-android/res/drawable-mdpi/device_access_accounts.png
delete mode 100644 briar-android/res/drawable-mdpi/msg_in_unread.9.png
delete mode 100644 briar-android/res/drawable-mdpi/navigation_next_item.png
delete mode 100644 briar-android/res/drawable-mdpi/navigation_previous_item.png
delete mode 100644 briar-android/res/drawable-mdpi/navigation_refresh.png
delete mode 100644 briar-android/res/drawable-v21/round_button.xml
delete mode 100644 briar-android/res/drawable-xhdpi/content_attachment.png
delete mode 100644 briar-android/res/drawable-xhdpi/msg_in_unread.9.png
delete mode 100644 briar-android/res/drawable-xhdpi/navigation_next_item.png
delete mode 100644 briar-android/res/drawable-xhdpi/navigation_previous_item.png
delete mode 100644 briar-android/res/drawable-xhdpi/navigation_refresh.png
delete mode 100644 briar-android/res/drawable-xxhdpi/msg_in_unread.9.png
delete mode 100644 briar-android/res/drawable/ic_warning_black_24dp.xml
delete mode 100644 briar-android/res/drawable/social_send_now.xml
delete mode 100644 briar-android/res/drawable/social_share.xml
delete mode 100644 briar-android/res/menu/blogs_write_blog_post_actions.xml
diff --git a/briar-android/AndroidManifest.xml b/briar-android/AndroidManifest.xml
index df2a916d3d..4393823e90 100644
--- a/briar-android/AndroidManifest.xml
+++ b/briar-android/AndroidManifest.xml
@@ -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"
diff --git a/briar-android/res/drawable-hdpi/content_attachment.png b/briar-android/res/drawable-hdpi/content_attachment.png
deleted file mode 100644
index 53b963d54106ff032f364ac815f513ab91e9bd23..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1502
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip(#+J-%-Ge`$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O$kUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnrq&
zG!Lpb1-DyVaO%|uIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zZklm1hJk@8z|+Ms
zq~g|_nfJYe6D5wDn@33qp7c5r8OY`-?&=$|=Y^KOSZs>;-6y`{u{Y!|_traf1if*~
z-=(q3bFWNC*Oac8IUAI;lcwaYo4b#{hJQ~_aarHHErvC6KMc0*eZJ@X_u9I-8#kmz
zE)3hYEuecgR{*1y1M3O~(FIH)4M5J>%^6?WPo`}8wOBeqAcjrdQMt~c<)GaShW7`y
z{dHBFyi)hThB5;-wga42a+wbvo~q+4klw@ezSgxtjM-mRVF3@<1LhxRzV~j}T(XbZ
zhRy!qrg+BhywA-Kn*6xZA~HQ#p8f6v#vdGBaZHaM@crN}N@#jDSE^yj^~!*i#`ja#
zTe{uaqT|t={y=C4pV(fO80O_KuSknOKPuN4!ceMsUHssrW`>QS8@Q_uu-Y^2ir8}h
zVAttooNg<RnA~2ydFu46E7usUCmn76x~5S={6FLV*t}bZr)inbpY%@5;kf3mn(HUG
zOf%j8hvUb=Jv~<>N^;%arM>QP(Cyw>;cv(lUB~jK;G<-L;2P^S8|O~romcRH#rCSU
z&K+%=HKp5%{23ql%oD#~DmWqex<{eY_kYVdLMja64|u!X33izHINEQU{2k`?ve%YM
zwkjqEv453F-0xMmzVQE_M757LJ5DB=oyz<nR%3e2<N6H7&1=N96`n7y;WcLZ-Ci}r
zcuw`fM=zO`MU;2`KdX3VT4B*wi}+`m;(dQivS#pXc>X|9B2BwnI#)kqGy5&404Aq7
z%#(dqMnBN9IR3gx?4jv}Ifs}1=SM^$Bt{EzSpNtoFf6ujpE0+)JOWhWdb;|#taD0e
F0st!fBvt?b
diff --git a/briar-android/res/drawable-hdpi/device_access_accounts.png b/briar-android/res/drawable-hdpi/device_access_accounts.png
deleted file mode 100644
index 3daaa49670dce9d86d71b25327586a78c325f1f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1759
zcmaJ?c~sMO9PcV9)+wSD1;NFXS9u&w(o#z+6@gH!P@ttsJ)yLrR%}z#AQg2SD#{q5
zB02%ZfucTvF?4tgHbCW22lK>v)@xp<IH$sM%%v!7f9R5z{C>ah`+Pp%GcVcEkzpel
zt_&KDHc~nhRZuHzdmM&R?^t^8dTMbYLseu9o=B#s35*t`#S<_<YEbJi1*X=nSk{IG
z&}c(E^hy<}l0}F#xPha#VK^3piDJ`e0f82iT9bs4Kmw-I8^z%BAAbe`y;cmy@@25h
z6oM_*&rBt-nAAw6CN)VT)PjN2fdGq$5-?z-8n76a8qFe$80^;-QG1&i0)c)AnIs0^
z2c?ol10gtp0elYZtAVE?z*IjD;s*=;ggyWlMqmixLa@LWfkk|Q2u6Sp7f5*{w22}G
zD*51xI*Gx>Bxw>sP)bS)Cxyqs2_1w8g+d7CLR_vdh43}6Fp_GEuhGmJP(U%WhR~Zx
zJ#GYSis}SBnG}Omr0-KOm<DBy<_~3}3I<u!CJ5ocwv+~dGTHw_4TeFqnN(o^#`{rW
zvvP$AgA|w<PbM@};}TgmS0+&ifvHKHP~!N~fhtBX#!1|~7&ieSF?<dJ$kZCW(Prsq
z$Ydg^(M+n18cd3cK}v(8*K0*wo)8sE_<sCg7)6j!MCgYIL;Zq7f+T!I;1`Sxa8X>7
zY`~1<09V`3mH0~pT>npUZNp$NQJztZ&@acd5&|~>{Yi`TpN@t5NxctT?MGwj&x7|#
zE<^<b*;@ObRu7n{`LS&W2bVewjy`6j=AEDhn{X>Bp}rTn6b({Zu67lkNg69>HtYU?
zrFVy1%q*QVPaYI|N)?yGFkYX{91nVC9)021o%Zl_!9;uc_5CBx<v#N`I;Ipow{F%C
z;8&_sC&Q#XY4h_2fypJmEh1IN&T#A5+~&u7v&uZ_P5a(*!?k8$e$xcgM8*V$s(kO&
zojy#)jjC%7&5aXO!-(B<=LWYPhcBNjuT^^Wj<u=}HUw2WE~U9_O7xi6K+mzdTj+~U
zj>#BRJKk+r(W8oA@9q1hts@|9+VIoXsXfj|(lzlzudHf%dUi*2A!;W>eyPe3EF1UY
z^OCxJP+A_D)snRyaGJ*8WM=!@F?;^pK4U}$Ep5-P2445}2Xzru3rDtpp9O|bcImRq
zbAJ%GX1>+C1E)V|oFi!oUrSb&S&d33{~5!cL=<=(t@4Ln@93?6$SUNU94hjH(+{`y
z`ADWH&by`^?ycO=V=bH9T7S7FWF03y6LdW-yl{8AwB)YT>)AsB@})Ol!HO??_SWy@
zRbQ)>SKrsvu`h7lYt!YU61<}#MQ!%g>!RQwxlU!R?Qm$V(Rg%mw(40`?MCzPvphrd
zqq=e3-{zX0G7HlgFK?0JxjA>1zg)@M{gVCNfwk@#_Kq#{zLr3VHSY7(oejkuHz!@(
zQ*|?Ja{R8<ftBZ0<Zt#4LmXRE_wBFnO3s~qsov|=tj)1jVe1mt@FlvD{+CYVD5L00
z?_(ZiYM&x-)S5%bQPNxSND|u!<$_wdpfY@I35O+I>9Xq1lZ5lSMt0fg+ec)xo)p<T
zs;t8MxjsQ#NOsHfal3dYm`?YCe`6mTGHH!Ce#-bnAr@PDdhe_7Zs%fcd*{`P0;N-e
zV8Ow-r}T@*EocqX+BITsmGm*21-ozCaNk*;`&U=@o1r_oO=Fx+T`pynwr<c@W^Z-M
zJ;sv9f@*KOji{1-9V}-)xEMK3g>I$0In^9`5iLw{?NV%en1Q0c4Rgn?UdE>%>TKE=
zl75XSz8ymn2i9zOYh4-0@FdPB5d!TNxnjgy2i@P^eV*0>gip~Tdj`B<q1P9k0i#dW
z{hoapaM*ug$}K#jkG=bB;ilDP1rbF7d58M0u2bfZBJ=EvV$ZYB$g<wW1!TQj0yC-m
e%Im1~&uDF{9(Vq9BW$Mamm>|0M5}`1Gyefwm84Yw
diff --git a/briar-android/res/drawable-hdpi/msg_in_unread.9.png b/briar-android/res/drawable-hdpi/msg_in_unread.9.png
deleted file mode 100644
index c22cc86322f710ab37c0f56c192f9721271f58d9..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1560
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
KMNUMnLSTaApWM#?
diff --git a/briar-android/res/drawable-hdpi/navigation_next_item.png b/briar-android/res/drawable-hdpi/navigation_next_item.png
deleted file mode 100644
index e6495b29cfe3acc6455414dd7edfd68926ba72c3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1470
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVgX7`*1@#-^rD1}=t%u7;K-hL)}-PR@>Q
zriSJwPKGeOF8Rr&xv6<2Fuf@Vy=FM|f)Yb+0nlcb)S}F?)D*X({9FaFr>!z^yTur%
zc~HG6xZPrcQ?EYIG5VmWMT%;e5HS6KnDB%P<iL}DY927X7XcIY7OqL}7#NrgJY5_^
zDsH`*c~;vcP~zBo(`H4Nur4KSRnN_npD0WJ)Z%WbS(5TNf8)eS{Yq0>*Z1;HdgJDK
z%By2iD~F-PvCr3vU#F>?o||3#di##x;^%hH_dK^eUwy3i_~X83+9w0+A{oOPL=#y5
zycPX(cKYFm8|oFL4sh=H@v>NH;)(g^9E@Ht?p?s2lBKmU$$;zC0pa(*HN9FHB;VS6
zU{smB$0N0oPnU`BpoRN=>8~0q*nOj7UWlA25@VXvX?}rAYwL{{j1h|%Dxay_zh_g8
z`qrqsfitLqJ4r#5r?Ey?`lithcEx-9n`638TvTxIN|%#qHo3n@Z_(a16PM0(16I9A
zC%(5^=VUv%itS<*e(-Ph-mpe9-9*2%gjuf@UTnUe7O+^gSFVxuUtjwAP4Ok0mV_L6
z8N1<BP?4s>3D?*aOXVY&Z}0o6kUEvs&0%J4hET!QhA6$H_3af20ygHgY^x;S+<WQ5
zc&umU{e3k`EFQJx7i;Z)Rx2e;47`&euEoHtGhIT~qv@X24Z~Xb2@K{un<B0FiZ94T
z7}l!$u{Y0Y46mDZY|>0~Tkf4aIZJs8?wy!lc+t&Q{K7diqgR`~Im;$LIQON_p)XA8
z<=4V@hU;s7YG1bA#3i@%NKM(x4bS|2-goXjyoRB9R{HeSIr_bQLPDKSBMdJ;w@@_u
zAuV;TRqmka{KuE{l;1GQ@G?CK$nH^|cks95{bx&+dQY7`*C?%b<G9PQ%<KRBb66ul
gk@#UfYYnFX!!DzWI|=TQp`a4g)78&qol`;+0KK3TSO5S3
diff --git a/briar-android/res/drawable-hdpi/navigation_previous_item.png b/briar-android/res/drawable-hdpi/navigation_previous_item.png
deleted file mode 100644
index 23778ae9b73517818c0c37b0e268a328385c3836..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1494
zcmeAS@N?(olHy`uVBq!ia0vp^1|ZDA1|-9oezpTC$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVit$imIc#mvmq$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1POzUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZnv1=
zG!Lpb1-DyFaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z4q6#p&%nUs;pyTS
zQgQ3e%-!BGfda?Q?~N=C4-uKDprItDw1VZ1pNolD=A*>|HKKL`N9;XVJ_dGhiP>E`
z(%?0rq`QM7EJ>khs)pK+xb^oRY%kbwnfqSx3CSO#yEnY4D}Q$8XWBLHCWo6c`!?Ck
zVNgH7S-`ZYH)00A`s9<_Yt}GbX^?*qc+X>L&_#|4=O@jM0laoitOfFsY;ls22^=Af
z^$(0S7_}dqU}LlmDt$0({n8q*nWB%4KZtH=l-8B5Kj<=J`Tw}s6@n#A)(Yo7GJ7=N
z++hFDmc?Vc<OQ!|%NtZTWdE`aU~_Zit6-2j!FK=PvX|nKg7q~Uuc<wLARb}%SFLYz
zY*<#i86)3;nrEMkA{(y!QC}PD#rc=<@`F<)`d3(I#ceswZNPcX$Gli~L2UMP!)yO}
zj1#s<Po4BKwf_7T@A+}*_e-o}4?0UPX6RqKnX67Jce!Bc0(p@QB}S$DS+C_tWb9ed
zzGy@IK7Z%3lj`d$3Zfm`b(NpyOKoQVHK#%8$N|&aM#AqKUAaEo>};_M$UhyhpZ8kk
z4VyHVQ&|#IZf}}8;bTF2okp=7*FlNixuV%qE2o7tt<Rs?C^#Xzxj|a)RkE&d(wnTz
zFEy80J?1oPO6}0`ozXM>t{KM!i-jH0_kJ+uzt)dgDWUK1XhOPE=3CRVqTbECOd`im
zgs$DYtTLWw)pOP9ADLA4U3~EJtto%c<t}M`he9)tjeD!k99mfwSKykqJYM*F&iYLo
zCp>-Ewkc=l>K|L4U+Ml@rD6a6pL!V+I97kGXSLxpVCY;{u~l?#z&}t)>*?y}vd$@?
F2>>ggAu0d>
diff --git a/briar-android/res/drawable-hdpi/navigation_refresh.png b/briar-android/res/drawable-hdpi/navigation_refresh.png
deleted file mode 100644
index 479aca465fb358e754f9f6a28c8e903d5f72f726..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3171
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
diff --git a/briar-android/res/drawable-mdpi/content_attachment.png b/briar-android/res/drawable-mdpi/content_attachment.png
deleted file mode 100644
index 38ff9f853ce781299b92b471da4cb9d587100a66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1318
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVip(#+J-%*4pl$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19ytk==R#nRCXr(RHE$SnZc?2=lPS(cjOR+OKs0QR(1
zCT_PF;4}}aHwCL(!2U4AsaGH97=2LGB1JV!2$+6AOnAZta^OinH4m8Hi+~B6BSroX
z0|Vm>PZ!6Kid%1{oz->;6glv`cfI3g1y{|V5huEi>P*=>RVlm7>)Ido8@D4*AG_qX
zM#n{Py_(6U0GFR$X+2Iom37<Ct$tl9o!>L7wfa?faen^0-*=18@3cMsd5?#svXo|V
z1fzBW>l%lp|CJ|ty!d?f0{_~8SD`N*`1%sh$Dc2~`<|(BdcU*&m4A&5^0lA#<tDSK
zNF_?$N?_-E7^-qlQQ!KP=9SN)0lJT^Bw92pnv^Fy*!DQE>l~~~xab$D;p2AYv~j`G
zvn$V@IcQ*Wpfq5C_oX^6=|<M}1fEq+Tt^b*pKaZ#qmsyQ%a@5)V0zL=rrm+{yBbA*
zaNLZQJX{mgXP9r*WU{BDc0<?VAntUf2Q5=FE*-O7byI=$xmqK)#l)=8qdzo0TWWe-
zmE<-m>w3fBU$%bJCa!X|#x-;HzWVPOF~w3ed(y%@+gioNZhapmw>{VtAiYXQ=P=8e
zLwa|za%X6LV*1t69ALgsZ1$vofh+$-a9-cDYPRGKeK!TAx09xA%lUb9=5NUW*56?t
n6n}^2u&!wk{qdbCo{5Jcry!0&X=_|DsO0i=^>bP0l+XkK9d6U<
diff --git a/briar-android/res/drawable-mdpi/device_access_accounts.png b/briar-android/res/drawable-mdpi/device_access_accounts.png
deleted file mode 100644
index 84296f8e7ccbbd0221051e465ed832fa0100acb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1479
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVit*v-Pt+{nq)$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1PFwUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dZns$C
zG!Lpb1-Dxqaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1zemP70ECU0RrKgKy
zNX4x;)6Z(VB#InMujxHGVHroO(4?Rgv&r@ct{-#yX?){{bwp%zmqyo(2#r)j&rdTa
z^z=JUVmn+DbAILXYp=`Bo|#*HJZH|Yr8~dxdOovw-uK$`J4}6xMUA>*So@l|H3IEf
zm>4&w|5?Cn(x@fCnpnUiSL`Xp)p~|?hKuwI_O}a~&Z{4=-oYUK;KW8Qi6n_02L6s_
zmC3suEnl$3Ch+Poo%Q7R_+-d6<w^X4DJN9}xsGUfx%62@HiqpBiIZdGe&DFX)b^w2
zUv6;DaRJ-Hgm4E_iGWjf?B6QhOI>MF_!08YJvo)_;KHk6644ht4<9`__u;?0`ni+S
zqaEhP@|#?K>lwDtf2aEO>P(kp5A8h*?&Wc7O<gLM9+~}uv9MNo{p{8)2h+nHLL#%O
z^qc?8@tGXcZ@!!9P)VsJYX;llrP)u}cWi&nc=PHx$4I{TCp>p<h<;$X7MZ8bKJ{4f
zq4!7pDwx7vzRGbuva?BTP1g_IgF+FBnYL=@civRH>O6mEhlW@1rAmXNcXb_;tA3ih
z?r+fy=${cPIJ56@?WF^;=Z=RKoqtlNmYr6#xFhq!n<FkI++_!+oe}nV_vp0hNm1?O
zokD&+DXTc-ql3=WDlX<&p5_#L#LWLZhil53mdVa5J7z4LAe$<=Ty*04l@V$y!llB#
z9<g}wlbdmNg3y_wr8_kjO>K|9cG}?j1@>7I#VVDyiF4FH{XOiWw!(WIpT6erZmt&}
tnWja4V^M#7S-$$$|NhHP+&{z;7=rgtS+{?6*=A7D>gnp|vd$@?2>>A^AR7Px
diff --git a/briar-android/res/drawable-mdpi/msg_in_unread.9.png b/briar-android/res/drawable-mdpi/msg_in_unread.9.png
deleted file mode 100644
index 6e5418856d9fb9ed59be30ccbb013e277ed6345e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1014
zcmV<S0}1?zP)<h;3K|Lk000e1NJLTq001HY001Tk1^@s7*3o%F00009a7bBm000XU
z000XU0RWnu7ytkRs7XXYR9HvVSWRmaK^UHiUuha*#fx4<kXCTpdMF`C5k>HeErtF7
zZ^5w?3cV;r6hypuuqc$WMS3WRhTeoA(o#r@htiXW2vr3A0V-`%+*X_QeYd;o?#|3+
zHcbQvmLxOpJoC&m@5gKi5i|;YR=cLt>gb?_<LPIwX#zfJ_2S8={t4Jgh9)P+xXyV^
zuZgg|K5AKjJw0tNfX&9@aJUZ3G&kH%BuWq`-9136=Z-%h+3bD)443%dzK{X8xVvQ$
zcaI^$$~L#(KQP4DKGe_Gw?i~tDvT$Ftq$%A8^>vR`5vcM05g|+=oy@?6otn268)4W
z-WkS@bh{ZsPRQumuuGc$MQ7}Eq+lgY{}^c?8pM+htBFdYqHe2tE`U9*VE7%jjbm-_
z1VDU~f5Z2m?={_$84!>r+KU}D-p`~*96i9D6rNr<>gr(!wo|>*^@NNL1|qZ`0FDQQ
z9RfEo2|4w~FofqQ0^~HolmOoH$q5P-61I)dd+X+x5WF;A#u?N6IVDUB$L=zAMwzZ-
z=!J54;%?##d8^~G2jDa5iXWPYlT7f|Uz?Sp*kk)D#X}{-fP;!|7Z^*HWx|5<9H|F@
z<F1`hSQzw2sT9w(i_T^$bY$Cs@Ks{suE8+@QPcB=@l}xo@39B~r{WbYRUnT^cK29g
z0|a6x1;4C?g;~|r{dOJ`NaI@rb8{mA^dc@$Kv)2(0?;jMaq(3gAntS!=vtw0XHOu`
zWML7M0k_U$VMSFYww){h*GRcsh|&ebe+dD&hBnfqbQzov#t)*601T7THss<hOiF>0
z5$8mjX-g>;XGj0#z`r0?SkN%Jl+QD(v-1YYWV&f0fvH%jS+$x;*4Ha^b#?aq%*=Dh
zIQFFiCrd9DB4p6`@Z!Y82a-x1lU^?)C;{mt>FDSqxm;hlr)T`q*ceu=A5tfgVF8gg
z3M7=aU&jb>5YIJ3Z<Urt0ahbIL{aka?Dv^w>~OCbN<M;43Wlk-`TY1^7nIG9B;pb%
zjf^}Zy}hHYA|Z{Me@VdatlUQ76(m_29)8?v75obeb3BxEQ=gi;eVwtcMk;b6M<~6E
zV<Co{>u0R$Hldi6JuaEZ`in0I9-%_v=2gae<1V0TuN1z{+sa0NrTASHIIdk&ZX|IR
z71{rvM1ZwPR#xVkp#b98cuo^ujAZu_xN#-632BG9N8y1#VC>sh+y)S29iDG6c@zE5
kyP-j6oC+LwVHJD&2RE55#s2gDG5`Po07*qoM6N<$f>(dd*Z=?k
diff --git a/briar-android/res/drawable-mdpi/navigation_next_item.png b/briar-android/res/drawable-mdpi/navigation_next_item.png
deleted file mode 100644
index 88029a82d4f2d675e97b4f6b56643a5bd5a7e594..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1253
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVit$imIc#njc*$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yq1O$kUQlAlEdbi=l3J8mmYU*Ll%J~r_Ow+dR<{@!
znwuM&<1`PdHwCL(z<Mok>eUB2MjsTlNKp+F0;V4j6P|E^9C*@C%>$<QB4EP4sMy8B
zz`z*p>EaktaqG?Wy<W_YBCX}7Qaxph5+pm8^c)rPwyr;5m1O0+@ce`B6|J{4qqzU=
zY22kSE$~RxMLn02-q+>@IXXv_b_VYdx0}%#`RvV^xyA3>GH0>bE!O`aGn3&xQ&Ig~
z3D=9?|9I|bJ(vIavBkSzd`}kgNgF(V%%Qb`;r#}l;A>2J4_Vm0#4&eW^W5>iFI>qj
zf!9r!wdR1{9cK>V4Sdeiu5VzS{efqGKwIdG?Oz(zZ?u`I81R~AEAMKy?Y(<;M!RLU
zdI@KxMzhxz?$B&)yY}R#4y$T3{;y6l;qG3=yKr6RWv_<S0p6e3)BW6wd?w2lgciC!
zcC={SJa6h_c|$#EJ&m7wU%ocBHYDDBKV#l(tM7fS4Rcl{cyikv65I1_k8;qJsTG}K
zrDcDTN_kgjc?gLvl&#qCrBT{cMei~HgIilPRqtJy5VKPAtyjy<^^s}^wm0ZAvN5dM
W;kqa#Z_PhY!Q<)b=d#Wzp$Pza_Ot^4
diff --git a/briar-android/res/drawable-mdpi/navigation_previous_item.png b/briar-android/res/drawable-mdpi/navigation_previous_item.png
deleted file mode 100644
index 8d19e3911e0d6d2098ad89121f3815b7fe50dc50..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1275
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz$r9IylHmNblJdl&R0hYC{G?O`
z&)mfH)S%SFl*+=BsWuD@%qp275hW46K32*3xq68pHF_1f1wh>l3^w)^1&PVosU-?Y
zsp*+{wo31J?^jaDOtDo8H}y5}EpSfF$n>ZxN)4{^3rViZPPR-@vbR&PsjvbXkegbP
zs8ErclUHn2VXFi-*9yo63F|8<fR&VF+bTgE72zA8;GAESs$i;Tpqp%9W~g9hqGxDg
zU}<8hqhMrUXrOOsq;FuZYiM9)YHnp<r~m~@K--E^(yW49+@N*=dA3R!B_#z``ugSN
z<$C4Ddih1^`i7R4mih)p`bI{&Koz>hm3bwJ6}oxF$}kgLQj3#|G7CyF^YauyCMG83
zmzLNn0bL65LT&-v*t}wBFaZNhzap_f-%!s0<RzFwUtj!6b93RUi%Wu15$?rmaB)aw
zL8^XGYH@yPQ8F;%(v(3~6<9eJr6!i-7lq{K=fFZSAS1sdzc?emK*2fKRL@YsH!(Rg
z4<rKC;p=PVnO9trn3tUD>0+w{G(#^lGsVit*wDz-$k5Hy$-u?X(ACh=#L&{!#L3yw
z&D7A`#K{n**Cju>G&eP`1g19yuGh!_r(RHE$SnZc?2=lPS(cjOR+OKs0QR(1CN{Si
zS-6?Gm|5U752`l>r&|nNaq86vIz}H9wMbD769T3m5EGtofgE_!Pt60S_ab1z-tv0q
z0R{%fTu&FrkcwMxrtjBhNfc-+w`_UQ;iCCyipcEXSARUNsF!Gb(Es5cut52WkiC`a
zPM0auyERmu+&fCo8K2a?cysUVGp5!jC!bZ@z4^WQ{WCS26Bl3PxRsfxryxEd#6iUM
zzwISX*A)lDmj-!0*{*!}sLx?B9cTYb(>DnjaC(2>{A}=0GlAvWlhxek9;m%M-702p
z$ME{XdYKKq_CAjnOy&4;h>a)O=&<dZXr?NT4OiD4vZy(1oO3uk%KdDfqvSG$HvSu}
z%hO~`g&QMh1Rt9%yW$%&KcnheyRa{PQ!5(V8y0>0YtHWXaMM*OKV^k0rk4*Z_cp9L
zb*AM?B4e5jE6b|_^;Z>P@4L(VD!B}HHx$3P_Lr-tl8Zy6HQRNO|J#Za!49!M1E%&n
z-ncUJfzp9DvSkkfry8y@(yib$s1B5_3oh<5nXm)MZm^a0+Q>F((s!2<ZueC@(jM>j
uuua-uwzOu&(wUr}{x`)q+-Cj5VZb09nXrY!F)$od9C^C>xvX<aXaWGX8NM3;
diff --git a/briar-android/res/drawable-mdpi/navigation_refresh.png b/briar-android/res/drawable-mdpi/navigation_refresh.png
deleted file mode 100644
index 63e70e1786450eff17a947367038076c98ccc497..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3058
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
diff --git a/briar-android/res/drawable-v21/round_button.xml b/briar-android/res/drawable-v21/round_button.xml
deleted file mode 100644
index 788768ef6e..0000000000
--- a/briar-android/res/drawable-v21/round_button.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?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
diff --git a/briar-android/res/drawable-xhdpi/content_attachment.png b/briar-android/res/drawable-xhdpi/content_attachment.png
deleted file mode 100644
index 1cffb3fbf2f1149821435933ea6a236ff2663ed5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1717
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=GrJ1RvnX#j(lYxt&p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaLa!4}y`aR9TL84#CABECEH%ZgC_h&L>}jh^+-|YJ
zX&zK>3U0Sp;?%1Tbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3b%`?qzFEGETd%8G=
zRNQ(q!#i6zP@>H^xo2ya$Hgk=Jy*E07IFu(WM5gky*0t{&W<as+=Y+N7Y1&WKG@1F
z-c_-1m%)~b+dBfKrv^D*c8gA)EP0>*UZdmeGnSc;C103-xWMLD^vvdS>^Vt&p2KH~
z_SuLoU<zsA3SiW7U|qq0g>&Nh=iX!MnSVRV-<Y;(>yHQ472I(RpYAhv9erdUe=5pH
zq1%q}Tf<b9-0->IEgABf%hj&=tlRuRYyLiVCckOR{%|JOS06MD@c0!J#Bw63{eY$c
ze_b<Q0OR}vJg!TW<~oYMU^I1m!TO;$^Wvn2#}8Ci6g7!H5UgPG5}CAYb@M}g{#@RO
zv;Xaz<hL>HIw;w;+kdt4gTk)vU-}<J{;*7!n7jLcqurJZAr1bMr4Py+ziS$?r{!+o
zvxH^7rcTc)*pAKWkxW*XSi%x{+9LRx$APGVhDv>-eGR|azCKZ6t;ps39Msg{;nbM9
zt69@9`4+3ofv{V`k6oK<-Y@^CwOFlS4&UX3Y1txXH?A;n{*`f#IOZeabK`vHqFEnT
z1wM>y648+CiFR#D6U@BC_B<kH(l_C|I#Vpg7D@Mg=d67bReJCLl(TLbT4J9fn|Xt;
zC@sD}r)1BMxoccQ@BL@LZD!%kX&W=)O0&7I8jnSt{!vkhWvShFp9RGf$?rax`Ht~b
zjm7z!QoXDpJF0ITXFd7yh2!KyVw+ycJ^LTzyw2j5>a!g$q^yrwyq<V9QsKdLtv@>K
z3zRv9_p>ZsU_4DMlHG-W<z(vvg3Fpp1#8ZKEARQ;SbXNKo4Ssn-I)%_2m9{0%C7hv
zp~L^=oYV27+20vwA1K{0Z~p$K*$+w&`R1hG|0~b5Ct~(z4TpE1H=q2?Fj-vb)59X2
z)Mq=-$~<+s%&oI!+OcM*)%q?^qPHKY+-BAP^??BE6j{0Y*F7grhSeYW(tE*KudHMF
z>J=+;(z;7j6;^$jS;l?B;Jx~dS8O+5)!gfN@8PiFMsxVJqCHQ3+g@vk%d6S;L9?Y#
sX~C`)@)xf^!j&K)Nwwi=$zQ<)2K8#|<Q1=rB|sI4r>mdKI;Vst0E}vobpQYW
diff --git a/briar-android/res/drawable-xhdpi/msg_in_unread.9.png b/briar-android/res/drawable-xhdpi/msg_in_unread.9.png
deleted file mode 100644
index 341ec4f7226f0362bf1cd5d5f354f06f5666845a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 2374
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
diff --git a/briar-android/res/drawable-xhdpi/navigation_next_item.png b/briar-android/res/drawable-xhdpi/navigation_next_item.png
deleted file mode 100644
index c36e050a396805e66faad8c6488b75ab2e32fbf1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1721
zcmaJ?c~BEq9NvK8EU450q%AH%ER-C(2@sPZ2qa*lBvObHY+(q=0uhr9n<WRe2y$pg
z1V%+|NmbN(p%zCx2?ebO3SzyewIZmk=zs)7DNa?oLBRe|x-+}K_uhQp_dDP0H}R5%
zZZ1A9006j&gn|UZM%rE{2jY8Bm2;mkv+)=io``1P204ZRQA#u&0Yz$gCX#^2m8P7_
zNH_r4&s9lfxJ(?!RiJ9R+=ihW)mnlL0O1RaTDc+{!NGJSQ>EcitPM>RP^IKil0wCh
zSj$JURKh$ANz9W-6?xeTj*_w<0t`2D2>~^N%R!@hrAEg!@+f1vTw-lIW>CN}2%gQO
zybDSujtBWDhJc}Th^BzTU@$C%4u?RT5Dpb&LNLUDnGA?cgCTAxn+w6<_(LJQVag0{
zf*^L>7qR0}vT$6>WiSi|1Kq%)qgW;b=5RO+h{<3wX#|3%Gih+Sk*3l4PbdfwodQ#7
zaTTfoZHn@AG#BSlh)Cb1pw>>xYINgeA_~SZ%C!ub4%t$g0E)%`4^^ut(K<W<c^~h8
z3hSgMEy74ZbZ9Q7AR3q9Z*!&P@-ak?qnH#$S58zhJ`2TBT^6bZ`H7))7!=DDDvj-A
zj3E|tMH(G0*C-H?fJY%T=qi<x%OuLnX0zbXXh;CVF)$|t=EQ_V^P^%zVRlF~Ji!&9
zid;3K!6&%N_gv<bT-z|HwS;E@f~oX~G8RMC;8@aJ)s(R?W2e*`=PIX;1)7q}AcA4o
zTKlh7PaF~RV_QxRF0q*$eMCddJ4Ot433hW8abJQ(f+(r+ZeMlhdbb?!ORJB4rQh0^
zcDSRJEUFExc6Bsu5N>vL4puf+jkdV0NNQPx)d=_8j-CH7dTw->DY@@V-636jx%FoL
zzP<Z6hRk-!wO72C2h@^h+q*LJhb(Pv4s!1^dF2jCJrBr6Qfh%$x6MSpi9K?+3EFY3
zm+x9wU(LTg@}?x(?{_=tv@}}a(#4UF4UyEnMfPc|Z9v!A$VR7a<nkgq<n9yn$jhin
zX`WX%lWN~&ilY~L{=#>*(vk`*x@mzdN5SW1&&u?zb`b^nkkfa!GBFMn*cVy*GNPMe
zysX?GKqasBnD(s)<j`Jdu)IB9?3PyXQZn#qzz0Q-?+jLY=nD>aeDT09)m=edo8!DO
zu;Hvv@3DegZ-ZZR=rwIt?F@YRoYFn6773|vBlMwpn(ok&B6c$m5{oKVL0)D+-Em3&
zbmsPX($dv^zS9#clS$Z#zniOzOWu-dn^Sw)g4kr=Cg~H;A42-;sgVy^PY_dEz~+Uj
zjUCCJ;Gm1SXV<1HyX#w9X|9#VHs6}4rKKJ{>wMkgGswbw4u);hUpRG=%Gdn1g*?B1
z%|d6kYHkp{rnqVgIZpHk^F_+AF7UI1k7#|f_oTnBJ7a&MNd4ui*Hu;X%5NN?Mg-d}
z8|quK|3c55*~6!2?FfoH4m^ER0S#?cT>2<T(C=@lyX)ANnSml#D=0e)vbzg!OX@c4
zwpv_7R{AMbuID=6N}+nRHeyq|)%ny4lTTj;pLL|1tqVI<30^EKNJ(?`@;;a{Smpmb
zi`EoRBex8l>uejYxia$HGC&<!*85BrObTxP>CXPz*3JO-tMKc|v%uYl?)6mHc+RP6
z$ajxw-&LUB(%@e8!Y=i%ld|XL7!vmLkhjcSIfx7vt<;;Bl5RZIAKmfm`qfv%PG;qN
zoO=GK{_7IfsIxg|6Py42g-^gAFXS@MKE19l{!=qQnC*9ChIWqG;hOQHeSiIvLSe@J
z>5Ev7W%1{LfR?V)eazuf*>Vo(BFb;HbS$P9S)KOMnqkLq>1i-==E$f|?a+Xo1z<G0
gj+veLkD35`;QILk1H!Hx$o4Z4#YhB4qSMy=1E(*SR{#J2
diff --git a/briar-android/res/drawable-xhdpi/navigation_previous_item.png b/briar-android/res/drawable-xhdpi/navigation_previous_item.png
deleted file mode 100644
index cf0b485f68107c7880f6340db12ecf16b4fb31fd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 1725
zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=k|nMYCBgY=CFO}lsSJ)O`AMk?
zp1FzXsX?iUDV2pMQ*9U+m{l@EB1$5BeXNr6bM+EIYV;~{3xK*A7;Nk-3KEmEQ%e+*
zQqwc@Y?a>c-mj#PnPRIHZt82`Ti~3Uk?B!Ylp0*+7m{3+ootz+WN)WnQ(*-(AUCxn
zQK2F?C$HG5!d3}vt`(3C64qBz04piUwpD^SD#ABF!8yMuRl!uxKsVXI%uvD1M9<K~
zz|zE0N5ROz&_LhNNZ-I**U-Sq)ZEIzPyq^*fVLH-q*(>IxIyg#@@$ndN=gc>^!3Zj
z%k|2Q_413-^$jg8E%gnI^o@*kfhu&1EAvVcD|GXUm0>2hq!uR^WfqiV=I1GZOiWD5
zFD<cE0=g99h1>$Tv3bSNU;+l1ennz|zM-B0$V)JVzP|XC=H|jx7ncO3BHWAB;Np<V
zf>iyW)Z+ZoqGVvir744~DzI`cN=+=uFAB-e&w+(vKt_H^esM;Afr4|esh**NZ(?$0
z9!LbN!`Ii!Gq1QLF)umQ)5TT^Xog;9W{Q=Ok%gO?i<yzBlYxt&p{t>#iJ_&diIcOV
zo2j9>iIX8ruS<S%X>Mv>2~2MaLa#ASy`aR9TL84#CABECEH%ZgC_h&L>}jh^+-@<z
zX&zK>3U0R;;?%1Tbc{YIYLTKECIn1BASOKF0y*%cpPC0u??u3by)V>cIWWKId%8G=
zRNQ(q`+c@=q0I69>FYNBKB8kU@6+KV*Ap8Yr6TmSQ6<G_;S~E5!q<E<q9?I;xy%Z9
zrq?w|t?SA0B%8$Y+k21yzI?Cf*SEWyf8VwJJ?H)MIRAHRtIvNgJ@@_d<2lufE&6<?
zEk2iG)6}4#z`?-;rcUHNS@pNE)oEdr{8b*M4~jpNHb(etZ_sj+?tib`k$zS*VCfCU
zZ^hlu9QA)po+@*JsjrDkBk-8z1_N%Uutq-vexFa5#5recB<@aQ^nD<5{)@|_QqPvu
z57+!UW)(HO`MmkeAJx};t3F74$-K){?8qMRJfeoVf>SR$uZ6Fv?D!*9{yofh6MR-T
z#3tyA%STWD%khHAe#^E)(FX<9c076Xyy5->t=S4wHy@BH=(!)iO-%nHe_V!a+q4Gb
zgvPBuI+*gB7}s7-P`2Qm7Uk(LW-o8UuzgG4;Y|k~C)i4qr~FZj-)g7J#Mh|Xx6thf
zPqUo6W{7fvym#Emi!8N?JAX%Z=hz4{ZQFQr<LTJGr|*P*#H@~b6MevK+s<`G;+v1w
z#-8>&v%Dd#ZyT>n?qtdReOv1`T&vxo&lvR1ujy#t#jtOGZ41nKlUMW?Rv5p3w5Bwr
z=I6fUHosSL$cH<mq+NVlCeLnl<c!@JHg(C#GEIEhVhSJU3c2lg{@?Y?oDI@%F6ta8
znDRDJ?nI=J)*h}~CfpM$j_%wyNurdun(3sdx`p%#QH75zcNR39IK^H$?ex=GtR8pR
zzRP+BemZE>ccK@_jbT53LsBid$JTkd^8_u%O&7G^{C&Oldx}?%Y4CTBt6T;$m8oC;
zX3c#&qp57x%JxNBtR6MY;s^Ct8y#80$9}_WwWxyP`Jd~2gXMUuTg1*X@w6|pbFb9d
zY*SXSBux9j29tY<b{<|5&oy+PZuH#Da9Hi-#KkOLsS&=Mm1mjMZs_eV^q63o#Js&Z
ziczSj_zTky6W{GO&dDV%4P$Iuym`v;z~dacok8=|*Im$Yc(nKD{|1%gM>N8Z6c@<Z
zT+wrIn#cA1(~Xpm%rSpf^y_=Se$SG6vAd$?uUfPHlqnKV#6J95zfR*%w$5Wg78XWF
i2LS;vRrYv212co3@M6Vd{))n&3dPga&t;ucLK6ToijgY-
diff --git a/briar-android/res/drawable-xhdpi/navigation_refresh.png b/briar-android/res/drawable-xhdpi/navigation_refresh.png
deleted file mode 100644
index e6212cf679dbd3518a837159cf54d28948a2261e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3272
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
diff --git a/briar-android/res/drawable-xxhdpi/msg_in_unread.9.png b/briar-android/res/drawable-xxhdpi/msg_in_unread.9.png
deleted file mode 100644
index 3a3bb3e7e65841e35b46dbd4c4fc2a7584bf2761..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3680
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
diff --git a/briar-android/res/drawable/ic_warning_black_24dp.xml b/briar-android/res/drawable/ic_warning_black_24dp.xml
deleted file mode 100644
index b3a9e036b4..0000000000
--- a/briar-android/res/drawable/ic_warning_black_24dp.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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>
diff --git a/briar-android/res/drawable/social_send_now.xml b/briar-android/res/drawable/social_send_now.xml
deleted file mode 100644
index 941911ed32..0000000000
--- a/briar-android/res/drawable/social_send_now.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<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>
diff --git a/briar-android/res/drawable/social_share.xml b/briar-android/res/drawable/social_share.xml
deleted file mode 100644
index e3fe874d61..0000000000
--- a/briar-android/res/drawable/social_share.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<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>
diff --git a/briar-android/res/layout-land/fragment_keyagreement_id.xml b/briar-android/res/layout-land/fragment_keyagreement_id.xml
index 492c778925..7234c7cef4 100644
--- a/briar-android/res/layout-land/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout-land/fragment_keyagreement_id.xml
@@ -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"
diff --git a/briar-android/res/layout-land/invitation_bluetooth_start.xml b/briar-android/res/layout-land/invitation_bluetooth_start.xml
index 84d0945e61..3eead4f7ae 100644
--- a/briar-android/res/layout-land/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout-land/invitation_bluetooth_start.xml
@@ -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"
diff --git a/briar-android/res/layout/activity_nav_drawer.xml b/briar-android/res/layout/activity_nav_drawer.xml
index 7eb1d4e35d..ad4465680b 100644
--- a/briar-android/res/layout/activity_nav_drawer.xml
+++ b/briar-android/res/layout/activity_nav_drawer.xml
@@ -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"
diff --git a/briar-android/res/layout/activity_startup_failure.xml b/briar-android/res/layout/activity_startup_failure.xml
index 42fa8047c8..5b31a755fd 100644
--- a/briar-android/res/layout/activity_startup_failure.xml
+++ b/briar-android/res/layout/activity_startup_failure.xml
@@ -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"
diff --git a/briar-android/res/layout/fragment_forum_list.xml b/briar-android/res/layout/fragment_forum_list.xml
index 31d90c085f..bb4e4ae761 100644
--- a/briar-android/res/layout/fragment_forum_list.xml
+++ b/briar-android/res/layout/fragment_forum_list.xml
@@ -1,6 +1,5 @@
<?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"
diff --git a/briar-android/res/layout/fragment_keyagreement_id.xml b/briar-android/res/layout/fragment_keyagreement_id.xml
index 643109dd04..31daffdd4f 100644
--- a/briar-android/res/layout/fragment_keyagreement_id.xml
+++ b/briar-android/res/layout/fragment_keyagreement_id.xml
@@ -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"
diff --git a/briar-android/res/layout/introduction_message.xml b/briar-android/res/layout/introduction_message.xml
index cf7e5a27e4..3982cbcd37 100644
--- a/briar-android/res/layout/introduction_message.xml
+++ b/briar-android/res/layout/introduction_message.xml
@@ -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"
diff --git a/briar-android/res/layout/invitation_bluetooth_start.xml b/briar-android/res/layout/invitation_bluetooth_start.xml
index 84490caa53..af184c6411 100644
--- a/briar-android/res/layout/invitation_bluetooth_start.xml
+++ b/briar-android/res/layout/invitation_bluetooth_start.xml
@@ -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"
diff --git a/briar-android/res/layout/list_item_contact.xml b/briar-android/res/layout/list_item_contact.xml
index 9fefd9750e..9b00f76430 100644
--- a/briar-android/res/layout/list_item_contact.xml
+++ b/briar-android/res/layout/list_item_contact.xml
@@ -49,7 +49,6 @@
</FrameLayout>
<LinearLayout
- android:id="@+id/textViews"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
diff --git a/briar-android/res/layout/list_item_introduction_in.xml b/briar-android/res/layout/list_item_introduction_in.xml
index d4b46a2f9f..8d197e6eb8 100644
--- a/briar-android/res/layout/list_item_introduction_in.xml
+++ b/briar-android/res/layout/list_item_introduction_in.xml
@@ -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>
diff --git a/briar-android/res/layout/list_item_invitations.xml b/briar-android/res/layout/list_item_invitations.xml
index 823fff7824..536c8080d1 100644
--- a/briar-android/res/layout/list_item_invitations.xml
+++ b/briar-android/res/layout/list_item_invitations.xml
@@ -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"
diff --git a/briar-android/res/layout/list_item_msg_notice_out.xml b/briar-android/res/layout/list_item_msg_notice_out.xml
index 9784a13911..79e006af3e 100644
--- a/briar-android/res/layout/list_item_msg_notice_out.xml
+++ b/briar-android/res/layout/list_item_msg_notice_out.xml
@@ -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"
diff --git a/briar-android/res/layout/list_item_notice_in.xml b/briar-android/res/layout/list_item_notice_in.xml
index ea63d0a3f9..c7caebd52b 100644
--- a/briar-android/res/layout/list_item_notice_in.xml
+++ b/briar-android/res/layout/list_item_notice_in.xml
@@ -1,6 +1,5 @@
<?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"
diff --git a/briar-android/res/layout/list_item_notice_out.xml b/briar-android/res/layout/list_item_notice_out.xml
index 9b873d56f2..4575f48fee 100644
--- a/briar-android/res/layout/list_item_notice_out.xml
+++ b/briar-android/res/layout/list_item_notice_out.xml
@@ -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"
diff --git a/briar-android/res/layout/list_item_rss_feed.xml b/briar-android/res/layout/list_item_rss_feed.xml
index ffac010d03..809ce84477 100644
--- a/briar-android/res/layout/list_item_rss_feed.xml
+++ b/briar-android/res/layout/list_item_rss_feed.xml
@@ -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
diff --git a/briar-android/res/layout/list_item_shareable_invitation_in.xml b/briar-android/res/layout/list_item_shareable_invitation_in.xml
index 2903e4646b..63c628f730 100644
--- a/briar-android/res/layout/list_item_shareable_invitation_in.xml
+++ b/briar-android/res/layout/list_item_shareable_invitation_in.xml
@@ -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"
diff --git a/briar-android/res/layout/navigation_header.xml b/briar-android/res/layout/navigation_header.xml
index 7f6b9a89b3..cc7f80ca83 100644
--- a/briar-android/res/layout/navigation_header.xml
+++ b/briar-android/res/layout/navigation_header.xml
@@ -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"
diff --git a/briar-android/res/menu/blogs_write_blog_post_actions.xml b/briar-android/res/menu/blogs_write_blog_post_actions.xml
deleted file mode 100644
index 11befe0369..0000000000
--- a/briar-android/res/menu/blogs_write_blog_post_actions.xml
+++ /dev/null
@@ -1,12 +0,0 @@
-<?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
diff --git a/briar-android/res/values-de/strings.xml b/briar-android/res/values-de/strings.xml
index 1dd58f1f01..ae519cb338 100644
--- a/briar-android/res/values-de/strings.xml
+++ b/briar-android/res/values-de/strings.xml
@@ -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>
diff --git a/briar-android/res/values-ms/strings.xml b/briar-android/res/values-ms/strings.xml
index 5675ebc92e..da341bab4f 100644
--- a/briar-android/res/values-ms/strings.xml
+++ b/briar-android/res/values-ms/strings.xml
@@ -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>
diff --git a/briar-android/res/values-pt-rBR/strings.xml b/briar-android/res/values-pt-rBR/strings.xml
index d616b8feed..8228fdac30 100644
--- a/briar-android/res/values-pt-rBR/strings.xml
+++ b/briar-android/res/values-pt-rBR/strings.xml
@@ -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>
+Ou o autor não postou nada ainda, ou a pessoa que compartilhou esse Blog contigo precisa estar online, assim os Posts serão sincronizados.</string>
<string name="tag_new">Novo</string>
- <string name="blogs_post_more">mais</string>
<string name="blogs_write_blog_post">Escrever Post do Blog</string>
<string name="blogs_write_blog_post_title_hint">Adicione um TÃtulo (opcional)</string>
<string name="blogs_write_blog_post_body_hint">Digite aqui seu post do blog</string>
diff --git a/briar-android/res/values/color.xml b/briar-android/res/values/color.xml
index cb1b55840d..e7cb49b152 100644
--- a/briar-android/res/values/color.xml
+++ b/briar-android/res/values/color.xml
@@ -4,27 +4,18 @@
<color name="briar_blue_dark">#0F1720</color>
<color name="briar_gold">#FCCF1C</color>
<color name="briar_green_light">#95D220</color>
- <color name="briar_green_dark">#87C214</color>
- <color name="briar_red">#C1392B</color>
<color name="window_background">#eceff1</color>
<color name="action_bar_text">#FFFFFF</color>
- <color name="action_bar_background">@color/briar_blue</color>
<color name="button_bar_background">#FFFFFF</color>
- <color name="dashboard_background">#FFFFFF</color>
<color name="private_message_date">#AAAAAA</color>
<color name="private_message_date_inverse">#e0e0e0</color>
- <color name="unread_background">#FFFFFF</color>
- <color name="horizontal_border">#CCCCCC</color>
- <color name="forums_available_background">@color/briar_gold</color>
- <color name="no_private_messages">#AAAAAA</color>
<color name="forum_avatar_shadow">#99000000</color>
<color name="briar_primary">@color/briar_blue</color>
<color name="briar_primary_dark">@color/briar_blue_dark</color>
<color name="briar_accent">@color/briar_blue</color>
- <color name="briar_accent_dark">@color/briar_blue_dark</color>
<!-- text colors -->
<color name="briar_text_link">#06b9ff</color>
@@ -40,7 +31,6 @@
<!-- this is needed as preference_category_material layout uses this color as the text color -->
<color name="preference_fallback_accent_color">@color/briar_accent</color>
<color name="divider">#c1c1c1</color>
- <color name="default_separator">#000000</color>
<color name="default_separator_inverted">#ffffff</color>
<color name="menu_background">#FFFFFF</color>
diff --git a/briar-android/res/values/dimens.xml b/briar-android/res/values/dimens.xml
index 8b09f7246a..de80d0880e 100644
--- a/briar-android/res/values/dimens.xml
+++ b/briar-android/res/values/dimens.xml
@@ -21,7 +21,6 @@
<dimen name="listitem_horizontal_margin">16dp</dimen>
<dimen name="listitem_vertical_margin">10dp</dimen>
- <dimen name="listitem_text_left_margin">72dp</dimen>
<dimen name="listitem_height_one_line_avatar">56dp</dimen>
<dimen name="listitem_picture_size">48dp</dimen>
<dimen name="listitem_picture_size_small">23dp</dimen>
@@ -34,7 +33,6 @@
<dimen name="avatar_text_size">30sp</dimen>
<dimen name="unread_bubble_text_size">12sp</dimen>
- <dimen name="unread_bubble_border_width">2dp</dimen>
<dimen name="unread_bubble_padding_horizontal">6dp</dimen>
<dimen name="unread_bubble_size">19dp</dimen>
diff --git a/briar-android/res/values/strings.xml b/briar-android/res/values/strings.xml
index bdea4954b2..cd77033b99 100644
--- a/briar-android/res/values/strings.xml
+++ b/briar-android/res/values/strings.xml
@@ -1,29 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="nav_drawer_open_description">Open the navigation drawer</string>
- <string name="nav_drawer_close_description">Close the navigation drawer</string>
- <string name="app_name">Briar</string>
+ <string translatable="false" name="app_name">Briar</string>
- <!-- Crash Reporter -->
- <string name="crash_report_title">Briar Crash Report</string>
- <string name="briar_crashed">Sorry, Briar has crashed.</string>
- <string name="not_your_fault">This is not your fault.</string>
- <string name="please_send_report">Please help us build a better Briar by sending us a crash report.</string>
- <string name="report_is_encrypted">We promise that the report is encrypted and sent securely.</string>
- <string name="feedback_title">Feedback</string>
- <string name="describe_crash">Describe what happened (optional)</string>
- <string name="enter_feedback">Enter your feedback</string>
- <string name="optional_contact_email">Your email address (optional)</string>
- <string name="debug_report">Debug report:</string>
- <string name="include_debug_report_crash">Include anonymous data about the crash</string>
- <string name="include_debug_report_feedback">Include anonymous data about this device</string>
- <string name="could_not_load_report_data">Could not load report data.</string>
- <string name="send_report">Send report</string>
- <string name="close">Close</string>
- <string name="dev_report_saved">Report saved. It will be sent the next time you log into Briar.</string>
-
- <string name="ongoing_notification_title">Signed into Briar</string>
- <string name="ongoing_notification_text">Touch to open Briar.</string>
+ <!-- Setup -->
<string name="setup_title">Briar Setup</string>
<string name="setup_explanation">Your Briar account is stored encrypted on your device, not in the cloud. If you uninstall Briar or forget your password, there\'s no way to recover your account and your data.</string>
<string name="choose_nickname">Choose your nickname</string>
@@ -33,27 +12,78 @@
<string name="password_too_weak">Password is too weak</string>
<string name="passwords_do_not_match">Passwords do not match</string>
<string name="create_account_button">Create Account</string>
+ <string name="progress_title_please_wait">Please wait..</string>
+
+ <!-- Login -->
<string name="enter_password">Enter your password:</string>
- <string name="password_hint">Password</string>
- <string name="forgotten_password">I have forgotten my password</string>
<string name="try_again">Wrong password, try again</string>
<string name="sign_in_button">Sign In</string>
+ <string name="forgotten_password">I have forgotten my password</string>
+ <string name="dialog_title_lost_password">Lost Password</string>
+ <string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.</string>
<string name="startup_failed_notification_title">Briar could not start</string>
<string name="startup_failed_notification_text">You may need to reinstall Briar.</string>
<string name="startup_failed_activity_title">Briar Startup Failure</string>
<string name="startup_failed_db_error">For some reason, your Briar database is corrupted beyond repair. Your account, your data and all your contact connections are lost. Unfortunately, you need to reinstall Briar und set up a new account.</string>
<string name="startup_failed_service_error">Briar was unable to start a required plugin. Reinstalling Briar usually solves this problem. However, please note that you will then lose your account and all data associated with it since Briar is not using central servers to store your data on.</string>
<string name="expiry_warning">This software has expired.\nPlease install a newer version.</string>
+ <string name="dialog_title_welcome">Welcome to Briar</string>
+ <string name="dialog_welcome_message">Add a contact to start communicating securely or press the icon in the upper left corner of the screen for more options.</string>
+
+ <!-- Navigation Drawer -->
+ <string name="nav_drawer_open_description">Open the navigation drawer</string>
+ <string name="nav_drawer_close_description">Close the navigation drawer</string>
<string name="contact_list_button">Contacts</string>
- <string name="delete_contact">Delete contact</string>
- <string name="contact_deleted_toast">Contact deleted</string>
<string name="forums_button">Forums</string>
+ <string name="blogs_button">Micro Blogs</string>
<string name="settings_button">Settings</string>
<string name="sign_out_button">Sign Out</string>
+
+ <!-- Transports -->
+ <string name="transport_tor">Internet</string>
+ <string name="transport_bt">Bluetooth</string>
+ <string name="transport_lan">Wi-Fi</string>
+
+ <!-- Notifications -->
+ <string name="ongoing_notification_title">Signed into Briar</string>
+ <string name="ongoing_notification_text">Touch to open Briar.</string>
+ <plurals name="private_message_notification_text">
+ <item quantity="one">New private message.</item>
+ <item quantity="other">%d new private messages.</item>
+ </plurals>
+ <plurals name="forum_post_notification_text">
+ <item quantity="one">New forum post.</item>
+ <item quantity="other">%d new forum posts.</item>
+ </plurals>
+ <plurals name="blog_post_notification_text">
+ <item quantity="one">New blog post.</item>
+ <item quantity="other">%d new blog posts.</item>
+ </plurals>
+
+ <!-- Misc -->
<string name="now">now</string>
- <string name="contact_list_title">Contacts</string>
+ <string name="show">Show</string>
+ <string name="hide">Hide</string>
+ <string name="ok">OK</string>
+ <string name="cancel">Cancel</string>
+ <string name="delete">Delete</string>
+ <string name="accept">Accept</string>
+ <string name="decline">Decline</string>
+ <string name="online">Online</string>
+ <string name="offline">Offline</string>
+ <string name="send">Send</string>
+ <string name="no_data">No data</string>
+
+ <!-- Contacts and Private Conversations-->
<string name="no_contacts">It seems that you are new here and have no contacts yet.\n\nTap the + icon at the top and follow the instructions to add some friends to your list.\n\nPlease remember: You can only add new contacts face-to-face to prevent anyone from impersonating you or reading your messages in the future.</string>
- <string name="no_contacts_selector">It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.</string>
+ <string name="date_no_private_messages">No messages.</string>
+ <string name="no_private_messages">This is the conversation view.\n\nThere seems to be a lack of conversation.\n\nJust tap the input field at the bottom to start a conversation.</string>
+ <string name="delete_contact">Delete contact</string>
+ <string name="dialog_title_delete_contact">Confirm Contact Deletion</string>
+ <string name="dialog_message_delete_contact">Are you sure that you want to remove this contact and all messages exchanged with this contact?</string>
+ <string name="contact_deleted_toast">Contact deleted</string>
+
+ <!-- Adding Contacts -->
<string name="add_contact_title">Add a Contact</string>
<string name="your_nickname">Choose the identity you want to use:</string>
<string name="face_to_face">You must be face-to-face with the person you want to add as a contact. This will prevent anyone from impersonating you or reading your messages in future.</string>
@@ -75,138 +105,13 @@
<string name="contact_added_toast">Contact added: %s</string>
<string name="contact_already_exists">Contact %s already exists</string>
<string name="contact_exchange_failed">Contact exchange failed</string>
- <string name="scan_qr_code">Scan QR code</string>
<string name="qr_code_invalid">The QR code is invalid</string>
<string name="connecting_to_device">Connecting to device\u2026</string>
<string name="authenticating_with_device">Authenticating with device\u2026</string>
<string name="connection_aborted_local">Connection aborted by us! This could mean that someone is trying to interfere with your connection</string>
<string name="connection_aborted_remote">Connection aborted by your contact! This could mean that someone is trying to interfere with your connection</string>
- <string name="date_no_private_messages">No messages.</string>
- <string name="no_private_messages">This is the conversation view.\n\nThere seems to be a lack of conversation.\n\nJust tap the input field at the bottom to start a conversation.</string>
- <string name="private_message_hint">Type message</string>
- <string name="message_sent_toast">Message sent</string>
- <string name="no_forums">You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.</string>
- <string name="no_forum_posts">This forum is empty.\n\nUse the pen icon at the top to compose the first post.\n\nFeeling lonely here? Share this forum with more of your contacts!</string>
- <plurals name="forums_shared">
- <item quantity="one">%d forum shared by contacts</item>
- <item quantity="other">%d forums shared by contacts</item>
- </plurals>
- <string name="show">Show</string>
- <string name="hide">Hide</string>
- <string name="show_forums">Show</string>
- <string name="forum_leave">Leave Forum</string>
- <string name="forum_left_toast">Left Forum</string>
- <string name="sharing_status">Sharing Status</string>
- <string name="no_posts">No posts</string>
- <plurals name="unread_posts">
- <item quantity="one">%d unread post</item>
- <item quantity="other">%d unread posts</item>
- </plurals>
- <plurals name="posts">
- <item quantity="one">%d post</item>
- <item quantity="other">%d posts</item>
- </plurals>
- <string name="create_forum_title">New Forum</string>
- <string name="choose_forum_name">Choose a name for your forum:</string>
- <string name="create_forum_button">Create Forum</string>
- <string name="forum_created_toast">Forum created</string>
- <string name="forum_share_action">Share this forum with chosen contacts</string>
- <string name="forum_share_button">Share Forum</string>
- <string name="forum_shared_snackbar">Forum shared with chosen contacts</string>
- <string name="forum_share_message">You may compose an optional invitation message that will be sent to the selected contacts.</string>
- <string name="forum_share_error">There was an error sharing this forum.</string>
- <string name="forum_invitation_received">%1$s has shared the forum \"%2$s\" with you.</string>
- <string name="forum_invitation_sent">You have shared the forum \"%1$s\" with %2$s.</string>
- <string name="forum_show_invitations">Show Forum Invitations</string>
- <string name="forum_compose_post">New Forum Post</string>
- <string name="from">From:</string>
- <string name="anonymous">Anonymous</string>
- <string name="new_identity_item">New identity\u2026</string>
- <string name="new_identity_title">New Identity</string>
- <string name="create_identity_button">Create Identity</string>
- <string name="identity_created_toast">Identity created</string>
- <string name="forum_post_hint">Type forum post</string>
- <string name="forum_invitations_title">Forum Invitations</string>
- <string name="forum_invitation_exists">You accepted an invitation to this forum already. Accepting more invitations will grow and strengthen the communication in the forum.</string>
- <string name="forum_joined_toast">Joined Forum</string>
- <string name="forum_declined_toast">Forum Invitation Declined</string>
- <string name="shared_by_format">Shared by %s</string>
- <string name="forum_shared_by">Shared by</string>
- <string name="forum_shared_with">Shared with</string>
- <string name="nobody">Nobody</string>
- <string name="add_button">Add</string>
- <string name="cancel_button">Cancel</string>
- <string name="done_button">Done</string>
- <string name="delete_button">Delete</string>
- <string name="post_sent_toast">Forum post sent</string>
- <plurals name="private_message_notification_text">
- <item quantity="one">New private message.</item>
- <item quantity="other">%d new private messages.</item>
- </plurals>
- <plurals name="forum_post_notification_text">
- <item quantity="one">New forum post.</item>
- <item quantity="other">%d new forum posts.</item>
- </plurals>
- <plurals name="blog_post_notification_text">
- <item quantity="one">New blog post.</item>
- <item quantity="other">%d new blog posts.</item>
- </plurals>
- <!-- Settings -->
- <string name="settings_title">Settings</string>
- <string name="network_settings_title">Networks</string>
- <string name="bluetooth_setting">Connect via Bluetooth</string>
- <string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
- <string name="bluetooth_setting_disabled">Only when adding contacts</string>
- <string name="tor_mobile_setting">Connect via Tor</string>
- <string name="tor_mobile_setting_enabled">When using Wi-Fi or mobile data</string>
- <string name="tor_mobile_setting_disabled">Only when using Wi-Fi</string>
- <string name="security_settings_title">Security</string>
- <string name="change_password">Change password</string>
- <string name="panic_setting">Panic button setup</string>
- <string name="panic_setting_title">Panic button</string>
- <string name="panic_setting_hint">Configure how Briar will react when you use a panic button app</string>
- <string name="notification_settings_title">Notifications</string>
- <string name="notify_private_messages_setting">Show alerts for private messages</string>
- <string name="notify_forum_posts_setting">Show alerts for forum posts</string>
- <string name="notify_blog_posts_setting">Show alerts for blog posts</string>
- <string name="notify_vibration_setting">Vibrate</string>
- <string name="notify_sound_setting">Sound</string>
- <string name="notify_sound_setting_default">Default ringtone</string>
- <string name="notify_sound_setting_disabled">None</string>
- <string name="choose_ringtone_title">Choose ringtone</string>
- <string name="crash_report_settings_title">Crash reports</string>
- <string name="enable_acra_setting">Enable crash reporter</string>
- <string name="acra_syslog_setting">Send system logs</string>
- <string name="acra_user_email_setting">Optional contact email</string>
- <string name="acra_alwaysaccept_setting">Always send reports</string>
- <string name="panic_app_setting_title">Panic Button App</string>
- <string name="unknown_app">an unknown app</string>
- <string name="panic_app_setting_summary">No app has been set</string>
- <string name="panic_app_setting_none">None</string>
- <string name="lock_setting_title">Sign Out</string>
- <string name="lock_setting_summary">Sign out of Briar if a panic button is pressed</string>
- <string name="purge_setting_title">Delete Account</string>
- <string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string>
- <string name="uninstall_setting_title">Uninstall Briar</string>
- <string name="uninstall_setting_summary">This requires manual confirmation in a panic event</string>
- <string name="current_password">Enter your current password:</string>
- <string name="choose_new_password">Choose your new password:</string>
- <string name="confirm_new_password">Confirm your new password:</string>
- <string name="password_changed">Password has been changed.</string>
- <string name="feedback_settings_title">Feedback</string>
- <string name="send_feedback">Send feedback</string>
-
- <string name="step">Step %1$d/%2$d</string>
- <string name="online">Online</string>
- <string name="offline">Offline</string>
- <string name="send">Send</string>
- <string name="transport_tor">Internet</string>
- <string name="transport_bt">Bluetooth</string>
- <string name="transport_lan">Wi-Fi</string>
- <string name="no_data">No data</string>
-
- <!-- Introduction Client -->
+ <!-- Introductions -->
<string name="introduction_activity_title">Select Contact</string>
<string name="introduction_message_title">Introduce Contacts</string>
<string name="introduction_message_text">You can compose a message that will be sent to %1$s and %2$s along with your introduction:</string>
@@ -217,6 +122,7 @@
<string name="introduction_response_error">Error when responding to introduction</string>
<string name="introduction_warn_different_identities_title">Warning: Different Identities</string>
<string name="introduction_warn_different_identities_text">You are trying to introduce two contacts that you have added with different identities. This might reveal that both identities are yours.</string>
+ <string name="dialog_button_introduce">Introduce</string>
<string name="introduction_request_sent">You have asked to introduce %1$s to %2$s.</string>
<string name="introduction_request_received">%1$s has asked to introduce you to %2$s. Do you want to add %2$s to your contact list?</string>
<string name="introduction_request_exists_received">%1$s has asked to introduce you to %2$s, but %2$s is already in your contact list. Since %1$s might not know that, you can still respond:</string>
@@ -230,52 +136,67 @@
<string name="introduction_success_title">Introduced contact was added</string>
<string name="introduction_success_text">You have been introduced to %1$s.</string>
- <!-- Forum -->
- <string name="btn_reply">REPLY</string>
- <plurals name="message_replies">
- <item quantity="one">%1$d reply</item>
- <item quantity="other">%1$d replies</item>
+ <!-- Forums -->
+ <string name="no_forums">You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.</string>
+ <string name="create_forum_title">New Forum</string>
+ <string name="choose_forum_name">Choose a name for your forum:</string>
+ <string name="create_forum_button">Create Forum</string>
+ <string name="forum_created_toast">Forum created</string>
+ <string name="no_forum_posts">This forum is empty.\n\nUse the pen icon at the top to compose the first post.\n\nFeeling lonely here? Share this forum with more of your contacts!</string>
+ <string name="no_posts">No posts</string>
+ <plurals name="posts">
+ <item quantity="one">%d post</item>
+ <item quantity="other">%d posts</item>
</plurals>
+ <string name="forum_compose_post">New Forum Post</string>
<string name="forum_new_entry_posted">Forum entry posted</string>
<string name="forum_new_entry_received">New forum entry</string>
<string name="forum_new_message_hint">New Entry</string>
<string name="forum_message_reply_hint">New Reply</string>
+ <string name="btn_reply">REPLY</string>
+ <plurals name="message_replies">
+ <item quantity="one">%1$d reply</item>
+ <item quantity="other">%1$d replies</item>
+ </plurals>
+ <string name="forum_leave">Leave Forum</string>
+ <string name="dialog_title_leave_forum">Confirm Leaving Forum</string>
+ <string name="dialog_message_leave_forum">Are you sure that you want to leave this forum? Contacts you have shared this forum with might get cut off from receiving updates for this forum.</string>
+ <string name="dialog_button_leave">Leave</string>
+ <string name="forum_left_toast">Left Forum</string>
+
+ <!-- Forum Sharing -->
+ <string name="forum_share_button">Share Forum</string>
+ <string name="forum_share_action">Share this forum with chosen contacts</string>
+ <string name="activity_share_toolbar_header">Choose Contacts</string>
+ <string name="no_contacts_selector">It seems that you are new here and have no contacts yet.\n\nPlease come back here after you added your first contact.</string>
+ <string name="forum_shared_snackbar">Forum shared with chosen contacts</string>
+ <string name="forum_share_message">You may compose an optional invitation message that will be sent to the selected contacts.</string>
+ <string name="forum_share_error">There was an error sharing this forum.</string>
+ <string name="forum_invitation_received">%1$s has shared the forum \"%2$s\" with you.</string>
+ <string name="forum_invitation_sent">You have shared the forum \"%1$s\" with %2$s.</string>
+ <string name="forum_show_invitations">Show Forum Invitations</string>
+ <string name="forum_invitations_title">Forum Invitations</string>
+ <string name="forum_invitation_exists">You accepted an invitation to this forum already. Accepting more invitations will grow and strengthen the communication in the forum.</string>
+ <string name="forum_joined_toast">Joined Forum</string>
+ <string name="forum_declined_toast">Forum Invitation Declined</string>
+ <string name="shared_by_format">Shared by %s</string>
<string name="forum_invitation_already_sharing">Already sharing</string>
<string name="forum_invitation_response_accepted_sent">You accepted the forum invitation from %s.</string>
<string name="forum_invitation_response_declined_sent">You declined the forum invitation from %s.</string>
<string name="forum_invitation_response_accepted_received">%s accepted the forum invitation.</string>
<string name="forum_invitation_response_declined_received">%s declined the forum invitation.</string>
- <!-- Dialogs -->
- <string name="dialog_title_lost_password">Lost Password</string>
- <string name="dialog_message_lost_password">Your Briar account is stored encrypted on your device, not in the cloud, so we can\'t reset your password. Would you like to delete your account and start again?\n\nCaution: Your identities, contacts and messages will be permanently lost.</string>
- <string name="dialog_title_delete_contact">Confirm Contact Deletion</string>
- <string name="dialog_message_delete_contact">Are you sure that you want to remove this contact and all messages exchanged with this contact?</string>
- <string name="dialog_title_connect_panic_app">Confirm Panic App</string>
- <string name="dialog_message_connect_panic_app">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
- <string name="dialog_title_welcome">Welcome to Briar</string>
- <string name="dialog_welcome_message">Add a contact to start communicating securely or press the icon in the upper left corner of the screen for more options.</string>
- <string name="dialog_title_leave_forum">Confirm Leaving Forum</string>
- <string name="dialog_message_leave_forum">Are you sure that you want to leave this forum? Contacts you have shared this forum with might get cut off from receiving updates for this forum.</string>
- <string name="dialog_button_ok">OK</string>
- <string name="dialog_button_leave">Leave</string>
- <string name="dialog_button_introduce">Introduce</string>
- <string name="dialog_button_accept">Accept</string>
- <string name="dialog_button_decline">Decline</string>
- <!-- Toolbar headers -->
- <string name="dashboard_toolbar_header">Briar</string>
- <string name="settings_toolbar_header">Settings</string>
- <string name="contacts_toolbar_header">Contacts</string>
- <string name="forums_toolbar_header">Forums</string>
- <string name="activity_share_toolbar_header">Choose Contacts</string>
- <!-- Progress titles -->
- <string name="progress_title_logout">Signing out of Briar..</string>
- <string name="progress_title_please_wait">Please wait..</string>
+ <string name="sharing_status">Sharing Status</string>
+ <plurals name="forums_shared">
+ <item quantity="one">%d forum shared by contacts</item>
+ <item quantity="other">%d forums shared by contacts</item>
+ </plurals>
+ <string name="forum_shared_by">Shared by</string>
+ <string name="forum_shared_with">Shared with</string>
+ <string name="nobody">Nobody</string>
<!-- Blogs -->
- <string name="blogs_button">Micro Blogs</string>
<string name="blogs_feed">Feed</string>
-
<string name="blogs_my_blogs">My Blogs</string>
<string name="blogs_my_blogs_create">Create Blog</string>
<string name="blogs_my_blogs_label">Add new Blog</string>
@@ -288,7 +209,6 @@
<string name="blogs_blog_is_empty">This blog is empty</string>
<string name="blogs_other_blog_empty_state">This blog is currently empty.\n\nEither the author hasn\'t written anything yet, or the person who shared this blog with you needs to come online, so posts can be synchronized.</string>
<string name="tag_new">NEW</string>
- <string name="blogs_post_more">more</string>
<string name="blogs_write_blog_post">Write Blog Post</string>
<string name="blogs_write_blog_post_title_hint">Add a title (optional)</string>
<string name="blogs_write_blog_post_body_hint">Type your blog post here</string>
@@ -304,6 +224,12 @@
<string name="blogs_remove_blog_dialog_message">Are you sure that you want to remove this blog and all posts?\nNote that this will not remove the blog from other people\'s devices.</string>
<string name="blogs_remove_blog_ok">Remove Blog</string>
<string name="blogs_blog_removed">Blog Removed</string>
+
+ <string name="blogs_blog_list">Blog List</string>
+ <string name="blogs_available_blogs">Available Blogs</string>
+ <string name="blogs_drafts">Drafts</string>
+
+ <!-- Blog Sharing -->
<string name="blogs_sharing_share">Share Blog</string>
<string name="blogs_sharing_error">There was an error sharing this blog.</string>
<string name="blogs_sharing_button">Share Blog</string>
@@ -320,10 +246,6 @@
<string name="blogs_sharing_joined_toast">Subscribed to Blog</string>
<string name="blogs_sharing_declined_toast">Blog Invitation Declined</string>
- <string name="blogs_blog_list">Blog List</string>
- <string name="blogs_available_blogs">Available Blogs</string>
- <string name="blogs_drafts">Drafts</string>
-
<!-- RSS Feeds -->
<string name="blogs_rss_feeds_import">Import RSS Feed</string>
<string name="blogs_rss_feeds_import_button">Import</string>
@@ -337,4 +259,83 @@
<string name="blogs_rss_feeds_manage_empty_state">You haven\'t imported any RSS feeds.\n\nWhy don\'t you click the plus in the top right screen corner to add your first?</string>
<string name="blogs_rss_feeds_manage_error">There was a problem loading your feeds. Please try again later.</string>
+ <!-- Settings Network -->
+ <string name="network_settings_title">Networks</string>
+ <string name="bluetooth_setting">Connect via Bluetooth</string>
+ <string name="bluetooth_setting_enabled">Whenever contacts are nearby</string>
+ <string name="bluetooth_setting_disabled">Only when adding contacts</string>
+ <string name="tor_mobile_setting">Connect via Tor</string>
+ <string name="tor_mobile_setting_enabled">When using Wi-Fi or mobile data</string>
+ <string name="tor_mobile_setting_disabled">Only when using Wi-Fi</string>
+
+ <!-- Settings Security and Panic -->
+ <string name="security_settings_title">Security</string>
+ <string name="change_password">Change password</string>
+ <string name="current_password">Enter your current password:</string>
+ <string name="choose_new_password">Choose your new password:</string>
+ <string name="confirm_new_password">Confirm your new password:</string>
+ <string name="password_changed">Password has been changed.</string>
+ <string name="panic_setting">Panic button setup</string>
+ <string name="panic_setting_title">Panic button</string>
+ <string name="panic_setting_hint">Configure how Briar will react when you use a panic button app</string>
+ <string name="panic_app_setting_title">Panic Button App</string>
+ <string name="unknown_app">an unknown app</string>
+ <string name="panic_app_setting_summary">No app has been set</string>
+ <string name="panic_app_setting_none">None</string>
+ <string name="dialog_title_connect_panic_app">Confirm Panic App</string>
+ <string name="dialog_message_connect_panic_app">Are you sure that you want to allow %1$s to trigger destructive panic button actions?</string>
+ <string name="lock_setting_title">Sign Out</string>
+ <string name="lock_setting_summary">Sign out of Briar if a panic button is pressed</string>
+ <string name="purge_setting_title">Delete Account</string>
+ <string name="purge_setting_summary">Delete your Briar account if a panic button is pressed. Caution: This will permanently delete your identities, contacts and messages</string>
+ <string name="uninstall_setting_title">Uninstall Briar</string>
+ <string name="uninstall_setting_summary">This requires manual confirmation in a panic event</string>
+
+ <!-- Settings Notifications -->
+ <string name="notification_settings_title">Notifications</string>
+ <string name="notify_private_messages_setting">Show alerts for private messages</string>
+ <string name="notify_forum_posts_setting">Show alerts for forum posts</string>
+ <string name="notify_blog_posts_setting">Show alerts for blog posts</string>
+ <string name="notify_vibration_setting">Vibrate</string>
+ <string name="notify_sound_setting">Sound</string>
+ <string name="notify_sound_setting_default">Default ringtone</string>
+ <string name="notify_sound_setting_disabled">None</string>
+ <string name="choose_ringtone_title">Choose ringtone</string>
+
+ <!-- Settings Crash reports and feedback -->
+ <string name="crash_report_settings_title">Crash reports</string>
+ <string name="enable_acra_setting">Enable crash reporter</string>
+ <string name="acra_syslog_setting">Send system logs</string>
+ <string name="acra_user_email_setting">Optional contact email</string>
+ <string name="acra_alwaysaccept_setting">Always send reports</string>
+ <string name="feedback_settings_title">Feedback</string>
+ <string name="send_feedback">Send feedback</string>
+
+ <!-- Multiple Identities -->
+ <string name="anonymous">Anonymous</string>
+ <string name="new_identity_item">New identity\u2026</string>
+ <string name="new_identity_title">New Identity</string>
+ <string name="create_identity_button">Create Identity</string>
+ <string name="identity_created_toast">Identity created</string>
+
+ <!-- Crash Reporter -->
+ <string name="crash_report_title">Briar Crash Report</string>
+ <string name="briar_crashed">Sorry, Briar has crashed.</string>
+ <string name="not_your_fault">This is not your fault.</string>
+ <string name="please_send_report">Please help us build a better Briar by sending us a crash report.</string>
+ <string name="report_is_encrypted">We promise that the report is encrypted and sent securely.</string>
+ <string name="feedback_title">Feedback</string>
+ <string name="describe_crash">Describe what happened (optional)</string>
+ <string name="enter_feedback">Enter your feedback</string>
+ <string name="optional_contact_email">Your email address (optional)</string>
+ <string name="include_debug_report_crash">Include anonymous data about the crash</string>
+ <string name="include_debug_report_feedback">Include anonymous data about this device</string>
+ <string name="could_not_load_report_data">Could not load report data.</string>
+ <string name="send_report">Send report</string>
+ <string name="close">Close</string>
+ <string name="dev_report_saved">Report saved. It will be sent the next time you log into Briar.</string>
+
+ <!-- Sign Out -->
+ <string name="progress_title_logout">Signing out of Briar…</string>
+
</resources>
diff --git a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
index e6082e07f1..e797dd8009 100644
--- a/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
+++ b/briar-android/src/org/briarproject/android/BriarFragmentActivity.java
@@ -24,9 +24,9 @@ public abstract class BriarFragmentActivity extends BriarActivity {
return;
if (fragmentTag.equals(ContactListFragment.TAG)) {
- actionBar.setTitle(R.string.contacts_toolbar_header);
+ actionBar.setTitle(R.string.contact_list_button);
} else if (fragmentTag.equals(ForumListFragment.TAG)) {
- actionBar.setTitle(R.string.forums_toolbar_header);
+ actionBar.setTitle(R.string.forums_button);
} else if (fragmentTag.equals(BlogsFragment.TAG)) {
actionBar.setTitle(R.string.blogs_button);
}
@@ -75,7 +75,7 @@ public abstract class BriarFragmentActivity extends BriarActivity {
R.style.BriarDialogTheme);
builder.setTitle(titleStringId);
builder.setMessage(msgStringId);
- builder.setPositiveButton(R.string.dialog_button_ok, null);
+ builder.setPositiveButton(R.string.ok, null);
AlertDialog dialog = builder.create();
dialog.show();
}
diff --git a/briar-android/src/org/briarproject/android/PasswordActivity.java b/briar-android/src/org/briarproject/android/PasswordActivity.java
index 321f6c4a1b..751b6adcdb 100644
--- a/briar-android/src/org/briarproject/android/PasswordActivity.java
+++ b/briar-android/src/org/briarproject/android/PasswordActivity.java
@@ -109,8 +109,8 @@ public class PasswordActivity extends BaseActivity {
R.style.BriarDialogTheme);
builder.setTitle(R.string.dialog_title_lost_password);
builder.setMessage(R.string.dialog_message_lost_password);
- builder.setPositiveButton(R.string.cancel_button, null);
- builder.setNegativeButton(R.string.delete_button,
+ builder.setPositiveButton(R.string.cancel, null);
+ builder.setNegativeButton(R.string.delete,
new DialogInterface.OnClickListener() {
@Override
public void onClick(DialogInterface dialog, int which) {
diff --git a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java
index 9629d04264..0bd8662843 100644
--- a/briar-android/src/org/briarproject/android/blogs/BlogFragment.java
+++ b/briar-android/src/org/briarproject/android/blogs/BlogFragment.java
@@ -283,7 +283,7 @@ public class BlogFragment extends BaseFragment implements BlogPostListener {
builder.setTitle(getString(R.string.blogs_remove_blog));
builder.setMessage(
getString(R.string.blogs_remove_blog_dialog_message));
- builder.setPositiveButton(R.string.cancel_button, null);
+ builder.setPositiveButton(R.string.cancel, null);
builder.setNegativeButton(R.string.blogs_remove_blog_ok, okListener);
builder.show();
}
diff --git a/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java b/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
index c7d772cba3..62f6c4f42a 100644
--- a/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
+++ b/briar-android/src/org/briarproject/android/blogs/RssFeedImportActivity.java
@@ -160,7 +160,7 @@ public class RssFeedImportActivity extends BriarActivity {
new AlertDialog.Builder(RssFeedImportActivity.this,
R.style.BriarDialogTheme);
builder.setMessage(R.string.blogs_rss_feeds_import_error);
- builder.setNegativeButton(R.string.cancel_button, null);
+ builder.setNegativeButton(R.string.cancel, null);
builder.setPositiveButton(R.string.try_again_button,
new DialogInterface.OnClickListener() {
@Override
diff --git a/briar-android/src/org/briarproject/android/forum/ForumListFragment.java b/briar-android/src/org/briarproject/android/forum/ForumListFragment.java
index 0b1486b84e..0f33788523 100644
--- a/briar-android/src/org/briarproject/android/forum/ForumListFragment.java
+++ b/briar-android/src/org/briarproject/android/forum/ForumListFragment.java
@@ -88,7 +88,7 @@ public class ForumListFragment extends BaseEventFragment implements
snackbar = Snackbar.make(list, "", LENGTH_INDEFINITE);
snackbar.getView().setBackgroundResource(R.color.briar_primary);
- snackbar.setAction(R.string.show_forums, this);
+ snackbar.setAction(R.string.show, this);
snackbar.setActionTextColor(ContextCompat
.getColor(getContext(), R.color.briar_button_positive));
--
GitLab