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
8a0e24bf
Commit
8a0e24bf
authored
Jan 15, 2019
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into fix#1938
parents
42def0a0
31c879b2
Changes
16
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
412 additions
and
40 deletions
+412
-40
build.gradle
app/build.gradle
+1
-1
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+2
-2
Dialog.kt
app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt
+6
-6
ChatRoomsFragment.kt
...ava/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
+11
-9
MainActivity.kt
...src/main/java/chat/rocket/android/main/ui/MainActivity.kt
+17
-1
ProfileFragment.kt
...in/java/chat/rocket/android/profile/ui/ProfileFragment.kt
+12
-10
SettingsFragment.kt
.../java/chat/rocket/android/settings/ui/SettingsFragment.kt
+9
-5
strings.xml
app/src/main/res/values-de/strings.xml
+1
-1
strings.xml
app/src/main/res/values-es/strings.xml
+1
-0
strings.xml
app/src/main/res/values-fr/strings.xml
+1
-0
strings.xml
app/src/main/res/values-ja/strings.xml
+1
-3
strings.xml
app/src/main/res/values-pt-rBR/strings.xml
+1
-0
strings.xml
app/src/main/res/values-tr/strings.xml
+1
-1
strings.xml
app/src/main/res/values-uk/strings.xml
+1
-0
strings.xml
app/src/main/res/values-zh-rCN/strings.xml
+346
-0
strings.xml
app/src/main/res/values/strings.xml
+1
-1
No files found.
app/build.gradle
View file @
8a0e24bf
...
@@ -16,7 +16,7 @@ android {
...
@@ -16,7 +16,7 @@ android {
applicationId
"chat.rocket.android"
applicationId
"chat.rocket.android"
minSdkVersion
versions
.
minSdk
minSdkVersion
versions
.
minSdk
targetSdkVersion
versions
.
targetSdk
targetSdkVersion
versions
.
targetSdk
versionCode
205
6
versionCode
205
7
versionName
"3.2.0"
versionName
"3.2.0"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
testInstrumentationRunner
"androidx.test.runner.AndroidJUnitRunner"
multiDexEnabled
true
multiDexEnabled
true
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
8a0e24bf
package
chat.rocket.android.chatroom.ui
package
chat.rocket.android.chatroom.ui
import
android.app.Activity
import
android.app.Activity
import
android.app.AlertDialog
import
android
x.appcompat
.app.AlertDialog
import
android.content.ClipData
import
android.content.ClipData
import
android.content.ClipboardManager
import
android.content.ClipboardManager
import
android.content.Context
import
android.content.Context
...
@@ -200,7 +200,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -200,7 +200,7 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
private
var
verticalScrollOffset
=
AtomicInteger
(
0
)
private
var
verticalScrollOffset
=
AtomicInteger
(
0
)
private
val
dialogView
by
lazy
{
View
.
inflate
(
context
,
R
.
layout
.
file_attachments_dialog
,
null
)
}
private
val
dialogView
by
lazy
{
View
.
inflate
(
context
,
R
.
layout
.
file_attachments_dialog
,
null
)
}
internal
val
alertDialog
by
lazy
{
AlertDialog
.
Builder
(
activity
).
setView
(
dialogView
).
create
()
}
internal
val
alertDialog
by
lazy
{
activity
?.
let
{
AlertDialog
.
Builder
(
it
).
setView
(
dialogView
).
create
()
}
}
internal
val
imagePreview
by
lazy
{
dialogView
.
findViewById
<
ImageView
>(
R
.
id
.
image_preview
)
}
internal
val
imagePreview
by
lazy
{
dialogView
.
findViewById
<
ImageView
>(
R
.
id
.
image_preview
)
}
internal
val
sendButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_send
)
}
internal
val
sendButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_send
)
}
internal
val
cancelButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_cancel
)
}
internal
val
cancelButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_cancel
)
}
...
...
app/src/main/java/chat/rocket/android/chatroom/ui/Dialog.kt
View file @
8a0e24bf
...
@@ -75,10 +75,10 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
...
@@ -75,10 +75,10 @@ fun ChatRoomFragment.showFileAttachmentDialog(uri: Uri) {
(
citation
?:
""
)
+
description
.
text
.
toString
()
(
citation
?:
""
)
+
description
.
text
.
toString
()
)
)
}
}
alertDialog
.
dismiss
()
alertDialog
?
.
dismiss
()
}
}
cancelButton
.
setOnClickListener
{
alertDialog
.
dismiss
()
}
cancelButton
.
setOnClickListener
{
alertDialog
?
.
dismiss
()
}
alertDialog
.
show
()
alertDialog
?
.
show
()
}
}
fun
ChatRoomFragment
.
showDrawAttachmentDialog
(
byteArray
:
ByteArray
)
{
fun
ChatRoomFragment
.
showDrawAttachmentDialog
(
byteArray
:
ByteArray
)
{
...
@@ -92,9 +92,9 @@ fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
...
@@ -92,9 +92,9 @@ fun ChatRoomFragment.showDrawAttachmentDialog(byteArray: ByteArray) {
byteArray
,
byteArray
,
(
citation
?:
""
)
+
description
.
text
.
toString
()
(
citation
?:
""
)
+
description
.
text
.
toString
()
)
)
alertDialog
.
dismiss
()
alertDialog
?
.
dismiss
()
}
}
cancelButton
.
setOnClickListener
{
alertDialog
.
dismiss
()
}
cancelButton
.
setOnClickListener
{
alertDialog
?
.
dismiss
()
}
alertDialog
.
show
()
alertDialog
?
.
show
()
}
}
\ No newline at end of file
app/src/main/java/chat/rocket/android/chatrooms/ui/ChatRoomsFragment.kt
View file @
8a0e24bf
package
chat.rocket.android.chatrooms.ui
package
chat.rocket.android.chatrooms.ui
import
android.app.AlertDialog
import
android
x.appcompat
.app.AlertDialog
import
android.app.ProgressDialog
import
android.app.ProgressDialog
import
android.os.Bundle
import
android.os.Bundle
import
android.os.Handler
import
android.os.Handler
...
@@ -236,7 +236,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
...
@@ -236,7 +236,8 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
)
)
}
}
AlertDialog
.
Builder
(
context
)
context
?.
let
{
AlertDialog
.
Builder
(
it
)
.
setTitle
(
R
.
string
.
dialog_sort_title
)
.
setTitle
(
R
.
string
.
dialog_sort_title
)
.
setView
(
dialogLayout
)
.
setView
(
dialogLayout
)
.
setPositiveButton
(
R
.
string
.
msg_sort
)
{
dialog
,
_
->
.
setPositiveButton
(
R
.
string
.
msg_sort
)
{
dialog
,
_
->
...
@@ -246,6 +247,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
...
@@ -246,6 +247,7 @@ class ChatRoomsFragment : Fragment(), ChatRoomsView {
}.
show
()
}.
show
()
}
}
}
}
}
return
super
.
onOptionsItemSelected
(
item
)
return
super
.
onOptionsItemSelected
(
item
)
}
}
...
...
app/src/main/java/chat/rocket/android/main/ui/MainActivity.kt
View file @
8a0e24bf
...
@@ -2,7 +2,7 @@ package chat.rocket.android.main.ui
...
@@ -2,7 +2,7 @@ package chat.rocket.android.main.ui
import
DrawableHelper
import
DrawableHelper
import
android.app.Activity
import
android.app.Activity
import
android.app.AlertDialog
import
android
x.appcompat
.app.AlertDialog
import
android.app.ProgressDialog
import
android.app.ProgressDialog
import
android.os.Bundle
import
android.os.Bundle
import
androidx.annotation.IdRes
import
androidx.annotation.IdRes
...
@@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment
...
@@ -13,6 +13,7 @@ import androidx.fragment.app.Fragment
import
androidx.recyclerview.widget.LinearLayoutManager
import
androidx.recyclerview.widget.LinearLayoutManager
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.BuildConfig
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.chatrooms.ui.ChatRoomsFragment
import
chat.rocket.android.main.adapter.AccountsAdapter
import
chat.rocket.android.main.adapter.AccountsAdapter
import
chat.rocket.android.main.adapter.Selector
import
chat.rocket.android.main.adapter.Selector
import
chat.rocket.android.main.presentation.MainPresenter
import
chat.rocket.android.main.presentation.MainPresenter
...
@@ -98,6 +99,21 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
...
@@ -98,6 +99,21 @@ class MainActivity : AppCompatActivity(), MainView, HasActivityInjector,
}
}
}
}
override
fun
onBackPressed
()
{
if
(
drawer_layout
.
isDrawerOpen
(
GravityCompat
.
START
))
{
closeDrawer
()
}
else
{
supportFragmentManager
.
findFragmentById
(
R
.
id
.
fragment_container
)
?.
let
{
if
(
it
!
is
ChatRoomsFragment
&&
supportFragmentManager
.
backStackEntryCount
==
0
)
{
presenter
.
toChatList
(
chatRoomId
)
setCheckedNavDrawerItem
(
R
.
id
.
menu_action_chats
)
}
else
{
super
.
onBackPressed
()
}
}
}
}
override
fun
activityInjector
():
AndroidInjector
<
Activity
>
=
activityDispatchingAndroidInjector
override
fun
activityInjector
():
AndroidInjector
<
Activity
>
=
activityDispatchingAndroidInjector
override
fun
supportFragmentInjector
():
AndroidInjector
<
Fragment
>
=
override
fun
supportFragmentInjector
():
AndroidInjector
<
Fragment
>
=
...
...
app/src/main/java/chat/rocket/android/profile/ui/ProfileFragment.kt
View file @
8a0e24bf
...
@@ -2,7 +2,7 @@ package chat.rocket.android.profile.ui
...
@@ -2,7 +2,7 @@ package chat.rocket.android.profile.ui
import
DrawableHelper
import
DrawableHelper
import
android.app.Activity
import
android.app.Activity
import
android.app.AlertDialog
import
android
x.appcompat
.app.AlertDialog
import
android.content.Intent
import
android.content.Intent
import
android.graphics.Bitmap
import
android.graphics.Bitmap
import
android.os.Build
import
android.os.Build
...
@@ -296,7 +296,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
...
@@ -296,7 +296,8 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
val
passwordEditText
=
EditText
(
context
)
val
passwordEditText
=
EditText
(
context
)
passwordEditText
.
hint
=
getString
(
R
.
string
.
msg_password
)
passwordEditText
.
hint
=
getString
(
R
.
string
.
msg_password
)
val
builder
=
AlertDialog
.
Builder
(
context
)
context
?.
let
{
val
builder
=
AlertDialog
.
Builder
(
it
)
builder
.
setTitle
(
R
.
string
.
title_are_you_sure
)
builder
.
setTitle
(
R
.
string
.
title_are_you_sure
)
.
setView
(
passwordEditText
)
.
setView
(
passwordEditText
)
.
setPositiveButton
(
R
.
string
.
action_delete_account
)
{
_
,
_
->
.
setPositiveButton
(
R
.
string
.
action_delete_account
)
{
_
,
_
->
...
@@ -306,4 +307,5 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
...
@@ -306,4 +307,5 @@ class ProfileFragment : Fragment(), ProfileView, ActionMode.Callback {
.
create
()
.
create
()
.
show
()
.
show
()
}
}
}
}
}
app/src/main/java/chat/rocket/android/settings/ui/SettingsFragment.kt
View file @
8a0e24bf
...
@@ -23,6 +23,7 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
...
@@ -23,6 +23,7 @@ import chat.rocket.android.settings.password.ui.PasswordActivity
import
chat.rocket.android.settings.presentation.SettingsView
import
chat.rocket.android.settings.presentation.SettingsView
import
chat.rocket.android.util.extensions.addFragmentBackStack
import
chat.rocket.android.util.extensions.addFragmentBackStack
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.showToast
import
chat.rocket.android.webview.ui.webViewIntent
import
chat.rocket.android.webview.ui.webViewIntent
import
dagger.android.support.AndroidSupportInjection
import
dagger.android.support.AndroidSupportInjection
import
kotlinx.android.synthetic.main.fragment_settings.*
import
kotlinx.android.synthetic.main.fragment_settings.*
...
@@ -73,20 +74,23 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
...
@@ -73,20 +74,23 @@ class SettingsFragment : Fragment(), SettingsView, AdapterView.OnItemClickListen
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
1
]
->
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
1
]
->
activity
?.
startActivity
(
Intent
(
activity
,
PasswordActivity
::
class
.
java
))
activity
?.
startActivity
(
Intent
(
activity
,
PasswordActivity
::
class
.
java
))
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
2
]
->
shareApp
()
// TODO (https://github.com/RocketChat/Rocket.Chat.Android/pull/1918)
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
2
]
->
showToast
(
"Coming soon"
)
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
3
]
->
sh
owAppOnStore
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
3
]
->
sh
areApp
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
4
]
->
contactSupport
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
4
]
->
showAppOnStore
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
5
]
->
activity
?.
startActivity
(
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
5
]
->
contactSupport
()
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
6
]
->
activity
?.
startActivity
(
context
?.
webViewIntent
(
context
?.
webViewIntent
(
getString
(
R
.
string
.
license_url
),
getString
(
R
.
string
.
license_url
),
getString
(
R
.
string
.
title_licence
)
getString
(
R
.
string
.
title_licence
)
)
)
)
)
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
6
]
->
{
resources
.
getStringArray
(
R
.
array
.
settings_actions
)[
7
]
->
{
(
activity
as
AppCompatActivity
).
addFragmentBackStack
(
(
activity
as
AppCompatActivity
).
addFragmentBackStack
(
TAG_ABOUT_FRAGMENT
,
TAG_ABOUT_FRAGMENT
,
R
.
id
.
fragment_container
R
.
id
.
fragment_container
...
...
app/src/main/res/values-de/strings.xml
View file @
8a0e24bf
...
@@ -71,12 +71,12 @@
...
@@ -71,12 +71,12 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Eigenschaften
</item>
<item
name=
"item_preferences"
>
Eigenschaften
</item>
<item
name=
"item_password"
>
Passwort ändern
</item>
<item
name=
"item_password"
>
Passwort ändern
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"item_share_app"
>
Link zur App teilen
</item>
<item
name=
"item_share_app"
>
Link zur App teilen
</item>
<item
name=
"item_rate_us"
>
Bewerten Sie uns
</item>
<item
name=
"item_rate_us"
>
Bewerten Sie uns
</item>
<item
name=
"item_contact_us"
>
Kontaktieren Sie uns
</item>
<item
name=
"item_contact_us"
>
Kontaktieren Sie uns
</item>
<item
name=
"item_licence"
>
Lizenz
</item>
<item
name=
"item_licence"
>
Lizenz
</item>
<item
name=
"item_about"
>
Über
</item>
<item
name=
"item_about"
>
Über
</item>
</string-array>
</string-array>
<!-- Regular information messages -->
<!-- Regular information messages -->
...
...
app/src/main/res/values-es/strings.xml
View file @
8a0e24bf
...
@@ -63,6 +63,7 @@
...
@@ -63,6 +63,7 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-fr/strings.xml
View file @
8a0e24bf
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-ja/strings.xml
View file @
8a0e24bf
<?xml version="1.0" encoding="utf-8" ?>
<resources>
<resources>
<string
name=
"app_name"
translatable=
"false"
>
Rocket.Chat
</string>
<!-- Titles -->
<!-- Titles -->
<string
name=
"title_sign_in_your_server"
>
サーバーに接続
</string>
<string
name=
"title_sign_in_your_server"
>
サーバーに接続
</string>
...
@@ -66,7 +64,7 @@
...
@@ -66,7 +64,7 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-pt-rBR/strings.xml
View file @
8a0e24bf
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferências
</item>
<item
name=
"item_preferences"
>
Preferências
</item>
<item
name=
"item_password"
>
Alterar senha
</item>
<item
name=
"item_password"
>
Alterar senha
</item>
<item
name=
"change_language"
>
Alterar idioma
</item>
<item
name=
"item_share_app"
>
Compartilhar app
</item>
<item
name=
"item_share_app"
>
Compartilhar app
</item>
<item
name=
"item_rate_us"
>
Classifique-nos
</item>
<item
name=
"item_rate_us"
>
Classifique-nos
</item>
<item
name=
"item_contact_us"
>
Contate-nos
</item>
<item
name=
"item_contact_us"
>
Contate-nos
</item>
...
...
app/src/main/res/values-tr/strings.xml
View file @
8a0e24bf
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
@@ -90,7 +91,6 @@
...
@@ -90,7 +91,6 @@
<string
name=
"msg_check_your_email_to_reset_your_password"
>
Eposta gönderilmiştir! Şifrenizi sıfırlamak için eposta kutunuzu kontrol ediniz.
</string>
<string
name=
"msg_check_your_email_to_reset_your_password"
>
Eposta gönderilmiştir! Şifrenizi sıfırlamak için eposta kutunuzu kontrol ediniz.
</string>
<string
name=
"msg_invalid_email"
>
Lütfen, geçerli bir eposta adresi giriniz
</string>
<string
name=
"msg_invalid_email"
>
Lütfen, geçerli bir eposta adresi giriniz
</string>
<string
name=
"msg_new_user_agreement"
>
Devam ederek \n%1$s ve %2$s kabul ediyorsunuz
</string>
<string
name=
"msg_new_user_agreement"
>
Devam ederek \n%1$s ve %2$s kabul ediyorsunuz
</string>
<string
name=
"msg_more_than_ninety_nine_unread_messages"
translatable=
"false"
>
99+
</string>
<string
name=
"msg_yesterday"
>
Dün
</string>
<string
name=
"msg_yesterday"
>
Dün
</string>
<string
name=
"msg_today"
>
Bugün
</string>
<string
name=
"msg_today"
>
Bugün
</string>
<string
name=
"msg_message"
>
Mesaj
</string>
<string
name=
"msg_message"
>
Mesaj
</string>
...
...
app/src/main/res/values-uk/strings.xml
View file @
8a0e24bf
...
@@ -64,6 +64,7 @@
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_preferences"
>
Preferences
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"item_password"
>
Change password
</item>
<!-- TODO Add translation -->
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Share app
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values-zh-rCN/strings.xml
0 → 100644
View file @
8a0e24bf
This diff is collapsed.
Click to expand it.
app/src/main/res/values/strings.xml
View file @
8a0e24bf
...
@@ -76,7 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
...
@@ -76,7 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string-array
name=
"settings_actions"
>
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<item
name=
"item_preferences"
>
Preferences
</item>
<item
name=
"item_password"
>
Change password
</item>
<item
name=
"item_password"
>
Change password
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"item_share_app"
>
Share app
</item>
<item
name=
"item_share_app"
>
Share app
</item>
<item
name=
"item_rate_us"
>
Rate us
</item>
<item
name=
"item_rate_us"
>
Rate us
</item>
<item
name=
"item_contact_us"
>
Contact us
</item>
<item
name=
"item_contact_us"
>
Contact us
</item>
...
...
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