Component Translated Unfinished Unfinished words Unfinished characters Untranslated Checks Suggestions Comments
Application GPL-3.0-or-later 90% 392 2,253 15,218 345 48 1 0
Glossary Setzer GPL-3.0-or-later 0 0 0 0 0 0 0

Overview

Project website www.cvfosammmm.org/setzer
Instructions for translators

Thank you for your interest in translating Setzer! If you have any problems, don't hesitate to ask in our GitHub issues.

Project maintainers User avatar cvfosammmm
3 weeks ago

String statistics

Strings percent Hosted strings Words percent Hosted words Characters percent Hosted characters
Total 4,207 21,868 143,388
Source 601 3,124 20,484
Translated 90% 3,815 89% 19,615 89% 128,170
Needs editing 1% 47 1% 300 1% 2,044
Read-only 14% 601 14% 3,124 14% 20,484
Failing checks 1% 48 2% 534 2% 3,462
Strings with suggestions 1% 1 1% 59 1% 353
Untranslated strings 8% 345 8% 1,953 9% 13,174

Quick numbers

21,868
Hosted words
4,207
Hosted strings
90%
Translated
and previous 30 days

Trends of last 30 days

Hosted words
+100%
Hosted strings
+100%
Translated
+90%
Contributors
User avatar None

Repository rebase failed

Rebasing (1/9)
Auto-merging data/resources/help/latex2e_0.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_0.html
Auto-merging data/resources/help/latex2e_1.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_1.html
Auto-merging data/resources/help/latex2e_10.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_10.html
Auto-merging data/resources/help/latex2e_11.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_11.html
Auto-merging data/resources/help/latex2e_12.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_12.html
Auto-merging data/resources/help/latex2e_13.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_13.html
Auto-merging data/resources/help/latex2e_14.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_14.html
Auto-merging data/resources/help/latex2e_15.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_15.html
Auto-merging data/resources/help/latex2e_16.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_16.html
Auto-merging data/resources/help/latex2e_17.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_17.html
Auto-merging data/resources/help/latex2e_18.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_18.html
Auto-merging data/resources/help/latex2e_19.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_19.html
Auto-merging data/resources/help/latex2e_2.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_2.html
Auto-merging data/resources/help/latex2e_20.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_20.html
Auto-merging data/resources/help/latex2e_21.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_21.html
Auto-merging data/resources/help/latex2e_22.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_22.html
Auto-merging data/resources/help/latex2e_23.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_23.html
Auto-merging data/resources/help/latex2e_24.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_24.html
Auto-merging data/resources/help/latex2e_25.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_25.html
Auto-merging data/resources/help/latex2e_26.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_26.html
Auto-merging data/resources/help/latex2e_27.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_27.html
Auto-merging data/resources/help/latex2e_28.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_28.html
Auto-merging data/resources/help/latex2e_29.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_29.html
Auto-merging data/resources/help/latex2e_3.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_3.html
Auto-merging data/resources/help/latex2e_30.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_30.html
Auto-merging data/resources/help/latex2e_4.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_4.html
Auto-merging data/resources/help/latex2e_5.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_5.html
Auto-merging data/resources/help/latex2e_6.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_6.html
Auto-merging data/resources/help/latex2e_7.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_7.html
Auto-merging data/resources/help/latex2e_8.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_8.html
Auto-merging data/resources/help/latex2e_9.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_9.html
Auto-merging data/resources/themes/default-dark.css
CONFLICT (content): Merge conflict in data/resources/themes/default-dark.css
Auto-merging data/resources/themes/default.css
CONFLICT (content): Merge conflict in data/resources/themes/default.css
Auto-merging setzer/workspace/help_panel/help_panel_presenter.py
CONFLICT (content): Merge conflict in setzer/workspace/help_panel/help_panel_presenter.py
Auto-merging setzer/workspace/help_panel/help_panel_viewgtk.py
error: could not apply 134e310... recolor help panel
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 134e310... recolor help panel
 (1)
a month ago
User avatar None

Repository notification received

GitHub: https://github.com/cvfosammmm/Setzer, master a month ago
User avatar None

Alert triggered

Component seems unused. 3 months ago
User avatar None

Repository rebase failed

Rebasing (1/9)
Auto-merging data/resources/help/latex2e_0.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_0.html
Auto-merging data/resources/help/latex2e_1.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_1.html
Auto-merging data/resources/help/latex2e_10.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_10.html
Auto-merging data/resources/help/latex2e_11.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_11.html
Auto-merging data/resources/help/latex2e_12.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_12.html
Auto-merging data/resources/help/latex2e_13.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_13.html
Auto-merging data/resources/help/latex2e_14.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_14.html
Auto-merging data/resources/help/latex2e_15.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_15.html
Auto-merging data/resources/help/latex2e_16.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_16.html
Auto-merging data/resources/help/latex2e_17.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_17.html
Auto-merging data/resources/help/latex2e_18.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_18.html
Auto-merging data/resources/help/latex2e_19.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_19.html
Auto-merging data/resources/help/latex2e_2.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_2.html
Auto-merging data/resources/help/latex2e_20.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_20.html
Auto-merging data/resources/help/latex2e_21.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_21.html
Auto-merging data/resources/help/latex2e_22.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_22.html
Auto-merging data/resources/help/latex2e_23.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_23.html
Auto-merging data/resources/help/latex2e_24.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_24.html
Auto-merging data/resources/help/latex2e_25.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_25.html
Auto-merging data/resources/help/latex2e_26.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_26.html
Auto-merging data/resources/help/latex2e_27.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_27.html
Auto-merging data/resources/help/latex2e_28.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_28.html
Auto-merging data/resources/help/latex2e_29.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_29.html
Auto-merging data/resources/help/latex2e_3.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_3.html
Auto-merging data/resources/help/latex2e_30.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_30.html
Auto-merging data/resources/help/latex2e_4.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_4.html
Auto-merging data/resources/help/latex2e_5.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_5.html
Auto-merging data/resources/help/latex2e_6.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_6.html
Auto-merging data/resources/help/latex2e_7.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_7.html
Auto-merging data/resources/help/latex2e_8.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_8.html
Auto-merging data/resources/help/latex2e_9.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_9.html
Auto-merging data/resources/themes/default-dark.css
CONFLICT (content): Merge conflict in data/resources/themes/default-dark.css
Auto-merging data/resources/themes/default.css
CONFLICT (content): Merge conflict in data/resources/themes/default.css
Auto-merging setzer/workspace/help_panel/help_panel_presenter.py
CONFLICT (content): Merge conflict in setzer/workspace/help_panel/help_panel_presenter.py
Auto-merging setzer/workspace/help_panel/help_panel_viewgtk.py
error: could not apply 134e310... recolor help panel
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 134e310... recolor help panel
 (1)
3 months ago
User avatar None

Repository notification received

GitHub: https://github.com/cvfosammmm/Setzer, master 3 months ago
User avatar None

Repository rebase failed

Rebasing (1/9)
Auto-merging data/resources/help/latex2e_0.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_0.html
Auto-merging data/resources/help/latex2e_1.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_1.html
Auto-merging data/resources/help/latex2e_10.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_10.html
Auto-merging data/resources/help/latex2e_11.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_11.html
Auto-merging data/resources/help/latex2e_12.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_12.html
Auto-merging data/resources/help/latex2e_13.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_13.html
Auto-merging data/resources/help/latex2e_14.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_14.html
Auto-merging data/resources/help/latex2e_15.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_15.html
Auto-merging data/resources/help/latex2e_16.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_16.html
Auto-merging data/resources/help/latex2e_17.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_17.html
Auto-merging data/resources/help/latex2e_18.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_18.html
Auto-merging data/resources/help/latex2e_19.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_19.html
Auto-merging data/resources/help/latex2e_2.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_2.html
Auto-merging data/resources/help/latex2e_20.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_20.html
Auto-merging data/resources/help/latex2e_21.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_21.html
Auto-merging data/resources/help/latex2e_22.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_22.html
Auto-merging data/resources/help/latex2e_23.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_23.html
Auto-merging data/resources/help/latex2e_24.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_24.html
Auto-merging data/resources/help/latex2e_25.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_25.html
Auto-merging data/resources/help/latex2e_26.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_26.html
Auto-merging data/resources/help/latex2e_27.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_27.html
Auto-merging data/resources/help/latex2e_28.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_28.html
Auto-merging data/resources/help/latex2e_29.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_29.html
Auto-merging data/resources/help/latex2e_3.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_3.html
Auto-merging data/resources/help/latex2e_30.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_30.html
Auto-merging data/resources/help/latex2e_4.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_4.html
Auto-merging data/resources/help/latex2e_5.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_5.html
Auto-merging data/resources/help/latex2e_6.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_6.html
Auto-merging data/resources/help/latex2e_7.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_7.html
Auto-merging data/resources/help/latex2e_8.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_8.html
Auto-merging data/resources/help/latex2e_9.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_9.html
Auto-merging data/resources/themes/default-dark.css
CONFLICT (content): Merge conflict in data/resources/themes/default-dark.css
Auto-merging data/resources/themes/default.css
CONFLICT (content): Merge conflict in data/resources/themes/default.css
Auto-merging setzer/workspace/help_panel/help_panel_presenter.py
CONFLICT (content): Merge conflict in setzer/workspace/help_panel/help_panel_presenter.py
Auto-merging setzer/workspace/help_panel/help_panel_viewgtk.py
error: could not apply 134e310... recolor help panel
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 134e310... recolor help panel
 (1)
3 months ago
User avatar None

Repository notification received

GitHub: https://github.com/cvfosammmm/Setzer, master 3 months ago
User avatar None

Repository rebase failed

Rebasing (1/9)
Auto-merging data/resources/help/latex2e_0.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_0.html
Auto-merging data/resources/help/latex2e_1.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_1.html
Auto-merging data/resources/help/latex2e_10.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_10.html
Auto-merging data/resources/help/latex2e_11.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_11.html
Auto-merging data/resources/help/latex2e_12.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_12.html
Auto-merging data/resources/help/latex2e_13.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_13.html
Auto-merging data/resources/help/latex2e_14.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_14.html
Auto-merging data/resources/help/latex2e_15.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_15.html
Auto-merging data/resources/help/latex2e_16.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_16.html
Auto-merging data/resources/help/latex2e_17.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_17.html
Auto-merging data/resources/help/latex2e_18.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_18.html
Auto-merging data/resources/help/latex2e_19.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_19.html
Auto-merging data/resources/help/latex2e_2.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_2.html
Auto-merging data/resources/help/latex2e_20.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_20.html
Auto-merging data/resources/help/latex2e_21.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_21.html
Auto-merging data/resources/help/latex2e_22.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_22.html
Auto-merging data/resources/help/latex2e_23.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_23.html
Auto-merging data/resources/help/latex2e_24.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_24.html
Auto-merging data/resources/help/latex2e_25.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_25.html
Auto-merging data/resources/help/latex2e_26.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_26.html
Auto-merging data/resources/help/latex2e_27.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_27.html
Auto-merging data/resources/help/latex2e_28.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_28.html
Auto-merging data/resources/help/latex2e_29.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_29.html
Auto-merging data/resources/help/latex2e_3.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_3.html
Auto-merging data/resources/help/latex2e_30.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_30.html
Auto-merging data/resources/help/latex2e_4.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_4.html
Auto-merging data/resources/help/latex2e_5.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_5.html
Auto-merging data/resources/help/latex2e_6.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_6.html
Auto-merging data/resources/help/latex2e_7.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_7.html
Auto-merging data/resources/help/latex2e_8.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_8.html
Auto-merging data/resources/help/latex2e_9.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_9.html
Auto-merging data/resources/themes/default-dark.css
CONFLICT (content): Merge conflict in data/resources/themes/default-dark.css
Auto-merging data/resources/themes/default.css
CONFLICT (content): Merge conflict in data/resources/themes/default.css
Auto-merging setzer/workspace/help_panel/help_panel_presenter.py
CONFLICT (content): Merge conflict in setzer/workspace/help_panel/help_panel_presenter.py
Auto-merging setzer/workspace/help_panel/help_panel_viewgtk.py
error: could not apply 134e310... recolor help panel
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 134e310... recolor help panel
 (1)
7 months ago
User avatar None

Repository notification received

GitHub: https://github.com/cvfosammmm/Setzer, master 7 months ago
User avatar None

Repository rebase failed

Rebasing (1/9)
Auto-merging data/resources/help/latex2e_0.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_0.html
Auto-merging data/resources/help/latex2e_1.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_1.html
Auto-merging data/resources/help/latex2e_10.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_10.html
Auto-merging data/resources/help/latex2e_11.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_11.html
Auto-merging data/resources/help/latex2e_12.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_12.html
Auto-merging data/resources/help/latex2e_13.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_13.html
Auto-merging data/resources/help/latex2e_14.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_14.html
Auto-merging data/resources/help/latex2e_15.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_15.html
Auto-merging data/resources/help/latex2e_16.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_16.html
Auto-merging data/resources/help/latex2e_17.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_17.html
Auto-merging data/resources/help/latex2e_18.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_18.html
Auto-merging data/resources/help/latex2e_19.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_19.html
Auto-merging data/resources/help/latex2e_2.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_2.html
Auto-merging data/resources/help/latex2e_20.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_20.html
Auto-merging data/resources/help/latex2e_21.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_21.html
Auto-merging data/resources/help/latex2e_22.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_22.html
Auto-merging data/resources/help/latex2e_23.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_23.html
Auto-merging data/resources/help/latex2e_24.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_24.html
Auto-merging data/resources/help/latex2e_25.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_25.html
Auto-merging data/resources/help/latex2e_26.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_26.html
Auto-merging data/resources/help/latex2e_27.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_27.html
Auto-merging data/resources/help/latex2e_28.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_28.html
Auto-merging data/resources/help/latex2e_29.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_29.html
Auto-merging data/resources/help/latex2e_3.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_3.html
Auto-merging data/resources/help/latex2e_30.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_30.html
Auto-merging data/resources/help/latex2e_4.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_4.html
Auto-merging data/resources/help/latex2e_5.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_5.html
Auto-merging data/resources/help/latex2e_6.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_6.html
Auto-merging data/resources/help/latex2e_7.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_7.html
Auto-merging data/resources/help/latex2e_8.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_8.html
Auto-merging data/resources/help/latex2e_9.html
CONFLICT (content): Merge conflict in data/resources/help/latex2e_9.html
Auto-merging data/resources/themes/default-dark.css
CONFLICT (content): Merge conflict in data/resources/themes/default-dark.css
Auto-merging data/resources/themes/default.css
CONFLICT (content): Merge conflict in data/resources/themes/default.css
Auto-merging setzer/workspace/help_panel/help_panel_presenter.py
CONFLICT (content): Merge conflict in setzer/workspace/help_panel/help_panel_presenter.py
Auto-merging setzer/workspace/help_panel/help_panel_viewgtk.py
error: could not apply 134e310... recolor help panel
hint: Resolve all conflicts manually, mark them as resolved with
hint: "git add/rm <conflicted_files>", then run "git rebase --continue".
hint: You can instead skip this commit: run "git rebase --skip".
hint: To abort and get back to the state before "git rebase", run "git rebase --abort".
Could not apply 134e310... recolor help panel
 (1)
7 months ago
Browse all project changes