Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
savoirfairelinux
jami-client-android
Commits
22323172
Commit
22323172
authored
Sep 27, 2021
by
Adrien Béraud
Browse files
syncing: add localized string
Change-Id: I415cf65b2e2aae6664aca17034d9ae29f8148619
parent
fbee9bb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
ring-android/app/src/main/java/cx/ring/fragments/ConversationFragment.kt
View file @
22323172
...
...
@@ -1045,7 +1045,7 @@ class ConversationFragment : BaseSupportFragment<ConversationPresenter, Conversa
unknownContactPrompt
.
visibility
=
View
.
GONE
trustRequestPrompt
.
visibility
=
View
.
GONE
trustRequestMessageLayout
.
visibility
=
View
.
VISIBLE
tvTrustRequestMessage
.
text
=
"Sync
ing
conversation
..."
tvTrustRequestMessage
.
text
=
getText
(
R
.
str
ing
.
conversation
_syncing
)
}
currentBottomView
=
null
requireActivity
().
invalidateOptionsMenu
()
...
...
ring-android/app/src/main/res/values/strings.xml
View file @
22323172
...
...
@@ -247,6 +247,7 @@ along with this program; if not, write to the Free Software
<string
name=
"conversation_contact_is_typing"
>
Contact is typing…
</string>
<string
name=
"conversation_info_contact_you"
>
You
</string>
<string
name=
"conversation_members"
>
Members
</string>
<string
name=
"conversation_syncing"
>
Downloading conversation from peer
</string>
<string
name=
"conversation_preference_color"
>
Conversation color
</string>
<string
name=
"conversation_preference_emoji"
>
Conversation emoji
</string>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment