mirrors/SchildiChat-android
1
0
Fork 0
mirror of https://github.com/SchildiChat/SchildiChat-android.git synced 2025-01-10 10:17:42 +03:00
Code Issues Projects Releases Packages Wiki Activity
5880 commits 7 branches 124 tags 230 MiB
Commit graph

1586 commits

Author SHA1 Message Date
SpiritCroc
d0c7393ae1 Automatic SchildiChat string correction 
Change-Id: Id39c2bee7ff975fbe6f260ce53df2ae897644958
 2020-09-17 12:03:29 +02:00
SpiritCroc
2e9195df2b Merge remote-tracking branch 'upstream/master' into sc_1.0.7 
Change-Id: Iccb1b1f0bee6b77c9f15d917c8073910841b6ff8

Conflicts:
	vector/src/main/java/im/vector/app/core/resources/UserPreferencesProvider.kt
	vector/src/main/java/im/vector/app/features/disclaimer/DisclaimerDialog.kt
	vector/src/main/java/im/vector/app/features/themes/ThemeUtils.kt
 2020-09-17 12:03:17 +02:00
SpiritCroc
6d55aa22f0 Revert "Automatic SchildiChat string correction" 
This reverts commit 2e16cc7997.
 2020-09-17 11:57:41 +02:00
SpiritCroc
66ed064d27 Revert "Revert "Revert "Resolve required manual intervention in german strings""" 
This reverts commit 7da51068bc.
 2020-09-17 11:57:41 +02:00
SpiritCroc
1ff602db3b Revert "Setting for unread badge / room summary event visibility" 
This reverts commit b1d96ebba9.

Change-Id: I567628cbf4bbdc059d3c73991bf3053f702730af

Conflicts:
	vector/src/main/java/im/vector/app/features/settings/VectorPreferences.kt
	vector/src/main/res/values-de/strings_sc.xml
	vector/src/main/res/values/strings_sc.xml
	vector/src/main/res/xml/vector_settings_preferences.xml
 2020-09-17 11:51:44 +02:00
Benoit Marty
a77069297d Remove R.string.copy, use R.string.action_copy (Fix clash with androidx.preferences private resource) 2020-09-16 19:51:43 +02:00
Benoit Marty
36899af36b Strings has been replaced by a plurals 2020-09-16 19:41:24 +02:00
Benoit Marty
bfa4e00fe7 Hyphen can be replaced with dash 2020-09-16 19:38:08 +02:00
Benoit Marty
4c6bb93eaf ellipsis 2020-09-16 19:36:26 +02:00
Benoit Marty
7e62e8e2cd Fix typo 2020-09-16 19:35:39 +02:00
Benoit Marty
762fd02eb7 Format strings.xml 2020-09-16 19:35:27 +02:00
Weblate
d6dd2a02b5 Merge branch 'origin/develop' into Weblate. 2020-09-16 15:55:23 +00:00
ganfra
a1f98eb6bf Allow to filter all room member state events in timeline 2020-09-16 15:36:48 +02:00
linsui
487a90fba5 Translated using Weblate (Chinese (Simplified)) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hans/
 2020-09-16 03:43:00 +00:00
discapacidad5
6e1fc4d84e Translated using Weblate (Spanish) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/es/
 2020-09-14 23:43:29 +00:00
AnonymousWebHacker
86603ed1a6 Translated using Weblate (Spanish) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/es/
 2020-09-14 23:43:12 +00:00
ziriSut
a246993df3 Translated using Weblate (Kabyle) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-14 23:43:11 +00:00
random
2e88275766 Translated using Weblate (Italian) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/it/
 2020-09-14 23:43:09 +00:00
zeritti
eb2166dd4c Translated using Weblate (Czech) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/cs/
 2020-09-14 23:43:08 +00:00
ziriSut
a61b9ce1e1 Translated using Weblate (Kabyle) 
Currently translated at 97.8% (1826 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 22:39:55 +00:00
Slimane Selyan AMIRI
a265ff3fbe Translated using Weblate (Kabyle) 
Currently translated at 97.8% (1826 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 22:39:53 +00:00
Slimane Selyan AMIRI
fc993cb724 Translated using Weblate (Kabyle) 
Currently translated at 97.0% (1811 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 13:55:32 +00:00
ziriSut
808eb9a12a Translated using Weblate (Kabyle) 
Currently translated at 97.0% (1811 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 13:55:32 +00:00
Kahina Messaoudi
d429800162 Translated using Weblate (Kabyle) 
Currently translated at 97.0% (1811 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 11:25:20 +00:00
Kahina Messaoudi
709e9daf40 Translated using Weblate (Kabyle) 
Currently translated at 97.0% (1811 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 10:50:18 +00:00
ziriSut
82a1b8b4c0 Translated using Weblate (Kabyle) 
Currently translated at 97.0% (1811 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-12 10:50:17 +00:00
Nikita Epifanov
f40d96017b Update strings_sc.xml 2020-09-12 11:15:10 +02:00
SpiritCroc
ccafdeeeeb Move SC string to where it belongs 
Change-Id: I488a92c7665ff34d06375b322aafbb2aebbe1016
 2020-09-12 10:19:02 +02:00
ziriSut
fbe6a2ac80 Translated using Weblate (Kabyle) 
Currently translated at 62.5% (1167 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-11 23:50:43 +00:00
Kahina Messaoudi
89af162c5a Translated using Weblate (Kabyle) 
Currently translated at 62.5% (1167 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-11 23:50:42 +00:00
Nikita Epifanov
c17c618f24
Added Russian strings_sc.xml 2020-09-12 00:51:21 +03:00
Kahina Messaoudi
0c34521791 Translated using Weblate (Kabyle) 
Currently translated at 56.3% (1052 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-11 11:43:02 +00:00
Slimane Selyan AMIRI
ad969b999d Translated using Weblate (Kabyle) 
Currently translated at 56.3% (1052 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/kab/
 2020-09-11 11:43:02 +00:00
@a2sc:matrix.org
3bb2034254 Translated using Weblate (German) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-09-11 11:42:53 +00:00
Benoit Marty
db977b8109 Simplify Dialog UI and code 2020-09-11 09:43:10 +02:00
Benoit Marty
4dc28a9d62 Reorder settings 2020-09-10 18:08:35 +02:00
Benoit Marty
23f13b092f Plurals 2020-09-10 18:00:06 +02:00
Valere
971b425e17 F-Droid background sync modes 2020-09-10 17:10:47 +02:00
SpiritCroc
1d6fd71adb Make unread-counter for non-notifications a setting 
Change-Id: I6e097ee4577868b1e82a0cd69bd67122cb57a4d4
 2020-09-10 12:01:54 +02:00
LinAGKar
4581efa4c3 Translated using Weblate (Swedish) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/sv/
 2020-09-09 07:42:55 +00:00
Nikita Epifanov
d1fedcac7c Translated using Weblate (Russian) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/ru/
 2020-09-09 07:42:54 +00:00
@a2sc:matrix.org
11fc0fed75 Translated using Weblate (German) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/de/
 2020-09-09 07:42:53 +00:00
Priit Jõerüüt
f932100388 Translated using Weblate (Estonian) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/et/
 2020-09-09 07:42:52 +00:00
Jeff Huang
f0b582fef0 Translated using Weblate (Chinese (Traditional)) 
Currently translated at 100.0% (1867 of 1867 strings)

Translation: Element Android/Element Android App
Translate-URL: https://translate.riot.im/projects/element-android/element-app/zh_Hant/
 2020-09-09 07:42:51 +00:00
SpiritCroc
7da51068bc Revert "Revert "Resolve required manual intervention in german strings"" 
This reverts commit b9607abbe6.
 2020-09-08 19:17:23 +02:00
SpiritCroc
2e16cc7997 Automatic SchildiChat string correction 
Change-Id: Iaa24753cf4596b31f9127dfc6178dc4d06139ba8
 2020-09-08 19:17:23 +02:00
SpiritCroc
bdd71769a0 Merge remote-tracking branch 'upstream/master' into sc 
Change-Id: Ibdd2790a7f2a8a1f126ef7af2032fe72f7dd777e
 2020-09-08 18:52:59 +02:00
SpiritCroc
1c8b720ff2 Revert "Automatic SchildiChat string correction" 
This reverts commit d912c5a356.
 2020-09-08 18:29:29 +02:00
SpiritCroc
b9607abbe6 Revert "Resolve required manual intervention in german strings" 
This reverts commit 19260fce65.
 2020-09-08 18:29:29 +02:00
Benoit Marty
22cd6ae239
Merge pull request #2047 from vector-im/feature/universal_link_navigation 
Handle room, user, group, email verification links by converting them to permalinks.
 2020-09-08 12:21:54 +02:00