admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Translation completed |
Translation completed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Repository merge failed |
Auto-merging wiki/src/install/mac/usb-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/usb-overview.es.po Auto-merging wiki/src/install/mac/dvd-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/dvd-overview.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/persistence.es.po Auto-merging wiki/src/doc/first_steps/startup_options.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.es.po Auto-merging wiki/src/doc/first_steps/reset/windows.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.es.po Auto-merging wiki/src/doc/first_steps/reset/mac.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.es.po Auto-merging wiki/src/doc/first_steps/reset/linux.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.es.po Auto-merging wiki/src/doc/first_steps/reset.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.es.po Auto-merging wiki/src/doc/advanced_topics.index.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.es.po Auto-merging wiki/src/doc/about/requirements.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.es.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Auto-merging ikiwiki-cgi.setup CONFLICT (content): Merge conflict in ikiwiki-cgi.setup Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Repository merge failed |
Auto-merging wiki/src/install/mac/usb-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/usb-overview.es.po Auto-merging wiki/src/install/mac/dvd-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/dvd-overview.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/persistence.es.po Auto-merging wiki/src/doc/first_steps/startup_options.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.es.po Auto-merging wiki/src/doc/first_steps/reset/windows.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.es.po Auto-merging wiki/src/doc/first_steps/reset/mac.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.es.po Auto-merging wiki/src/doc/first_steps/reset/linux.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.es.po Auto-merging wiki/src/doc/first_steps/reset.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.es.po Auto-merging wiki/src/doc/advanced_topics.index.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.es.po Auto-merging wiki/src/doc/about/requirements.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.es.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Auto-merging ikiwiki-cgi.setup CONFLICT (content): Merge conflict in ikiwiki-cgi.setup Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Repository merge failed |
Auto-merging wiki/src/install/mac/usb-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/usb-overview.es.po Auto-merging wiki/src/install/mac/dvd-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/dvd-overview.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/persistence.es.po Auto-merging wiki/src/doc/first_steps/startup_options.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.es.po Auto-merging wiki/src/doc/first_steps/reset/windows.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.es.po Auto-merging wiki/src/doc/first_steps/reset/mac.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.es.po Auto-merging wiki/src/doc/first_steps/reset/linux.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.es.po Auto-merging wiki/src/doc/first_steps/reset.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.es.po Auto-merging wiki/src/doc/advanced_topics.index.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.es.po Auto-merging wiki/src/doc/about/requirements.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.es.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Auto-merging ikiwiki-cgi.setup CONFLICT (content): Merge conflict in ikiwiki-cgi.setup Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Repository merge failed |
Auto-merging wiki/src/install/mac/usb-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/usb-overview.es.po Auto-merging wiki/src/install/mac/dvd-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/dvd-overview.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/persistence.es.po Auto-merging wiki/src/doc/first_steps/startup_options.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.es.po Auto-merging wiki/src/doc/first_steps/reset/windows.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.es.po Auto-merging wiki/src/doc/first_steps/reset/mac.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.es.po Auto-merging wiki/src/doc/first_steps/reset/linux.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.es.po Auto-merging wiki/src/doc/first_steps/reset.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.es.po Auto-merging wiki/src/doc/advanced_topics.index.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.es.po Auto-merging wiki/src/doc/about/requirements.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.es.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Auto-merging ikiwiki-cgi.setup CONFLICT (content): Merge conflict in ikiwiki-cgi.setup Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Repository merge failed |
Auto-merging wiki/src/install/mac/usb-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/usb-overview.es.po Auto-merging wiki/src/install/mac/dvd-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/dvd-overview.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/persistence.es.po Auto-merging wiki/src/doc/first_steps/startup_options.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.es.po Auto-merging wiki/src/doc/first_steps/reset/windows.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.es.po Auto-merging wiki/src/doc/first_steps/reset/mac.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.es.po Auto-merging wiki/src/doc/first_steps/reset/linux.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.es.po Auto-merging wiki/src/doc/first_steps/reset.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.es.po Auto-merging wiki/src/doc/advanced_topics.index.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.es.po Auto-merging wiki/src/doc/about/requirements.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.es.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Auto-merging ikiwiki-cgi.setup CONFLICT (content): Merge conflict in ikiwiki-cgi.setup Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Translation added |
|
admin
Repository merge failed |
Auto-merging wiki/src/install/mac/usb-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/usb-overview.es.po Auto-merging wiki/src/install/mac/dvd-overview.es.po CONFLICT (add/add): Merge conflict in wiki/src/install/mac/dvd-overview.es.po Auto-merging wiki/src/doc/sensitive_documents/persistence.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/sensitive_documents/persistence.es.po Auto-merging wiki/src/doc/first_steps/startup_options.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/startup_options.es.po Auto-merging wiki/src/doc/first_steps/reset/windows.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/windows.es.po Auto-merging wiki/src/doc/first_steps/reset/mac.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/mac.es.po Auto-merging wiki/src/doc/first_steps/reset/linux.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset/linux.es.po Auto-merging wiki/src/doc/first_steps/reset.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/first_steps/reset.es.po Auto-merging wiki/src/doc/advanced_topics.index.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/advanced_topics.index.es.po Auto-merging wiki/src/doc/about/requirements.es.po CONFLICT (add/add): Merge conflict in wiki/src/doc/about/requirements.es.po Auto-merging ikiwiki.setup CONFLICT (content): Merge conflict in ikiwiki.setup Auto-merging ikiwiki-cgi.setup CONFLICT (content): Merge conflict in ikiwiki-cgi.setup Automatic merge failed; fix conflicts and then commit the result. (1)7 years ago |
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Translation completed |
Translation completed
7 years ago
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Translation added |
|
admin
Changes pushed |
Changes pushed
7 years ago
|
admin
Suggestion accepted |
|
admin
Suggestion accepted |
|
admin
Suggestion accepted |
|
admin
Suggestion accepted |
|
admin
Changes pushed |
Changes pushed
7 years ago
|