Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
49eb678e
Unverified
Commit
49eb678e
authored
Dec 18, 2018
by
Filipe de Lima Brito
Committed by
GitHub
Dec 18, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into new/draft-message
parents
f727cc8f
a07ec354
Changes
17
Hide whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
52 additions
and
61 deletions
+52
-61
ChatRoomsFragment.kt
...ava/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+1
-1
PasswordPresenter.kt
...droid/settings/password/presentation/PasswordPresenter.kt
+4
-1
PasswordView.kt
...et/android/settings/password/presentation/PasswordView.kt
+1
-1
PasswordFragment.kt
...t/rocket/android/settings/password/ui/PasswordFragment.kt
+1
-1
IO.kt
app/src/main/java/chat/rocket/android/util/IO.kt
+2
-2
chatrooms.xml
app/src/main/res/menu/chatrooms.xml
+1
-1
strings.xml
app/src/main/res/values-de/strings.xml
+3
-4
strings.xml
app/src/main/res/values-es/strings.xml
+1
-2
strings.xml
app/src/main/res/values-fr/strings.xml
+1
-2
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+5
-6
strings.xml
app/src/main/res/values-it/strings.xml
+1
-2
strings.xml
app/src/main/res/values-ja/strings.xml
+1
-2
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+26
-28
strings.xml
app/src/main/res/values-ru-rRU/strings.xml
+1
-2
strings.xml
app/src/main/res/values-tr/strings.xml
+1
-2
strings.xml
app/src/main/res/values-uk/strings.xml
+1
-2
strings.xml
app/src/main/res/values/strings.xml
+1
-2
No files found.
app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
View file @
49eb678e
...
@@ -239,7 +239,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
...
@@ -239,7 +239,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
AlertDialog
.
Builder
(
context
)
AlertDialog
.
Builder
(
context
)
.
setTitle
(
R
.
string
.
dialog_sort_title
)
.
setTitle
(
R
.
string
.
dialog_sort_title
)
.
setView
(
dialogLayout
)
.
setView
(
dialogLayout
)
.
setPositiveButton
(
R
.
string
.
dialog_button_done
)
{
dialog
,
_
->
.
setPositiveButton
(
R
.
string
.
msg_sort
)
{
dialog
,
_
->
invalidateQueryOnSearch
()
invalidateQueryOnSearch
()
updateSort
()
updateSort
()
dialog
.
dismiss
()
dialog
.
dismiss
()
...
...
app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordPresenter.kt
View file @
49eb678e
...
@@ -8,6 +8,7 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
...
@@ -8,6 +8,7 @@ import chat.rocket.android.server.infraestructure.RocketChatClientFactory
import
chat.rocket.android.util.extension.launchUI
import
chat.rocket.android.util.extension.launchUI
import
chat.rocket.android.util.retryIO
import
chat.rocket.android.util.retryIO
import
chat.rocket.common.RocketChatException
import
chat.rocket.common.RocketChatException
import
chat.rocket.common.util.ifNull
import
chat.rocket.core.RocketChatClient
import
chat.rocket.core.RocketChatClient
import
chat.rocket.core.internal.rest.updateProfile
import
chat.rocket.core.internal.rest.updateProfile
import
javax.inject.Inject
import
javax.inject.Inject
...
@@ -36,7 +37,9 @@ class PasswordPresenter @Inject constructor(
...
@@ -36,7 +37,9 @@ class PasswordPresenter @Inject constructor(
}
}
}
catch
(
exception
:
RocketChatException
)
{
}
catch
(
exception
:
RocketChatException
)
{
analyticsManager
.
logResetPassword
(
false
)
analyticsManager
.
logResetPassword
(
false
)
view
.
showPasswordFailsUpdateMessage
(
exception
.
message
)
exception
.
message
?.
let
{
errorMessage
->
view
.
showPasswordFailsUpdateMessage
(
errorMessage
)
}
}
finally
{
}
finally
{
view
.
hideLoading
()
view
.
hideLoading
()
}
}
...
...
app/src/main/java/chat/rocket/android/settings/password/presentation/PasswordView.kt
View file @
49eb678e
...
@@ -12,5 +12,5 @@ interface PasswordView: LoadingView {
...
@@ -12,5 +12,5 @@ interface PasswordView: LoadingView {
* Shows a message when the user's password fails to update
* Shows a message when the user's password fails to update
* @param error is a String containing the failure message
* @param error is a String containing the failure message
*/
*/
fun
showPasswordFailsUpdateMessage
(
error
:
String
?
)
fun
showPasswordFailsUpdateMessage
(
error
:
String
)
}
}
app/src/main/java/chat/rocket/android/settings/password/ui/PasswordFragment.kt
View file @
49eb678e
...
@@ -96,7 +96,7 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
...
@@ -96,7 +96,7 @@ class PasswordFragment : Fragment(), PasswordView, ActionMode.Callback {
}
}
}
}
override
fun
showPasswordFailsUpdateMessage
(
error
:
String
?
)
{
override
fun
showPasswordFailsUpdateMessage
(
error
:
String
)
{
showToast
(
getString
(
R
.
string
.
msg_unable_to_update_password
,
error
))
showToast
(
getString
(
R
.
string
.
msg_unable_to_update_password
,
error
))
}
}
...
...
app/src/main/java/chat/rocket/android/util/IO.kt
View file @
49eb678e
...
@@ -9,7 +9,7 @@ import timber.log.Timber
...
@@ -9,7 +9,7 @@ import timber.log.Timber
import
kotlin.coroutines.experimental.coroutineContext
import
kotlin.coroutines.experimental.coroutineContext
const
val
DEFAULT_RETRY
=
3
const
val
DEFAULT_RETRY
=
3
private
const
val
DEFAULT_DB_RETRY
=
5
private
const
val
DEFAULT_DB_RETRY
=
1
5
suspend
fun
<
T
>
retryIO
(
suspend
fun
<
T
>
retryIO
(
description
:
String
=
"<missing description>"
,
description
:
String
=
"<missing description>"
,
...
@@ -42,7 +42,7 @@ suspend fun <T> retryDB(
...
@@ -42,7 +42,7 @@ suspend fun <T> retryDB(
description
:
String
=
"<missing description>"
,
description
:
String
=
"<missing description>"
,
times
:
Int
=
DEFAULT_DB_RETRY
,
times
:
Int
=
DEFAULT_DB_RETRY
,
initialDelay
:
Long
=
100
,
// 0.1 second
initialDelay
:
Long
=
100
,
// 0.1 second
maxDelay
:
Long
=
500
,
// 0
.5 second
maxDelay
:
Long
=
1500
,
// 1
.5 second
factor
:
Double
=
1.2
,
factor
:
Double
=
1.2
,
block
:
suspend
()
->
T
):
T
block
:
suspend
()
->
T
):
T
{
{
...
...
app/src/main/res/menu/chatrooms.xml
View file @
49eb678e
...
@@ -14,7 +14,7 @@
...
@@ -14,7 +14,7 @@
<item
<item
android:id=
"@+id/action_sort"
android:id=
"@+id/action_sort"
android:icon=
"@drawable/ic_sort"
android:icon=
"@drawable/ic_sort"
android:title=
"@string/m
enu_chatroom
_sort"
android:title=
"@string/m
sg
_sort"
app:showAsAction=
"ifRoom"
/>
app:showAsAction=
"ifRoom"
/>
</menu>
</menu>
app/src/main/res/values-de/strings.xml
View file @
49eb678e
...
@@ -164,8 +164,8 @@
...
@@ -164,8 +164,8 @@
<string
name=
"msg_unable_to_update_password"
>
Unable to update password. Error message: %1$s
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_unable_to_update_password"
>
Unable to update password. Error message: %1$s
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_password_updated_successfully"
>
Password updated successfully
</string>
<!-- TODO - Add proper translation -->
<string
name=
"msg_password_updated_successfully"
>
Password updated successfully
</string>
<!-- TODO - Add proper translation -->
<plurals
name=
"msg_reacted_with_"
>
<plurals
name=
"msg_reacted_with_"
>
<item
quantity=
"one"
>
%
1 $ s reagierte mit% 2 $
s
</item>
<item
quantity=
"one"
>
%
1$ s reagierte mit %2$
s
</item>
<item
quantity=
"other"
>
%
1 $ s reagierte mit% 2 $
s
</item>
<item
quantity=
"other"
>
%
1$s reagierte mit %2$
s
</item>
</plurals>
</plurals>
<!-- Create channel messages -->
<!-- Create channel messages -->
...
@@ -306,13 +306,12 @@
...
@@ -306,13 +306,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Standart Hautton
</string>
<string
name=
"alert_title_default_skin_tone"
>
Standart Hautton
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Sortiere
</string>
<string
name=
"m
sg
_sort"
>
Sortiere
</string>
<string
name=
"dialog_sort_title"
>
Sortieren nach
</string>
<string
name=
"dialog_sort_title"
>
Sortieren nach
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alphabetisch
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alphabetisch
</string>
<string
name=
"dialog_sort_by_activity"
>
Aktivität
</string>
<string
name=
"dialog_sort_by_activity"
>
Aktivität
</string>
<string
name=
"dialog_group_by_type"
>
Räume nach Typ
</string>
<string
name=
"dialog_group_by_type"
>
Räume nach Typ
</string>
<string
name=
"dialog_group_favourites"
>
Räume nach Favoriten
</string>
<string
name=
"dialog_group_favourites"
>
Räume nach Favoriten
</string>
<string
name=
"dialog_button_done"
>
Erledigt
</string>
<string
name=
"chatroom_header"
>
Kopf
</string>
<string
name=
"chatroom_header"
>
Kopf
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-es/strings.xml
View file @
49eb678e
...
@@ -305,13 +305,12 @@
...
@@ -305,13 +305,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Tono de piel predeterminado
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tono de piel predeterminado
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Ordenar
</string>
<string
name=
"m
sg
_sort"
>
Ordenar
</string>
<string
name=
"dialog_sort_title"
>
Ordenar por
</string>
<string
name=
"dialog_sort_title"
>
Ordenar por
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabético
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabético
</string>
<string
name=
"dialog_sort_by_activity"
>
Actividad
</string>
<string
name=
"dialog_sort_by_activity"
>
Actividad
</string>
<string
name=
"dialog_group_by_type"
>
Agrupar por tipo
</string>
<string
name=
"dialog_group_by_type"
>
Agrupar por tipo
</string>
<string
name=
"dialog_group_favourites"
>
Agrupar favoritos
</string>
<string
name=
"dialog_group_favourites"
>
Agrupar favoritos
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
Cabezazo
</string>
<string
name=
"chatroom_header"
>
Cabezazo
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-fr/strings.xml
View file @
49eb678e
...
@@ -310,13 +310,12 @@
...
@@ -310,13 +310,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Tonalité de peau par défaut
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tonalité de peau par défaut
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Trier
</string>
<string
name=
"m
sg
_sort"
>
Trier
</string>
<string
name=
"dialog_sort_title"
>
Trier par
</string>
<string
name=
"dialog_sort_title"
>
Trier par
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alphabétique
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alphabétique
</string>
<string
name=
"dialog_sort_by_activity"
>
Activité
</string>
<string
name=
"dialog_sort_by_activity"
>
Activité
</string>
<string
name=
"dialog_group_by_type"
>
Grouper par type
</string>
<string
name=
"dialog_group_by_type"
>
Grouper par type
</string>
<string
name=
"dialog_group_favourites"
>
Grouper favoris
</string>
<string
name=
"dialog_group_favourites"
>
Grouper favoris
</string>
<string
name=
"dialog_button_done"
>
Ok
</string>
<string
name=
"chatroom_header"
>
Entête
</string>
<string
name=
"chatroom_header"
>
Entête
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-hi-rIN/strings.xml
View file @
49eb678e
...
@@ -184,12 +184,12 @@
...
@@ -184,12 +184,12 @@
<string
name=
"msg_no_topic"
>
कोई विषय नहीं जोड़ा गया
</string>
<string
name=
"msg_no_topic"
>
कोई विषय नहीं जोड़ा गया
</string>
<string
name=
"msg_no_announcement"
>
कोई घोषणा नहीं जोड़ा गया
</string>
<string
name=
"msg_no_announcement"
>
कोई घोषणा नहीं जोड़ा गया
</string>
<string
name=
"msg_no_description"
>
कोई विवरण नहीं जोड़ा गया
</string>
<string
name=
"msg_no_description"
>
कोई विवरण नहीं जोड़ा गया
</string>
<string
name=
"msg_unable_to_update_password"
>
पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश:
%
1$s
</string>
<string
name=
"msg_unable_to_update_password"
>
पासवर्ड अपडेट करने में असमर्थ। त्रुटि संदेश:
%
1$s
</string>
<string
name=
"msg_password_updated_successfully"
>
पासवर्ड सफलतापूर्वक अपडेट किया गया
</string>
<string
name=
"msg_password_updated_successfully"
>
पासवर्ड सफलतापूर्वक अपडेट किया गया
</string>
<plurals
name=
"msg_reacted_with_"
>
<plurals
name=
"msg_reacted_with_"
>
<item
quantity=
"one"
>
%
1 $ s ने% 2 $ %d
s के साथ प्रतिक्रिया व्यक्त की
</item>
<item
quantity=
"one"
>
%
1$s ने %2$
s के साथ प्रतिक्रिया व्यक्त की
</item>
<item
quantity=
"few"
>
%
1 $ s ने% 2 $
s के साथ प्रतिक्रिया व्यक्त की
</item>
<item
quantity=
"few"
>
%
1$s ने %2$
s के साथ प्रतिक्रिया व्यक्त की
</item>
<item
quantity=
"many"
>
%
1 $ s ने% 2 $
s के साथ प्रतिक्रिया व्यक्त की
</item>
<item
quantity=
"many"
>
%
1$s ने %2$
s के साथ प्रतिक्रिया व्यक्त की
</item>
</plurals>
</plurals>
<!-- Preferences messages -->
<!-- Preferences messages -->
...
@@ -310,13 +310,12 @@
...
@@ -310,13 +310,12 @@
<string
name=
"alert_title_default_skin_tone"
>
डिफ़ॉल्ट त्वचा टोन
</string>
<string
name=
"alert_title_default_skin_tone"
>
डिफ़ॉल्ट त्वचा टोन
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
क्रम
</string>
<string
name=
"m
sg
_sort"
>
क्रम
</string>
<string
name=
"dialog_sort_title"
>
द्वारा सॉर्ट करें
</string>
<string
name=
"dialog_sort_title"
>
द्वारा सॉर्ट करें
</string>
<string
name=
"dialog_sort_by_alphabet"
>
वर्णानुक्रम
</string>
<string
name=
"dialog_sort_by_alphabet"
>
वर्णानुक्रम
</string>
<string
name=
"dialog_sort_by_activity"
>
गतिविधि
</string>
<string
name=
"dialog_sort_by_activity"
>
गतिविधि
</string>
<string
name=
"dialog_group_by_type"
>
प्रकार के आधार पर समूह
</string>
<string
name=
"dialog_group_by_type"
>
प्रकार के आधार पर समूह
</string>
<string
name=
"dialog_group_favourites"
>
पसंदीदा समूह
</string>
<string
name=
"dialog_group_favourites"
>
पसंदीदा समूह
</string>
<string
name=
"dialog_button_done"
>
पूर्ण
</string>
<string
name=
"chatroom_header"
>
हैडर
</string>
<string
name=
"chatroom_header"
>
हैडर
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-it/strings.xml
View file @
49eb678e
...
@@ -306,13 +306,12 @@
...
@@ -306,13 +306,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Default skin tone
</string>
<string
name=
"alert_title_default_skin_tone"
>
Default skin tone
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Ordinare
</string>
<string
name=
"m
sg
_sort"
>
Ordinare
</string>
<string
name=
"dialog_sort_title"
>
Ordinare per
</string>
<string
name=
"dialog_sort_title"
>
Ordinare per
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabeto
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabeto
</string>
<string
name=
"dialog_sort_by_activity"
>
Attività
</string>
<string
name=
"dialog_sort_by_activity"
>
Attività
</string>
<string
name=
"dialog_group_by_type"
>
Raggruppa per tipo
</string>
<string
name=
"dialog_group_by_type"
>
Raggruppa per tipo
</string>
<string
name=
"dialog_group_favourites"
>
Raggruppa preferiti
</string>
<string
name=
"dialog_group_favourites"
>
Raggruppa preferiti
</string>
<string
name=
"dialog_button_done"
>
Fatto
</string>
<string
name=
"chatroom_header"
>
Intestazione
</string>
<string
name=
"chatroom_header"
>
Intestazione
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-ja/strings.xml
View file @
49eb678e
...
@@ -312,14 +312,13 @@
...
@@ -312,14 +312,13 @@
<string
name=
"alert_title_default_skin_tone"
>
デフォルトスキントークン
</string>
<string
name=
"alert_title_default_skin_tone"
>
デフォルトスキントークン
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
ソート
</string>
<string
name=
"m
sg
_sort"
>
ソート
</string>
<string
name=
"dialog_sort_title"
>
ソート
</string>
<string
name=
"dialog_sort_title"
>
ソート
</string>
<string
name=
"dialog_sort_by_alphabet"
>
アルファベット順
</string>
<string
name=
"dialog_sort_by_alphabet"
>
アルファベット順
</string>
<string
name=
"dialog_sort_by_activity"
>
アクティビティ順
</string>
<string
name=
"dialog_sort_by_activity"
>
アクティビティ順
</string>
<string
name=
"dialog_group_by_type"
>
グループ別
</string>
<string
name=
"dialog_group_by_type"
>
グループ別
</string>
<string
name=
"dialog_group_favourites"
>
お気に入りのグループ
</string>
<string
name=
"dialog_group_favourites"
>
お気に入りのグループ
</string>
<string
name=
"chatroom_header"
>
ヘッダ
</string>
<string
name=
"chatroom_header"
>
ヘッダ
</string>
<string
name=
"dialog_button_done"
>
完了
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
49eb678e
...
@@ -22,9 +22,9 @@
...
@@ -22,9 +22,9 @@
<string
name=
"title_update_profile"
>
Editar perfil
</string>
<string
name=
"title_update_profile"
>
Editar perfil
</string>
<string
name=
"title_about"
>
Sobre
</string>
<string
name=
"title_about"
>
Sobre
</string>
<string
name=
"title_create_channel"
>
Criar chat
</string>
<string
name=
"title_create_channel"
>
Criar chat
</string>
<string
name=
"title_licence"
>
Licença
</string>
<!-- TODO Add translation -->
<string
name=
"title_licence"
>
Licença
</string>
<string
name=
"title_are_you_sure"
>
Você tem certeza?
</string>
<string
name=
"title_are_you_sure"
>
Você tem certeza?
</string>
<string
name=
"title_channel_details"
>
Channel Details
</string>
<!-- TODO add translation --
>
<string
name=
"title_channel_details"
>
Detalhes do canal
</string
>
<string
name=
"title_topic"
>
Tópico
</string>
<string
name=
"title_topic"
>
Tópico
</string>
<string
name=
"title_announcement"
>
Anúncio
</string>
<string
name=
"title_announcement"
>
Anúncio
</string>
<string
name=
"title_description"
>
Descrição
</string>
<string
name=
"title_description"
>
Descrição
</string>
...
@@ -150,29 +150,30 @@
...
@@ -150,29 +150,30 @@
<string
name=
"msg_send"
>
Enviar
</string>
<string
name=
"msg_send"
>
Enviar
</string>
<string
name=
"msg_delete_message"
>
Remove mensagem
</string>
<string
name=
"msg_delete_message"
>
Remove mensagem
</string>
<string
name=
"msg_delete_description"
>
Tem certeza que quer apagar esta mensagem?
</string>
<string
name=
"msg_delete_description"
>
Tem certeza que quer apagar esta mensagem?
</string>
<string
name=
"msg_welcome_to_rocket_chat"
>
Welcome to Rocket.Chat
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_welcome_to_rocket_chat"
>
Bem-vindo ao Rocket.Chat
</string
>
<string
name=
"msg_team_communication"
>
Open Source Communication
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_team_communication"
>
Comunicação Open Source
</string
>
<string
name=
"msg_login_with_email"
>
Login with
<b>
e-mail
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_login_with_email"
>
Fazer login com
<b>
e-mail
</b></string
>
<string
name=
"msg_create_account"
>
Cr
eate an account
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_create_account"
>
Cr
iar conta
</string
>
<string
name=
"msg_continue_with_facebook"
>
Continu
e with
<b>
Facebook
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_continue_with_facebook"
>
Continu
ar com
<b>
Facebook
</b></string
>
<string
name=
"msg_continue_with_github"
>
Continu
e with
<b>
Github
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_continue_with_github"
>
Continu
ar com
<b>
Github
</b></string
>
<string
name=
"msg_continue_with_google"
>
Continu
e with
<b>
Google
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_continue_with_google"
>
Continu
ar com
<b>
Google
</b></string
>
<string
name=
"msg_continue_with_linkedin"
>
Continu
e with
<b>
Linkedin
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_continue_with_linkedin"
>
Continu
ar com
<b>
Linkedin
</b></string
>
<string
name=
"msg_continue_with_gitlab"
>
Continu
e with
<b>
GitLab
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_continue_with_gitlab"
>
Continu
ar com
<b>
GitLab
</b></string
>
<string
name=
"msg_continue_with_wordpress"
>
Continu
e with
<b>
WordPress
</b></string>
<!-- TODO Add translation --
>
<string
name=
"msg_continue_with_wordpress"
>
Continu
ar com
<b>
WordPress
</b></string
>
<string
name=
"msg_two_factor_authentication"
>
Two-factor Authentication
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_two_factor_authentication"
>
Autenticação de dois fatores
</string
>
<string
name=
"msg__your_2fa_code"
>
What’s your 2FA code?
</string>
<!-- TODO Add translation --
>
<string
name=
"msg__your_2fa_code"
>
Qual é o seu código da autenticação de dois fatores?
</string
>
<string
name=
"msg_view_more"
>
visualizar mais
</string>
<string
name=
"msg_view_more"
>
visualizar mais
</string>
<string
name=
"msg_view_less"
>
visualizar menos
</string>
<string
name=
"msg_view_less"
>
visualizar menos
</string>
<string
name=
"msg_permalink_copied"
>
Permalink copiado
</string>
<string
name=
"msg_permalink_copied"
>
Permalink copiado
</string>
<string
name=
"msg_send_email"
>
Enviar e-mail
</string>
<string
name=
"msg_send_email"
>
Enviar e-mail
</string>
<string
name=
"msg_android_app_support"
>
Suporte ao aplicativo Android
</string>
<string
name=
"msg_android_app_support"
>
Suporte ao aplicativo Android
</string>
<string
name=
"msg_muted_on_this_channel"
>
Você está silenciado neste canal
</string>
<string
name=
"msg_muted_on_this_channel"
>
Você está silenciado neste canal
</string>
<string
name=
"msg_no_topic"
>
N
o topic added
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_no_topic"
>
N
enhum tópico adicionado
</string
>
<string
name=
"msg_no_announcement"
>
N
o announcement added
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_no_announcement"
>
N
enhum anúncio adicionado
</string
>
<string
name=
"msg_no_description"
>
N
o description added
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_no_description"
>
N
enhuma descrição adicionada
</string
>
<string
name=
"msg_unable_to_update_password"
>
Não foi possível atualizar a senha. Mensagem de erro: %1$s
</string>
<string
name=
"msg_unable_to_update_password"
>
Não foi possível atualizar a senha. Mensagem de erro: %1$s
</string>
<string
name=
"msg_password_updated_successfully"
>
Senha alterada com sucesso
</string>
<string
name=
"msg_password_updated_successfully"
>
Senha alterada com sucesso
</string>
<string
name=
"msg_sort"
>
Ordenar
</string>
<plurals
name=
"msg_reacted_with_"
>
<plurals
name=
"msg_reacted_with_"
>
<item
quantity=
"one"
>
%1$s reagiu com %2$s
</item>
<item
quantity=
"one"
>
%1$s reagiu com %2$s
</item>
<item
quantity=
"other"
>
%1$s reagiram com %2$s
</item>
<item
quantity=
"other"
>
%1$s reagiram com %2$s
</item>
...
@@ -194,7 +195,7 @@
...
@@ -194,7 +195,7 @@
<string
name=
"msg_analytics_tracking"
>
Rastreamento de análises
</string>
<string
name=
"msg_analytics_tracking"
>
Rastreamento de análises
</string>
<string
name=
"msg_send_analytics_tracking"
>
Envie estatísticas anônimas para ajudar a melhorar este app
</string>
<string
name=
"msg_send_analytics_tracking"
>
Envie estatísticas anônimas para ajudar a melhorar este app
</string>
<string
name=
"msg_do_not_send_analytics_tracking"
>
Não envie estatísticas anônimas para ajudar a melhorar este app
</string>
<string
name=
"msg_do_not_send_analytics_tracking"
>
Não envie estatísticas anônimas para ajudar a melhorar este app
</string>
<string
name=
"msg_not_applicable_since_it_is_a_foss_version"
>
N
ot aplicável devido a versão do aplicativo ser FOSS
</string>
<!-- TODO Add translation --
>
<string
name=
"msg_not_applicable_since_it_is_a_foss_version"
>
N
ão aplicável devido a versão do aplicativo ser FOSS
</string
>
<!-- System messages -->
<!-- System messages -->
<string
name=
"message_room_name_changed"
>
Nome da sala alterado para: %1$s por %2$s
</string>
<string
name=
"message_room_name_changed"
>
Nome da sala alterado para: %1$s por %2$s
</string>
...
@@ -219,29 +220,28 @@
...
@@ -219,29 +220,28 @@
<string
name=
"action_msg_copy"
>
Copiar
</string>
<string
name=
"action_msg_copy"
>
Copiar
</string>
<string
name=
"action_msg_quote"
>
Citar
</string>
<string
name=
"action_msg_quote"
>
Citar
</string>
<string
name=
"action_msg_delete"
>
Remover
</string>
<string
name=
"action_msg_delete"
>
Remover
</string>
<string
name=
"action_msg_pin"
>
Pin
ar mensagem
</string>
<string
name=
"action_msg_pin"
>
Fix
ar mensagem
</string>
<string
name=
"action_msg_unpin"
>
Des
pin
ar mensagem
</string>
<string
name=
"action_msg_unpin"
>
Des
fix
ar mensagem
</string>
<string
name=
"action_msg_star"
>
Favoritar mensagem
</string>
<string
name=
"action_msg_star"
>
Marcar como favorita
</string>
<string
name=
"action_msg_unstar"
>
Des
favoritar messagem
</string>
<string
name=
"action_msg_unstar"
>
Des
marcar como favorita
</string>
<string
name=
"action_msg_share"
>
Compartilhar
</string>
<string
name=
"action_msg_share"
>
Compartilhar
</string>
<string
name=
"action_title_editing"
>
Editando mensagem
</string>
<string
name=
"action_title_editing"
>
Editando mensagem
</string>
<string
name=
"action_msg_add_reaction"
>
Adicionar reação
</string>
<string
name=
"action_msg_add_reaction"
>
Adicionar reação
</string>
<string
name=
"action_msg_copy_permalink"
>
Copiar permalink
</string>
<string
name=
"action_msg_copy_permalink"
>
Copiar permalink
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_report"
>
Reportar
</string>
<string
name=
"action_msg_report"
>
Reportar
</string>
<!-- Permission messages -->
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Edição não permitida
</string>
<string
name=
"permission_editing_not_allowed"
>
Edição não permitida
</string>
<string
name=
"permission_deleting_not_allowed"
>
Remoção não permitida
</string>
<string
name=
"permission_deleting_not_allowed"
>
Remoção não permitida
</string>
<string
name=
"permission_pinning_not_allowed"
>
Pinagem não permitida
</string>
<string
name=
"permission_pinning_not_allowed"
>
Pinagem não permitida
</string>
<string
name=
"permission_starring_not_allowed"
>
Favoritar
não permitido
</string>
<string
name=
"permission_starring_not_allowed"
>
Marcar como favorita
não permitido
</string>
<!-- Search message -->
<!-- Search message -->
<string
name=
"title_search_message"
>
Procurar mensagem
</string>
<string
name=
"title_search_message"
>
Procurar mensagem
</string>
<!-- Favorite/Unfavorite chat room -->
<!-- Favorite/Unfavorite chat room -->
<string
name=
"title_favorite_chat"
>
Favoritar canal
</string>
<string
name=
"title_favorite_chat"
>
Marcar canal como favorito
</string>
<string
name=
"title_unfavorite_chat"
>
Des
favoritar canal
</string>
<string
name=
"title_unfavorite_chat"
>
Des
marcar canal como favorito
</string>
<!-- Members List -->
<!-- Members List -->
<string
name=
"title_members_list"
>
Membros
</string>
<string
name=
"title_members_list"
>
Membros
</string>
...
@@ -310,13 +310,11 @@
...
@@ -310,13 +310,11 @@
<string
name=
"alert_title_default_skin_tone"
>
Tom de pele padrão
</string>
<string
name=
"alert_title_default_skin_tone"
>
Tom de pele padrão
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"menu_chatroom_sort"
>
Ordenar
</string>
<string
name=
"dialog_sort_title"
>
Ordenar por
</string>
<string
name=
"dialog_sort_title"
>
Ordenar por
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabeticamente
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabeticamente
</string>
<string
name=
"dialog_sort_by_activity"
>
Atividade
</string>
<string
name=
"dialog_sort_by_activity"
>
Atividade
</string>
<string
name=
"dialog_group_by_type"
>
Agrupar por tipo
</string>
<string
name=
"dialog_group_by_type"
>
Agrupar por tipo
</string>
<string
name=
"dialog_group_favourites"
>
Grupos favoritos
</string>
<string
name=
"dialog_group_favourites"
>
Grupos favoritos
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<!-- TODO Add translation -->
<string
name=
"chatroom_header"
>
Cabeçalho
</string>
<string
name=
"chatroom_header"
>
Cabeçalho
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-ru-rRU/strings.xml
View file @
49eb678e
...
@@ -307,13 +307,12 @@
...
@@ -307,13 +307,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Тон кожи по умолчанию
</string>
<string
name=
"alert_title_default_skin_tone"
>
Тон кожи по умолчанию
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Сортировать
</string>
<string
name=
"m
sg
_sort"
>
Сортировать
</string>
<string
name=
"dialog_sort_title"
>
Сортировать по
</string>
<string
name=
"dialog_sort_title"
>
Сортировать по
</string>
<string
name=
"dialog_sort_by_alphabet"
>
По алфавиту
</string>
<string
name=
"dialog_sort_by_alphabet"
>
По алфавиту
</string>
<string
name=
"dialog_sort_by_activity"
>
По активности
</string>
<string
name=
"dialog_sort_by_activity"
>
По активности
</string>
<string
name=
"dialog_group_by_type"
>
Группировать по типу
</string>
<string
name=
"dialog_group_by_type"
>
Группировать по типу
</string>
<string
name=
"dialog_group_favourites"
>
Группировать избранное
</string>
<string
name=
"dialog_group_favourites"
>
Группировать избранное
</string>
<string
name=
"dialog_button_done"
>
Ок
</string>
<string
name=
"chatroom_header"
>
Заголовок
</string>
<string
name=
"chatroom_header"
>
Заголовок
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-tr/strings.xml
View file @
49eb678e
...
@@ -312,13 +312,12 @@
...
@@ -312,13 +312,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Varsayılan tasarım tonu
</string>
<string
name=
"alert_title_default_skin_tone"
>
Varsayılan tasarım tonu
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Sırala
</string>
<string
name=
"m
sg
_sort"
>
Sırala
</string>
<string
name=
"dialog_sort_title"
>
Sırala
</string>
<string
name=
"dialog_sort_title"
>
Sırala
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabetik
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alfabetik
</string>
<string
name=
"dialog_sort_by_activity"
>
Aktiviteye Göre
</string>
<string
name=
"dialog_sort_by_activity"
>
Aktiviteye Göre
</string>
<string
name=
"dialog_group_by_type"
>
Türüne göre grupla
</string>
<string
name=
"dialog_group_by_type"
>
Türüne göre grupla
</string>
<string
name=
"dialog_group_favourites"
>
Favorileri grupla
</string>
<string
name=
"dialog_group_favourites"
>
Favorileri grupla
</string>
<string
name=
"dialog_button_done"
>
Tamam
</string>
<string
name=
"chatroom_header"
>
Başlık
</string>
<string
name=
"chatroom_header"
>
Başlık
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values-uk/strings.xml
View file @
49eb678e
...
@@ -308,13 +308,12 @@
...
@@ -308,13 +308,12 @@
<string
name=
"alert_title_default_skin_tone"
>
Тон шкіри за замовчуванням
</string>
<string
name=
"alert_title_default_skin_tone"
>
Тон шкіри за замовчуванням
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Сортувати
</string>
<string
name=
"m
sg
_sort"
>
Сортувати
</string>
<string
name=
"dialog_sort_title"
>
Сортувати за
</string>
<string
name=
"dialog_sort_title"
>
Сортувати за
</string>
<string
name=
"dialog_sort_by_alphabet"
>
За алфавітом
</string>
<string
name=
"dialog_sort_by_alphabet"
>
За алфавітом
</string>
<string
name=
"dialog_sort_by_activity"
>
За активністю
</string>
<string
name=
"dialog_sort_by_activity"
>
За активністю
</string>
<string
name=
"dialog_group_by_type"
>
Групувати за типом
</string>
<string
name=
"dialog_group_by_type"
>
Групувати за типом
</string>
<string
name=
"dialog_group_favourites"
>
Групувати обране
</string>
<string
name=
"dialog_group_favourites"
>
Групувати обране
</string>
<string
name=
"dialog_button_done"
>
Ок
</string>
<string
name=
"chatroom_header"
>
Заголовок
</string>
<string
name=
"chatroom_header"
>
Заголовок
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
app/src/main/res/values/strings.xml
View file @
49eb678e
...
@@ -323,13 +323,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -323,13 +323,12 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"alert_title_default_skin_tone"
>
Default skin tone
</string>
<string
name=
"alert_title_default_skin_tone"
>
Default skin tone
</string>
<!-- Sorting and grouping-->
<!-- Sorting and grouping-->
<string
name=
"m
enu_chatroom
_sort"
>
Sort
</string>
<string
name=
"m
sg
_sort"
>
Sort
</string>
<string
name=
"dialog_sort_title"
>
Sort by
</string>
<string
name=
"dialog_sort_title"
>
Sort by
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alphabetical
</string>
<string
name=
"dialog_sort_by_alphabet"
>
Alphabetical
</string>
<string
name=
"dialog_sort_by_activity"
>
Activity
</string>
<string
name=
"dialog_sort_by_activity"
>
Activity
</string>
<string
name=
"dialog_group_by_type"
>
Group by type
</string>
<string
name=
"dialog_group_by_type"
>
Group by type
</string>
<string
name=
"dialog_group_favourites"
>
Group favourites
</string>
<string
name=
"dialog_group_favourites"
>
Group favourites
</string>
<string
name=
"dialog_button_done"
>
Done
</string>
<string
name=
"chatroom_header"
>
Header
</string>
<string
name=
"chatroom_header"
>
Header
</string>
<!--ChatRooms Headers-->
<!--ChatRooms Headers-->
...
...
Write
Preview
Markdown
is supported
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