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
d1370db7
Commit
d1370db7
authored
Dec 14, 2018
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/runtime-exception
parents
3ca1b5db
4d3eaf54
Changes
4
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
88 additions
and
94 deletions
+88
-94
strings.xml
app/src/main/res/values-de/strings.xml
+64
-67
strings.xml
app/src/main/res/values-hi-rIN/strings.xml
+8
-9
strings.xml
app/src/main/res/values-it/strings.xml
+8
-9
strings.xml
app/src/main/res/values-ru-rRU/strings.xml
+8
-9
No files found.
app/src/main/res/values-de/strings.xml
View file @
d1370db7
This diff is collapsed.
Click to expand it.
app/src/main/res/values-hi-rIN/strings.xml
View file @
d1370db7
...
...
@@ -228,8 +228,7 @@
<string
name=
"action_title_editing"
>
संपादन संदेश
</string>
<string
name=
"action_msg_add_reaction"
>
प्रतिक्रिया जोड़ें
</string>
<string
name=
"action_msg_copy_permalink"
>
परमालिंक कॉपी करें
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_report"
>
Report
</string>
<string
name=
"action_msg_report"
>
रिपोर्ट
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
संपादन की अनुमति नहीं है
</string>
...
...
@@ -338,13 +337,13 @@
<string
name=
"message_room_changed_privacy"
>
%2$s ने रूम का प्रकार बदलकर %1$s किया
</string>
<!-- User Details -->
<string
name=
"message"
>
Message
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"timezone"
>
Timezone
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"error_opening_dm"
>
Something went wrong while we were creating this conversation…
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"retry"
>
Retry
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"message"
>
संदेश
</string
>
<string
name=
"timezone"
>
समय क्षेत्र
</string
>
<string
name=
"error_opening_dm"
>
जब हम इस बातचीत को बना रहे थे तो कुछ गड़बड़ हुई …
</string
>
<string
name=
"retry"
>
पुन: प्रयास करें
</string
>
<!-- Report -->
<string
name=
"submit"
>
Submit
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"required"
>
*
required
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"report_sent"
>
Your report has been sent
!
</string>
<string
name=
"submit"
>
जमा करें
</string
>
<string
name=
"required"
>
*
आवश्यक
</string
>
<string
name=
"report_sent"
>
आपकी रिपोर्ट भेज दी गई है
!
</string>
</resources>
app/src/main/res/values-it/strings.xml
View file @
d1370db7
...
...
@@ -224,8 +224,7 @@
<string
name=
"action_title_editing"
>
Modifica messaggio
</string>
<string
name=
"action_msg_add_reaction"
>
Aggiungi reazione
</string>
<string
name=
"action_msg_copy_permalink"
>
Copia permalink
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_report"
>
Report
</string>
<string
name=
"action_msg_report"
>
Resoconto
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
La modifica non è consentita
</string>
...
...
@@ -333,13 +332,13 @@
<string
name=
"message_room_changed_privacy"
>
Il tipo di stanza è cambiato in: %1$s da %2$s
</string>
<!-- User Details -->
<string
name=
"message"
>
Messag
e
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"timezone"
>
Timezone
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"error_opening_dm"
>
Something went wrong while we were creating this conversation…
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"retry"
>
R
etry
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"message"
>
Messag
gio
</string
>
<string
name=
"timezone"
>
Fuso Orario
</string
>
<string
name=
"error_opening_dm"
>
È successo qualcosa di sbagliato durante la creazione di questa conversazione...
</string
>
<string
name=
"retry"
>
R
iprova
</string
>
<!-- Report -->
<string
name=
"submit"
>
Submit
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"required"
>
*
required
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"report_sent"
>
Your report has been sent!
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"submit"
>
Invia
</string
>
<string
name=
"required"
>
*
necessario
</string
>
<string
name=
"report_sent"
>
Il tuo resoconto è stato inviato!
</string
>
</resources>
app/src/main/res/values-ru-rRU/strings.xml
View file @
d1370db7
...
...
@@ -225,8 +225,7 @@
<string
name=
"action_title_editing"
>
Редактирование сообщения
</string>
<string
name=
"action_msg_add_reaction"
>
Отреагировать
</string>
<string
name=
"action_msg_copy_permalink"
>
Копировать ссылку
</string>
<!-- TODO - Add proper translation -->
<string
name=
"action_msg_report"
>
Report
</string>
<string
name=
"action_msg_report"
>
Пожаловаться
</string>
<!-- Permission messages -->
<string
name=
"permission_editing_not_allowed"
>
Редактирование запрещено
</string>
...
...
@@ -335,13 +334,13 @@
<string
name=
"message_room_changed_privacy"
>
Тип канала изменен на: %1$s пользователем %2$s
</string>
<!-- User Details -->
<string
name=
"message"
>
Message
</string>
<!--TODO - Add proper translation--
>
<string
name=
"timezone"
>
Timezone
</string>
<!--TODO - Add proper translation--
>
<string
name=
"error_opening_dm"
>
Something went wrong while we were creating this conversation…
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"retry"
>
Retry
</string>
<!-- TODO - Add proper translation --
>
<string
name=
"message"
>
Сообщение
</string
>
<string
name=
"timezone"
>
Часовой поясe
</string
>
<string
name=
"error_opening_dm"
>
При создании этого диалога что-то пошло не так...
</string
>
<string
name=
"retry"
>
Повторить
</string
>
<!-- Report -->
<string
name=
"submit"
>
Submit
</string>
<!--TODO - Add proper translation--
>
<string
name=
"required"
>
*
required
</string>
<!--TODO - Add proper translation--
>
<string
name=
"report_sent"
>
Your report has been sent!
</string>
<!--TODO - Add proper translation--
>
<string
name=
"submit"
>
Отправить
</string
>
<string
name=
"required"
>
*
требуется
</string
>
<string
name=
"report_sent"
>
Ваша жалоба была отправлена!
</string
>
</resources>
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