Language Strings Words Needs editing Checks Suggestions Comments
Portuguese 100.0% 100.0% 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 public/designs/themes/base/navigation.html.erb
Auto-merging features/sensitive_content.feature
CONFLICT (add/add): Merge conflict in features/sensitive_content.feature
Auto-merging config/routes/myprofile/33_cms.rb
CONFLICT (content): Merge conflict in config/routes/myprofile/33_cms.rb
Auto-merging app/helpers/article_helper.rb
CONFLICT (content): Merge conflict in app/helpers/article_helper.rb
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/noosfero/noosfero/ 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.

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 http://noosfero.org/
Instructions for translators http://noosfero.org/Development/Localization
Translation process
  • Translations can be made directly.
  • Translation suggestions can be made.
  • Any authenticated user can contribute.
  • The translation uses bilingual files.
Translation license AGPL-3.0
Repository https://gitlab.com/noosfero/noosfero.git
Repository branch master 01e092c3f, 13 hours ago
Repository containing Weblate translations https://hosted.weblate.org/git/noosfero/noosfero/
Filemaskplugins/html5_video/po/*/html5_video.po
Number of strings 37
Number of words 216
Number of languages 1
Number of source strings 37
Number of source words 216
When User Action Detail Object
2 days ago None New alert Repository has changes. Noosfero/Plugin: Html5 video
2 days ago None New alert Repository outdated. Noosfero/Plugin: Html5 video
2 days ago None New alert Could not merge the repository. Noosfero/Plugin: Html5 video
13 days ago None Resource update Noosfero/Plugin: Html5 video - Portuguese
2 weeks ago diguliu Component unlocked Noosfero/Plugin: Html5 video
2 weeks ago diguliu Component locked Noosfero/Plugin: Html5 video
2 weeks ago None New alert Repository outdated. Noosfero/Plugin: Html5 video
a month ago None New alert Could not merge the repository. Noosfero/Plugin: Html5 video
5 months ago None Committed changes Noosfero/Plugin: Html5 video - Portuguese
5 months ago ssantos Translation changed Noosfero/Plugin: Html5 video - Portuguese
ArquivFicheiros que não são vídeo
Browse all component changes

Activity in last 30 days

Activity in last year