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
d483f011
Unverified
Commit
d483f011
authored
Dec 29, 2018
by
Govind Dixit
Committed by
GitHub
Dec 29, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into develop
parents
6cbb10e8
dad6b622
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
7 additions
and
4 deletions
+7
-4
strings.xml
app/src/main/res/values-it/strings.xml
+4
-3
strings.xml
app/src/main/res/values-ja/strings.xml
+2
-1
strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/res/values-it/strings.xml
View file @
d483f011
...
...
@@ -64,6 +64,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferenze
</item>
<item
name=
"item_password"
>
Cambia password
</item>
<item
name=
"change_language"
>
Change Language
</item>
<!-- TODO Add translation -->
<item
name=
"item_share_app"
>
Condividi app
</item>
<item
name=
"item_rate_us"
>
Votaci
</item>
<item
name=
"item_contact_us"
>
Contattaci
</item>
...
...
@@ -146,7 +147,7 @@
<string
name=
"msg_send"
>
Inviare
</string>
<string
name=
"msg_sent_attachment"
>
Inviato allegato
</string>
<string
name=
"msg_welcome_to_rocket_chat"
>
Benvenuto in Rocket.Chat
</string>
<string
name=
"msg_team_communication"
>
Team Communication
</string>
<!-- TODO Translate --
>
<string
name=
"msg_team_communication"
>
Comunicazione dei Gruppi
</string
>
<string
name=
"msg_login_with_email"
>
Accedi con
<b>
e-mail
</b></string>
<string
name=
"msg_create_account"
>
Crea un utente
</string>
<string
name=
"msg_continue_with_facebook"
>
Continua con
<b>
Facebook
</b></string>
...
...
@@ -163,8 +164,8 @@
<string
name=
"msg_no_description"
>
Nessuna descrizione aggiunta
</string>
<string
name=
"msg_send_email"
>
Invia una email
</string>
<string
name=
"msg_android_app_support"
>
Supporto per le app Android
</string>
<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_unable_to_update_password"
>
Impossibile aggiornare la password. Messaggio di errore: %1$s
</string
>
<string
name=
"msg_password_updated_successfully"
>
Password
aggiornata con successo
</string
>
<plurals
name=
"msg_reacted_with_"
>
<item
quantity=
"one"
>
%1$s ha reagito con %2$s
</item>
<item
quantity=
"other"
>
%1$s ha reagito con %2$s
</item>
...
...
app/src/main/res/values-ja/strings.xml
View file @
d483f011
...
...
@@ -22,7 +22,7 @@
<string
name=
"title_admin_panel"
>
管理パネル
</string>
<string
name=
"title_password"
>
パスワードの変更
</string>
<string
name=
"title_update_profile"
>
プロフィールの更新
</string>
<string
name=
"title_about"
>
About
</string>
<string
name=
"title_about"
>
About
</string>
<!-- TODO Add translation -->
<string
name=
"title_licence"
>
Licence
</string>
<!-- TODO Add translation -->
<string
name=
"title_create_channel"
>
新しいチャネルを作成
</string>
<string
name=
"title_are_you_sure"
>
本気ですか?
</string>
...
...
@@ -66,6 +66,7 @@
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</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_rate_us"
>
Rate us
</item>
<!-- TODO Add translation -->
<item
name=
"item_contact_us"
>
Contact us
</item>
<!-- TODO Add translation -->
...
...
app/src/main/res/values/strings.xml
View file @
d483f011
...
...
@@ -76,6 +76,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string-array
name=
"settings_actions"
>
<item
name=
"item_preferences"
>
Preferences
</item>
<item
name=
"item_password"
>
Change password
</item>
<item
name=
"change_language"
>
Change Language
</item>
<item
name=
"item_share_app"
>
Share app
</item>
<item
name=
"item_rate_us"
>
Rate 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