Bug #16376

Merge of master into devel reverted some USB image doc work

Added by intrigeri 2019-01-19 12:52:23 . Updated 2019-01-30 11:50:41 .

Status:
Resolved
Priority:
High
Assignee:
Category:
Installation
Target version:
Start date:
2019-01-19
Due date:
% Done:

100%

Feature Branch:
bugfix/16376-fix-buggy-merge
Type of work:
Code
Blueprint:

Starter:
Affected tool:
Deliverable for:

Description

commit:a090926510fb986b124f1f8efb6c254e4661d5fa


Subtasks


History

#1 Updated by intrigeri 2019-01-19 13:02:21

  • Status changed from Confirmed to In Progress
  • Assignee changed from intrigeri to anonym
  • % Done changed from 0 to 50
  • QA Check set to Ready for QA
  • Feature Branch set to bugfix/16376-fix-buggy-merge

#2 Updated by xin 2019-01-19 19:24:43

I found other changes that disappeared:
faq.es.po, faq.fr.po and faq.it.po in f7d26a70
download.inline.de.po and download.inline.it.po in 4c33052e

#3 Updated by intrigeri 2019-01-20 10:16:49

  • QA Check changed from Ready for QA to Dev Needed

> I found other changes that disappeared:

FTR I’ll let anonym fix this. It would be nice if this could be done soonish, to make the outcome of our call for translations for 3.12 more useful :)

#4 Updated by anonym 2019-01-21 11:24:33

  • Status changed from In Progress to Fix committed
  • Assignee deleted (anonym)
  • % Done changed from 50 to 100
  • QA Check changed from Dev Needed to Pass

Thanks for cleaning up the crap I caused! :)

#5 Updated by intrigeri 2019-01-21 11:45:05

  • Status changed from Fix committed to In Progress
  • Assignee set to anonym
  • QA Check changed from Pass to Info Needed

Did you also fix the PO issues reported by xin?

#6 Updated by anonym 2019-01-25 10:24:30

  • Assignee changed from anonym to xin
  • QA Check changed from Info Needed to Ready for QA

intrigeri wrote:
> Did you also fix the PO issues reported by xin?

I was way too hasty an missed it. :/

Fixed in commit:392b14e25f8a9cac8fa860f7b7e02ea8b676090a already pushed to the testing branch (so if it is correct, translators can benefit). xin, can you please verify that this fixes the issues you identified?

#7 Updated by xin 2019-01-25 11:07:30

  • Assignee changed from xin to anonym
  • QA Check changed from Ready for QA to Dev Needed

> Fixed in commit:392b14e25f8a9cac8fa860f7b7e02ea8b676090a already pushed to the testing branch (so if it is correct, translators can benefit). xin, can you please verify that this fixes the issues you identified?

For download.inline it looks good (but you don’t need to do it for download.inline.fr.po, I fix it in a translation branch which is waiting for merge).

But you have revert the change in faq.mdwn so all changes in faq.*.po are wrong.

I you don’t have time, I can work on a new commit to fix that.

#8 Updated by xin 2019-01-26 17:05:01

  • QA Check changed from Dev Needed to Ready for QA

> But you have revert the change in faq.mdwn so all changes in faq.*.po are wrong.
>
> I you don’t have time, I can work on a new commit to fix that.

You can see my commit in the feature branch of my repo. Please review.

#9 Updated by anonym 2019-01-28 09:25:50

  • Status changed from In Progress to Fix committed

Applied in changeset commit:tails|b39a6ea543610ec4759e7f9dae0dd584a880f8b9.

#10 Updated by anonym 2019-01-28 09:26:22

  • Status changed from Fix committed to In Progress
  • Assignee changed from anonym to xin

Gah! I hope all is good with commit:b39a6ea543610ec4759e7f9dae0dd584a880f8b9 because that’s what’s going into Tails 3.12.

#11 Updated by xin 2019-01-28 12:13:21

  • Status changed from In Progress to Fix committed
  • Assignee deleted (xin)
  • QA Check changed from Ready for QA to Pass

anonym wrote:
> Gah! I hope all is good with commit:b39a6ea543610ec4759e7f9dae0dd584a880f8b9 because that’s what’s going into Tails 3.12.

It’s not good because it change .po without .mdwn, so changes was remove during .po update.
But this change is not so important, I will resubmit it later for master branch.

#12 Updated by anonym 2019-01-30 11:50:41

  • Status changed from Fix committed to Resolved