hi,
i've reviewed the changes and everything is fine, please pull:
On 09/11/2015 11:42 PM, spriver wrote:
> Please review:
> https://gitlab.com/spriver/tails.git
> branch: review-de_tor_browser
> commit: ad051cea Review of Muri's review, several typos corrected,
> added German translations for TBB dialogue
thanks
cheers,
muri
>
>
> Muri Nicanor:
>> oke, no problem. now that i had to rebase a branch myself i
>> totally understand how confusing that can be (don't know yet if i
>> did it correct myself ;))
>
>> so i created a new branch, merged your commits, made some changes
>> and translated the new parts: https://gitlab.com/muri/tails.git
>> branch: muri-t10n/review_de_tor_browser commit: c939e5e merged into
>> master, reviewed sprivers initial translation, did some rewording
>> and translated the new parts
>
>> please review, cheers, muri
>
>> On 09/08/2015 08:08 PM, spriver wrote:
>>> Hi, I tried around with my repo but I could not really figure out
>>> what to do now...what I understand regarding to the rebase is
>>> that I shall merge both commits of mine? Or am I getting
>>> something wrong here? (git is a bit of some sort of magic for me
>>> ;) ) Can someone help me here ?
>>>
>>> Cheers!
>>>
>>> Muri Nicanor:
>>>> hi,
>>>
>>>> On 08/02/2015 08:08 PM, spriver wrote:
>>>>> https://gitlab.com/spriver/tails.git branch: de_tor_browser
>>>>> latest commit: f4199a8 Several edit's and corrections
>>>> well, i think we've waited too long and now i get a conflict
>>>> when trying to merge the branch into the current master...
>>>> spriver, if its not too much to ask, could you rebase the
>>>> branch on current master?
>>>
>>>> cheers, muri
>
> 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@???.
>
