Changes in Tails/wiki/src/index.*.po @ Tails translation platform

747 / 954

/ 954

emmapeel

Changes pushed

Changes pushed 03/28/2018

emmapeel

Repository merge failed

Auto-merging wiki/src/news/version_3.6.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.pt.po
Auto-merging wiki/src/news/version_3.6.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.it.po
Auto-merging wiki/src/news/version_3.6.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fr.po
Auto-merging wiki/src/news/version_3.6.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fa.po
Auto-merging wiki/src/news/version_3.6.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.es.po
Auto-merging wiki/src/news/version_3.6.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.de.po
Auto-merging wiki/src/news/version_3.6.1.pt.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.pt.po
Auto-merging wiki/src/news/version_3.6.1.it.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.it.po
Auto-merging wiki/src/news/version_3.6.1.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fr.po
Auto-merging wiki/src/news/version_3.6.1.fa.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fa.po
Auto-merging wiki/src/news/version_3.6.1.es.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.es.po
Auto-merging wiki/src/news/version_3.6.1.de.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.de.po
Auto-merging wiki/src/news/duckduckgo_challenge.es.po
CONFLICT (content): Merge conflict in wiki/src/news/duckduckgo_challenge.es.po
Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Auto-merging wiki/src/contribute/how/user_experience.mdwn
Auto-merging wiki/src/contribute.it.po
CONFLICT (content): Merge conflict in wiki/src/contribute.it.po
Auto-merging wiki/src/contribute.es.po
Auto-merging wiki/src/about/contact.pt.po
CONFLICT (content): Merge conflict in wiki/src/about/contact.pt.po
Auto-merging wiki/src/about/contact.it.po
Auto-merging wiki/src/about/contact.fa.po
Auto-merging wiki/src/about/contact.es.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/28/2018

emmapeel

Repository merge failed

Auto-merging wiki/src/doc/first_steps/bug_reporting.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.pt.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.it.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.it.po
Auto-merging wiki/src/doc/first_steps/bug_reporting.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/first_steps/bug_reporting.fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/26/2018

admin

Changes pushed

Changes pushed 03/23/2018

admin

Changes pushed

Changes pushed 03/23/2018

admin

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 03/23/2018

admin

Changes pushed

Changes pushed 03/23/2018

admin

Repository merge failed

Auto-merging wiki/src/press.pt.po
CONFLICT (content): Merge conflict in wiki/src/press.pt.po
Auto-merging wiki/src/press.it.po
Auto-merging wiki/src/press.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/23/2018

admin

Changes pushed

Changes pushed 03/22/2018

None

Repository merge failed

Auto-merging wiki/src/news/version_3.6.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.fr.po
Auto-merging wiki/src/news/version_3.6.1.fr.po
CONFLICT (content): Merge conflict in wiki/src/news/version_3.6.1.fr.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/22/2018

emmapeel

Changes pushed

Changes pushed 03/22/2018

emmapeel

Repository merged

Repository merged

Original revision: N/A
New revision: N/A 03/22/2018

emmapeel

Changes pushed

Changes pushed 03/22/2018

emmapeel

Changes pushed

Changes pushed 03/22/2018

admin

Changes pushed

Changes pushed 03/22/2018

admin

Repository merge failed

Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/22/2018

admin

Repository merge failed

Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/22/2018

emmapeel

Repository merge failed

Auto-merging wiki/src/install/inc/steps/download.inline.pt.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.pt.po
Auto-merging wiki/src/install/inc/steps/download.inline.it.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.it.po
Auto-merging wiki/src/install/inc/steps/download.inline.fa.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.fa.po
Auto-merging wiki/src/install/inc/steps/download.inline.de.po
CONFLICT (content): Merge conflict in wiki/src/install/inc/steps/download.inline.de.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/22/2018

emmapeel

Changes pushed

Changes pushed 03/21/2018

emmapeel

Repository merge failed

Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.pt.po
Auto-merging wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
CONFLICT (content): Merge conflict in wiki/src/doc/about/acknowledgments_and_similar_projects.fa.po
Automatic merge failed; fix conflicts and then commit the result. (1)

03/21/2018

747 / 954

/ 954

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.