6543
/
BayernMessenger
forked from GitHub-Mirror/riotX-android
1
0
Fork 0
Code Issues 4 Pull Requests Releases Wiki Activity

moved new strings + @StringRes annotation

This commit is contained in:
Valere 2019-07-08 18:05:37 +02:00
parent 8159a52bd7
commit 4aae1f78d8
3 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
matrix-sdk-android/src/main/java/im/vector/matrix/android/api/session/InitialSyncProgressService.kt
View File

@ -1,5 +1,6 @@
package im.vector.matrix.android.api.session package im.vector.matrix.android.api.session


import androidx.annotation.StringRes
import androidx.lifecycle.LiveData import androidx.lifecycle.LiveData


interface InitialSyncProgressService { interface InitialSyncProgressService {
@ -7,7 +8,7 @@ interface InitialSyncProgressService {
fun getLiveStatus() : LiveData<Status?> fun getLiveStatus() : LiveData<Status?>


data class Status( data class Status(
val statusText: Int?, @StringRes val statusText: Int?,
val percentProgress: Int = 0 val percentProgress: Int = 0
) )
} }

9
matrix-sdk-android/src/main/res/values/strings.xml
View File

@ -228,13 +228,4 @@
<!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb --> <!-- All translations should be the same across all Riot clients, please use the same translation than RiotWeb -->
<string name="verification_emoji_pin">Pin</string> <string name="verification_emoji_pin">Pin</string>



<string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
<string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
<string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
<string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
<string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
<string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
<string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
<string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
</resources> </resources>

10
matrix-sdk-android/src/main/res/values/strings_RiotX.xml Normal file
View File

@ -0,0 +1,10 @@
<resources>
<string name="initial_sync_start_importing_account">Initial Sync:\nImporting account…</string>
<string name="initial_sync_start_importing_account_crypto">Initial Sync:\nImporting crypto</string>
<string name="initial_sync_start_importing_account_rooms">Initial Sync:\nImporting Rooms</string>
<string name="initial_sync_start_importing_account_joined_rooms">Initial Sync:\nImporting Joined Rooms</string>
<string name="initial_sync_start_importing_account_invited_rooms">Initial Sync:\nImporting Invited Rooms</string>
<string name="initial_sync_start_importing_account_left_rooms">Initial Sync:\nImporting Left Rooms</string>
<string name="initial_sync_start_importing_account_groups">Initial Sync:\nImporting Communities</string>
<string name="initial_sync_start_importing_account_data">Initial Sync:\nImporting Account Data</string>
</resources>