Language Strings Words Needs editing Checks Suggestions Comments
Armenian 1.5% 0.4% 23.1% 6.5% 0.0% 0.0% Translate
Esperanto 0.5% 0.1% 0.0% 0.5% 0.0% 0.0% Translate
French 2.5% 0.8% 24.1% 8.5% 0.0% 0.0% Translate
German 31.7% 28.9% 11.1% 7.5% 0.0% 0.0% Translate
Portuguese 100.0% 100.0% 0.0% 0.0% 0.0% 0.0% Translate
Russian 6.0% 4.4% 23.1% 7.5% 0.5% 0.0% Translate
Spanish 7.0% 2.3% 20.6% 7.5% 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, 3 days ago
Repository containing Weblate translations https://hosted.weblate.org/git/noosfero/noosfero/
Filemaskplugins/custom_forms/po/*/custom_forms.po
Number of strings 1393
Number of words 5397
Number of languages 7
Number of source strings 199
Number of source words 771
When User Action Detail Object
13 hours ago None Committed changes Noosfero/Plugin: Custom forms - Portuguese
yesterday ssantos Translation changed Noosfero/Plugin: Custom forms - Portuguese
Nome do aAutor(a)
yesterday ssantos New translation Noosfero/Plugin: Custom forms - Portuguese
Singular
%{count} submissão
Plural
%{count} submissões
yesterday ssantos New translation Noosfero/Plugin: Custom forms - Portuguese
Singular
Uma submissão foi importada com sucesso.
Plural
%s submissões foram importadas com sucesso.
5 days ago None New alert Repository has changes. Noosfero/Plugin: Custom forms
5 days ago None New alert Repository outdated. Noosfero/Plugin: Custom forms
5 days ago None New alert Could not merge the repository. Noosfero/Plugin: Custom forms
2 weeks ago None Resource update Noosfero/Plugin: Custom forms - Portuguese
2 weeks ago None Resource update Noosfero/Plugin: Custom forms - Russian
2 weeks ago None New string to translate Noosfero/Plugin: Custom forms - Portuguese
Browse all component changes

Activity in last 30 days

Activity in last year