Changes in Element Android/Element Android App @ Element Translations

1 / 6025

/ 6025

None

Failed merge on repository

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

4 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

4 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

4 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

8 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

8 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

13 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

13 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

13 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

22 hours ago

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

New alert

Element Android / Element Android App

Repository has changes. yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

None

Failed merge on repository

Element Android / Element Android App

Auto-merging library/ui-strings/src/main/res/values-zh-rCN/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-zh-rCN/strings.xml
Auto-merging library/ui-strings/src/main/res/values-fa/strings.xml
CONFLICT (content): Merge conflict in library/ui-strings/src/main/res/values-fa/strings.xml
Automatic merge failed; fix conflicts and then commit the result.
 (1)

yesterday

1 / 6025

/ 6025

Search

Project

Language

Action

Author username