This translation is currently locked for updates.
Language Translated Words Review Checks Suggestions Comments
Albanian
96.0% 96.3% 0.6% 1.1% 0.0% 0.0% Translate
Arabic
75.3% 63.4% 1.7% 1.1% 0.0% 0.0% Translate
Basque
2.3% 0.6% 0.0% 0.0% 0.0% 0.0% Translate
Bulgarian
66.1% 63.8% 0.6% 2.9% 0.0% 0.0% Translate
Catalan
69.0% 67.2% 0.6% 4.0% 0.0% 0.0% Translate
Chinese (Simplified)
64.4% 63.4% 0.6% 3.4% 0.0% 0.0% Translate
Chinese (Traditional)
96.6% 97.0% 0.0% 0.0% 0.0% 0.0% Translate
Croatian
52.9% 43.6% 0.0% 4.0% 0.0% 0.0% Translate
Czech
62.6% 61.9% 0.6% 2.9% 0.6% 0.0% Translate
Danish
96.0% 96.3% 0.6% 2.9% 0.0% 0.0% Translate
Dutch
9.8% 8.8% 0.0% 1.1% 0.0% 0.0% Translate
English source
100.0% 100.0% 0.0% 0.0% 0.0% 0.0% Translate
Esperanto
39.1% 32.3% 0.0% 1.1% 0.0% 0.0% Translate
Finnish
42.0% 35.2% 0.0% 3.4% 0.0% 0.0% Translate
Flemish
96.0% 96.3% 0.6% 1.1% 0.0% 0.0% Translate
French
97.1% 97.3% 0.0% 0.0% 0.0% 0.0% Translate
French (Belgium)
0.6% 0.1% 0.0% 0.0% 0.0% 0.0% Translate
French (Canada)
69.0% 67.2% 0.6% 6.9% 0.0% 0.0% Translate
French (Switzerland)
9.2% 10.1% 0.0% 0.6% 0.0% 0.0% Translate
German
81.0% 80.6% 0.6% 3.4% 0.0% 0.0% Translate
Greek
62.6% 62.5% 0.6% 4.0% 0.0% 0.0% Translate
Hebrew
13.8% 5.8% 0.0% 0.6% 0.0% 0.0% Translate
Hindi
8.6% 13.1% 0.0% 2.9% 0.0% 0.0% Translate
Hungarian
96.0% 96.3% 0.6% 4.6% 0.0% 0.0% Translate
Igbo
2.3% 0.7% 0.0% 0.0% 0.0% 0.0% Translate
Indonesian
40.8% 41.5% 0.6% 2.3% 0.0% 0.0% Translate
Italian
79.3% 74.8% 0.6% 6.9% 0.0% 0.0% Translate
Japanese
63.8% 63.1% 0.6% 2.9% 0.0% 0.0% Translate
Korean
2.9% 1.2% 0.0% 0.0% 0.0% 0.0% Translate
Lithuanian
75.3% 69.9% 0.6% 2.9% 0.0% 0.0% Translate
Malay
46.0% 43.8% 0.6% 2.3% 0.0% 0.0% Translate
Norwegian Bokmål
98.3% 97.9% 0.0% 0.0% 0.0% 0.0% Translate
Persian
96.0% 96.3% 0.6% 6.9% 0.0% 0.0% Translate
Polish
96.0% 96.3% 0.6% 0.0% 0.0% 0.0% Translate
Portuguese
40.2% 37.8% 0.0% 2.3% 0.0% 0.0% Translate
Portuguese (Brazil)
96.0% 96.3% 0.6% 3.4% 0.0% 0.0% Translate
Portuguese (Portugal)
96.0% 96.3% 0.6% 2.3% 0.0% 0.0% Translate
Punjabi
2.3% 1.0% 0.0% 0.0% 0.0% 0.0% Translate
Romanian
36.2% 31.2% 0.0% 4.6% 0.0% 0.0% Translate
Russian
96.0% 96.3% 0.6% 3.4% 0.0% 0.0% Translate
Slovak
21.3% 17.8% 0.0% 3.4% 0.0% 0.0% Translate
Slovenian
58.0% 45.5% 0.0% 3.4% 0.0% 0.0% Translate
Spanish
96.0% 96.3% 0.6% 0.0% 0.0% 0.0% Translate
Spanish (Argentina)
85.6% 85.3% 0.6% 3.4% 0.0% 0.0% Translate
Swedish
96.0% 96.3% 0.6% 2.9% 0.0% 0.0% Translate
Turkish
63.8% 63.1% 0.6% 3.4% 0.0% 0.0% Translate
Ukrainian
95.4% 92.0% 0.0% 0.6% 0.0% 0.0% Translate

Approved
Good
Failing checks
Needs editing

Could not merge the repository.

Weblate could not merge upstream changes while updating the repository.

Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)

Check the FAQ for info on how to resolve this.

Repository has changes.

The VCS repository has many changes compared to the upstream. Please merge the changes manually or set up push to automate this.

Documentation
Repository outdated.

The VCS repository is not up to date with the upstream one. Please merge changes manually or set up hooks to automate this.

Documentation
Project website https://jami.net/
Translation process
  • Translations can be made directly.
  • Suggestions to improve translation can be made.
  • Any authenticated user can contribute.
  • The translation is using monolingual files.
  • The translation base language can be edited.
Translation license GPLv3
Repository https://git.jami.net/savoirfairelinux/ring-client-android.git
Repository branch master 6f26bfbe, yesterday
Repository with Weblate translations https://hosted.weblate.org/git/jami/client-android/
File maskring-android/app/src/main/res/values-*/strings.xml
Monolingual base language filering-android/app/src/main/res/values/strings.xml
Number of strings 8178
Number of words 31678
Number of languages 47
Number of source strings 174
Number of source words 674
When User Action Detail Object
19 hours ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 days ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
a week ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
12 days ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 weeks ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 weeks ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
2 weeks ago None Failed merge on repository Jami/client-android
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-zh-rTW/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-zh-rTW/strings.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-uk/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-uk/strings.xml
Auto-merging ring-android/app/src/main/res/values-ro/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-ro/strings.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pt/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pt/strings.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings_account.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-pl/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-pl/strings.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings_preferences.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-nb/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-nb/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-fr-rFR/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-fr-rFR/strings.xml
Auto-merging ring-android/app/src/main/res/values-fr-rCA/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-es/strings.xml
CONFLICT (content): Merge conflict in ring-android/app/src/main/res/values-es/strings.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_preferences.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings_account.xml
Auto-merging ring-android/app/src/main/res/values-ar/strings.xml
Automatic merge failed; fix conflicts and then commit the result. (1)
Browse all component changes

Activity in last 30 days

Activity in last year