Language Strings Words Needs editing Checks Suggestions Comments
Chinese (Traditional) 5.7% 4.0% 0.0% 0.0% 0.0% 0.0% Translate
Czech 89.7% 88.5% 0.0% 0.4% 0.0% 0.0% Translate
Danish 12.7% 9.3% 1.3% 1.8% 87.7% 0.0% Translate
Dutch 1.7% 1.3% 0.0% 0.0% 1.7% 0.0% Translate
English 100.0% 100.0% 0.0% 0.0% 0.0% 0.0% Translate
French 100.0% 100.0% 0.0% 0.4% 1.3% 0.0% Translate
German 100.0% 100.0% 0.0% 0.0% 4.3% 0.0% Translate
Japanese 99.1% 99.3% 0.9% 1.8% 0.0% 0.0% Translate
Norwegian Bokmål 86.4% 86.0% 13.6% 0.0% 0.0% 0.0% Translate
Portuguese (Brazil) 56.1% 46.2% 0.0% 0.9% 0.0% 0.0% Translate
Spanish 100.0% 100.0% 0.0% 0.0% 0.0% 0.0% Translate
Swedish 10.7% 12.5% 0.4% 0.9% 0.0% 0.0% Translate
Turkish 28.2% 30.8% 3.0% 3.0% 3.4% 0.0% Translate
Ukrainian 0.4% 0.3% 0.0% 0.0% 0.0% 0.0% Translate
Could not merge the repository.

Weblate could not merge upstream changes while updating the repository.

Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)

Typical workflow for fixing merge conflicts

  1. Commit all pending changes in Weblate and lock the translation component.
    wlc commit; wlc lock
  2. Add Weblate exported repository as a remote.
    git remote add weblate https://hosted.weblate.org/git/hangoutsbot/hangups/ git remote update weblate
  3. Merge Weblate changes and resolve any conflicts.
    git merge weblate/master
  4. Push changes into upstream repository.
    git push origin master
  5. Weblate should now be able to see updated repository and you can unlock it.
    wlc pull ; wlc unlock

Check the FAQ for info on how to resolve this.

Project website https://github.com/hangoutsbot/hangoutsbot
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses bilingual files.
Translation license BSD-2-Clause
Repository https://github.com/hangoutsbot/hangoutsbot-locales.git
Repository branch master 904fd82, 2 years ago
Repository containing Weblate translations https://hosted.weblate.org/git/hangoutsbot/hangups/
Filemask*/LC_MESSAGES/hangupsbot.po
Number of strings 3223
Number of words 17649
Number of languages 14
Number of source strings 234
Number of source words 1290
When User Action Detail Object
a month ago None Failed merge on repository Hangoutsbot/hangups
Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)
4 months ago None Failed merge on repository Hangoutsbot/hangups
Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)
5 months ago None Failed merge on repository Hangoutsbot/hangups
Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)
6 months ago None Failed merge on repository Hangoutsbot/hangups
Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 months ago None Suggestion removed during cleanup Hangoutsbot/hangups - Danish
Jeg er straks tilbage!
7 months ago None Suggestion added Hangoutsbot/hangups - Danish
Jeg er straks tilbage!
7 months ago None Failed merge on repository Hangoutsbot/hangups
Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)
7 months ago None Committed changes Hangoutsbot/hangups - German
7 months ago ssantos New translation Hangoutsbot/hangups - German
LOTTERIE: gemeinsame Raumschlüssel {}
8 months ago None Failed merge on repository Hangoutsbot/hangups
Auto-merging pt_BR/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in pt_BR/LC_MESSAGES/hangupsbot.po
Auto-merging de/LC_MESSAGES/hangupsbot.po
CONFLICT (content): Merge conflict in de/LC_MESSAGES/hangupsbot.po
Automatic merge failed; fix conflicts and then commit the result. (1)
Browse all component changes

Activity in last 30 days

Activity in last year