Changes @ Tails translation platform

243 / 633

/ 633

emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 05/07/2018

emmapeel

Changes pushed

Changes pushed 05/07/2018

emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 05/07/2018

emmapeel

Resource updated

The “wiki/src/support/known_issues.es.po” file was changed. 05/05/2018

emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade/tails.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.pt.po
Auto-merging wiki/src/upgrade/tails-overview.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-overview.pt.po
Auto-merging wiki/src/upgrade/tails-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails-download.pt.po
Auto-merging wiki/src/upgrade/clone.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/clone.pt.po
Auto-merging wiki/src/upgrade/clone-overview.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/clone-overview.pt.po
Auto-merging wiki/src/upgrade.pt.po
CONFLICT (content): Merge conflict in wiki/src/upgrade.pt.po
Auto-merging wiki/src/torrents.pt.po
CONFLICT (content): Merge conflict in wiki/src/torrents.pt.po
Auto-merging wiki/src/support/known_issues/graphics.pt.po
Auto-merging wiki/src/support/known_issues.pt.po
Auto-merging wiki/src/support/known_issues.fa.po
Auto-merging wiki/src/support/faq.pt.po
CONFLICT (content): Merge conflict in wiki/src/support/faq.pt.po
Auto-merging wiki/src/install/win/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb.pt.po
Auto-merging wiki/src/install/win/usb-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/win/usb-download.pt.po
Auto-merging wiki/src/install/win.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/win.pt.po
Auto-merging wiki/src/install/vm-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/vm-download.pt.po
Auto-merging wiki/src/install/mac/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb.pt.po
Auto-merging wiki/src/install/mac/usb-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/usb-download.pt.po
Auto-merging wiki/src/install/mac/dvd-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/dvd-download.pt.po
Auto-merging wiki/src/install/mac/clone.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac/clone.pt.po
Auto-merging wiki/src/install/mac.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/mac.pt.po
Auto-merging wiki/src/install/linux/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.pt.po
Auto-merging wiki/src/install/linux/usb-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb-download.pt.po
Auto-merging wiki/src/install/expert/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/expert/usb.pt.po
Auto-merging wiki/src/install/dvd-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/dvd-download.pt.po
Auto-merging wiki/src/install/download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/download.pt.po
Auto-merging wiki/src/install/debian/usb.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb.pt.po
Auto-merging wiki/src/install/debian/usb-download.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/debian/usb-download.pt.po
Auto-merging wiki/src/install/debian.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/debian.pt.po
Auto-merging wiki/src/doc/advanced_topics/wireless_devices.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/wireless_devices.pt.po
Auto-merging wiki/src/doc/advanced_topics/virtualization.caution.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/virtualization.caution.pt.po
Auto-merging wiki/src/doc/advanced_topics/paperkey.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/paperkey.pt.po
Auto-merging wiki/src/doc/advanced_topics/lan.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/lan.pt.po
Auto-merging wiki/src/doc/advanced_topics/additional_software.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/advanced_topics/additional_software.pt.po
Auto-merging wiki/src/doc/about/warning.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/warning.pt.po
Auto-merging wiki/src/doc/about/openpgp_keys.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/openpgp_keys.pt.po
Auto-merging wiki/src/doc/about.index.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/about.index.pt.po
Automatic merge failed; fix conflicts and then commit the result. (1)

05/05/2018

emmapeel

Changes pushed

Changes pushed 05/05/2018

emmapeel

Changes pushed

Changes pushed 05/05/2018

emmapeel

Changes pushed

Changes pushed 05/05/2018

emmapeel

Repository merge failed

Auto-merging wiki/src/upgrade/tails.pt.po
Auto-merging wiki/src/upgrade/tails.it.po
CONFLICT (content): Merge conflict in wiki/src/upgrade/tails.it.po
Auto-merging wiki/src/upgrade/tails.fr.po
Auto-merging wiki/src/upgrade/tails.fa.po
Auto-merging wiki/src/upgrade/tails.es.po
Auto-merging wiki/src/upgrade/tails.de.po
Auto-merging wiki/src/install/win/usb.es.po
Auto-merging wiki/src/install/linux/usb.pt.po
Auto-merging wiki/src/install/linux/usb.it.po
CONFLICT (content): Merge conflict in wiki/src/install/linux/usb.it.po
Auto-merging wiki/src/install/linux/usb.fr.po
Auto-merging wiki/src/install/linux/usb.fa.po
Auto-merging wiki/src/install/linux/usb.de.po
Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.it.po
Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.fa.po
Auto-merging wiki/src/install/inc/steps/restart_second_time.inline.es.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.it.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.fa.po
Auto-merging wiki/src/install/inc/steps/restart_first_time.inline.es.po
Auto-merging wiki/src/install/inc/steps/not_at_all.inline.it.po
Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.it.po
Auto-merging wiki/src/install/inc/steps/install_final_in_debian.inline.fa.po
Auto-merging wiki/src/install/inc/steps/install_final.inline.it.po
Auto-merging wiki/src/install/inc/steps/install_final.inline.fa.po
Auto-merging wiki/src/install/inc/steps/create_persistence.inline.fa.po
Auto-merging wiki/src/install/inc/steps/create_persistence.inline.de.po
Auto-merging wiki/src/install/debian/usb.pt.po
Auto-merging wiki/src/install/debian/usb.it.po
Auto-merging wiki/src/install/debian/usb.fr.po
Auto-merging wiki/src/install/debian/usb.fa.po
Auto-merging wiki/src/install/debian/usb.es.po
Auto-merging wiki/src/install/debian/usb.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)

05/05/2018

emmapeel

Suggestion added

English

Portuguese 0 characters editedPrevious translation

05/03/2018

emmapeel

Changes pushed

Changes pushed 05/03/2018

emmapeel

Suggestion added

English

Arabic 0 characters editedPrevious translation

05/03/2018

emmapeel

Suggestion added

English

Arabic 0 characters editedCurrent translation

05/03/2018

emmapeel

Suggestion added

English

Arabic 0 characters editedCurrent translation

05/03/2018

emmapeel

Changes pushed

Changes pushed 05/03/2018

emmapeel

Changes pushed

Changes pushed 05/03/2018

emmapeel

Suggestion added

English

Spanish 0 characters editedPrevious translation

05/03/2018

emmapeel

Suggestion added

English

Spanish 0 characters editedPrevious translation

05/03/2018

emmapeel

Suggestion added

English

Spanish 0 characters editedPrevious translation

05/03/2018

emmapeel

Suggestion added

English

Spanish 0 characters editedPrevious translation

05/03/2018

243 / 633

/ 633

Search

Action

Author username

Exclude author (username)

Date range

Shortcut	Action
`?`	Open available keyboard shortcuts.
`Alt` + `Home`	Navigate to the first translation in the current search.
`Alt` + `End`	Navigate to the last translation in the current search.
`Alt` + `PageUp` or `Ctrl` + `↑` or `Alt` + `↑` or `Cmd` + `↑` or	Navigate to the previous translation in the current search.
`Alt` + `PageDown` or `Ctrl` + `↓` or `Alt` + `↓` or `Cmd` + `↓` or	Navigate to the next translation in the current search.
`Ctrl` + `Enter` or `Cmd` + `Enter`	Submit current form; this works the same as pressing Save and continue while editing translation.
`Ctrl` + `Shift` + `Enter` or `Cmd` + `Shift` +`Enter`	Unmark translation as Needing edit and submit it.
`Alt` + `Enter` or `Option` + `Enter`	Submit the string as a suggestion; this works the same as pressing Suggest while editing translation.
`Ctrl` + `E` or `Cmd` + `E`	Focus on translation editor.
`Ctrl` + `U` or `Cmd` + `U`	Focus on comment editor.
`Ctrl` + `M` or `Cmd` + `M`	Shows Automatic suggestions tab.
`Ctrl` + `1` to `Ctrl` + `9` or `Cmd` + `1` to `Cmd` + `9`	Copies placeable of a given number from source string.
`Ctrl` + `M` followed by `1` to `9` or `Cmd` + `M` followed by `1` to `9`	Copy the machine translation of a given number to current translation.
`Ctrl` + `I` followed by `1` to `9` or `Cmd` + `I` followed by `1` to `9`	Ignore one item in the list of failing checks.
`Ctrl` + `J` or `Cmd` + `J`	Shows the Nearby strings tab.
`Ctrl` + `S` or `Cmd` + `S`	Focus on search field.
`Ctrl` + `O` or `Cmd` + `O`	Copy the source string.
`Ctrl` + `Y` or `Cmd` + `Y`	Toggle the Needs editing checkbox.
`→`	Browse the next translation string.
`←`	Browse the previous translation string.