hi,
thanks for reviewing, everything is fine from mypov, please pull:
> https://gitlab.com/spriver/tails.git
> [review-de_your_data 0c94150] Reviewed review, fixed one typo and one
> stylistic issue
cheers,
muri
On 12/02/2015 02:31 PM, spriver wrote:
> Hi,
>
> thanks for doing this. I reviewed the review and made two small
> changes in one string.
>
> https://gitlab.com/spriver/tails.git
> [review-de_your_data 0c94150] Reviewed review, fixed one typo and one
> stylistic issue
>
> Cheers!
> spriver
>
> Muri Nicanor:
>> i think it was still based on a feature branch, but i copied the
>> file to a new branch based on master (commit 8d07b50) and did the
>> review that way. please review:
>
>> https://gitlab.com/muri/tails.git [muri-t10n/review-de_your_data
>> 3521700] reviewed the translation and made some small changes
>
>> cheers, muri
>
>> On 11/24/2015 05:57 PM, spriver wrote:
>>> Hi, I pulled from master and applied the changes manually again.
>>> Please check if it works. As a last alternative I could send
>>> those files manually ;)
>>>
>>>
>>> Muri Nicanor:
>>>> now both of them are based on feature/jessie ;)
>>>
>>>> On 11/24/2015 11:24 AM, spriver wrote:
>>>>> Hi, for both branches I deleted the branches now and imported
>>>>> the file manually and pushed them back. I think that in the
>>>>> initial de_your_data I tried to fix a wiki-build error which
>>>>> was then resolved in master.
>>>>>
>>>>> Give it another try please (: If it won't work you'll get a
>>>>> free beer from me at congress ;)
>>>>>
>>>>> Cheers! spriver
>>>>>
>>>>> Muri Nicanor:
>>>>>> are you sure you pushed? git fetch spriver didn't mention
>>>>>> any change on that branch. anyway, there were also other
>>>>>> files included in that commit, the upgrade.fr.po was the
>>>>>> only one with a merge conflict... (its the same with the
>>>>>> de_create_use branch)
>>>>>
>>>>>> cheers, muri
>>>>>
>>>>>> On 11/23/2015 08:00 PM, spriver wrote:
>>>>>>> Hi, I rebased and skipped the file now. I pushed back to
>>>>>>> my repo, could you give it another try? Otherwise I will
>>>>>>> fix it manually.
>>>>>>>
>>>>>>> Cheers! spriver
>>>>>>>
>>>>>>> Muri Nicanor:
>>>>>>>> $ git merge spriver/de_your_data Auto-merging
>>>>>>>> wiki/src/doc/first_steps/upgrade.fr.po CONFLICT
>>>>>>>> (content): Merge conflict in
>>>>>>>> wiki/src/doc/first_steps/upgrade.fr.po Automatic merge
>>>>>>>> failed; fix conflicts and then commit the result.
>>>>>>>
>>>>>>>> i think that file shouldn't even be changed by that
>>>>>>>> commit?
>>>>>>>
>>>>>>>> cheers, muri
>>>>>>>
>>>>>>>> On 11/22/2015 08:08 PM, spriver wrote:
>>>>>>>>> Hi,
>>>>>>>>>
>>>>>>>>> I translated the topic-mentioned page. Please
>>>>>>>>> review:
>>>>>>>>>
>>>>>>>>> https://gitlab.com/spriver/tails.git branch:
>>>>>>>>> de_your_data latest commit: 052b5372 Fixed link and
>>>>>>>>> spelling after rebase
>>>>>>>>>
>>>>>>>>> Cheers! spriver
> _______________________________________________
> Tails-l10n mailing list
> Tails-l10n@???
> https://mailman.boum.org/listinfo/tails-l10n
> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
>
