Commit 1d43870
Weblate
Merge branch 'develop' of https://github.com/vector-im/riot-web into develop
Conflicts:
src/i18n/strings/da.json
src/i18n/strings/eo.json
src/i18n/strings/fr.json
src/i18n/strings/hu.json
src/i18n/strings/ja.json
src/i18n/strings/nl.json
src/i18n/strings/pl.json
src/i18n/strings/sk.json
src/i18n/strings/zh_Hans.json725 files changed
Lines changed: 127 additions & 27423 deletions
File tree
- res
- flags
- media
- themes
- riot/img/logos
- status
- css
- fonts
- img
- scripts
- src
- components
- structures
- views
- dialogs
- directory
- elements
- globals
- login
- messages
- rooms
- settings
- i18n/strings
- notifications
- skins/vector
- css
- matrix-react-sdk
- structures
- login
- views
- avatars
- dialogs
- elements
- groups
- login
- messages
- rooms
- settings
- voip
- themes
- vector-web
- structures
- views
- dialogs
- directory
- elements
- globals
- messages
- rooms
- settings
- fonts
- Fira_Mono
- Open_Sans
- img
- p
- themes/status/css
- utils
- vector
- platform
- test/unit-tests
- notifications
Some content is hidden
Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
70 | 70 | | |
71 | 71 | | |
72 | 72 | | |
73 | | - | |
| 73 | + | |
| 74 | + | |
| 75 | + | |
| 76 | + | |
| 77 | + | |
74 | 78 | | |
75 | 79 | | |
76 | 80 | | |
77 | 81 | | |
78 | 82 | | |
79 | 83 | | |
80 | | - | |
| 84 | + | |
| 85 | + | |
81 | 86 | | |
82 | 87 | | |
83 | 88 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
58 | 58 | | |
59 | 59 | | |
60 | 60 | | |
61 | | - | |
62 | | - | |
63 | 61 | | |
64 | 62 | | |
65 | | - | |
66 | | - | |
67 | | - | |
68 | | - | |
69 | | - | |
70 | | - | |
71 | 63 | | |
72 | 64 | | |
73 | 65 | | |
74 | | - | |
75 | 66 | | |
76 | 67 | | |
77 | | - | |
78 | 68 | | |
79 | | - | |
80 | 69 | | |
81 | | - | |
82 | 70 | | |
83 | | - | |
84 | | - | |
| 71 | + | |
85 | 72 | | |
86 | 73 | | |
87 | 74 | | |
| |||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
0 commit comments