[Qgis-community-team] translation disappeared

[Otto Dassau]

ok fine. Just wanted to make sure, we don't mix more things up.

Thanks for your help

Otto

Am Tue, 25 Jun 2013 18:31:09 +1000
schrieb Nathan Woodrow <madmanwoo at gmail.com>:

> All good.  I wasn't going to apply any commits myself, just help work out
> how to get those missing commits back in without having to redo the work.
> 
> - Nathan
> 
> 
> On Tue, Jun 25, 2013 at 6:26 PM, Otto Dassau <dassau at gbd-consult.de> wrote:
> 
> > Hi,
> >
> > please don't add translations to master branch. Translation of docs is
> > only done in manual_en_v1.8 branch.
> >
> > Regards
> > Otto
> >
> > Am Tue, 25 Jun 2013 09:05:44 +1000
> > schrieb Nathan Woodrow <madmanwoo at gmail.com>:
> >
> > > If you both still have the commits you did, we should be able to reply
> > them
> > > on top of what is now the top of the master branch.
> > >
> > > What is the commit which overwrote all your work?
> > >
> > > - Nathan
> > >
> > >
> > > On Mon, Jun 24, 2013 at 6:30 AM, Marie Silvestre
> > > <marie_silvestre at yahoo.fr>wrote:
> > >
> > > > Hi Matteo,
> > > > I think every commit done after Yoichi's one (8 days ago) has to be
> > > > reapplied. I have the same problem with 1 commit concerning 3 files
> > and I
> > > > don't know how to proceed... Is there a git expert around to help?
> > > >
> > > > Marie
> > > >
> > > >
> > > >   ------------------------------
> > > >  *De :* matteo <matteo.ghetta at gmail.com>
> > > > *À :* qgis-community <Qgis-community-team at lists.osgeo.org>
> > > > *Envoyé le :* Dimanche 23 juin 2013 21h32
> > > > *Objet :* [Qgis-community-team] translation disappeared
> > > >
> > > > Hi,
> > > > a few days ago the last pull request of the italian files has been
> > > > merged. I checked and on the website all the documentation appeared
> > > > as translated.
> > > > But now the part about Sextante turned back untranslated (same fot
> > > > the pdf manual).
> > > > Is that due to the problem of the japanese translation issues just
> > > > described on the list?
> > > >
> > > > Cheers
> > > >
> > > > Matteo
> > > > _______________________________________________
> > > > Qgis-community-team mailing list
> > > > Qgis-community-team at lists.osgeo.org
> > > > http://lists.osgeo.org/mailman/listinfo/qgis-community-team
> > > >
> > > >
> > > >
> > > > _______________________________________________
> > > > Qgis-community-team mailing list
> > > > Qgis-community-team at lists.osgeo.org
> > > > http://lists.osgeo.org/mailman/listinfo/qgis-community-team
> > > >
> > > >
> >
> >
> > --
> > Geoinformatik Büro Dassau - http://www.gbd-consult.de
> > FOSSGIS consulting , training , support  and analysis
> > Ackerstrasse 144c  ,  D - 40233 Düsseldorf  , Germany
> > Tel: +49-(0)211-47468178 , Mobil: +49-(0)171-4687540
> >
> > --
> > Community Advisor - QGIS Project Steering Committee
> > _______________________________________________
> > Qgis-community-team mailing list
> > Qgis-community-team at lists.osgeo.org
> > http://lists.osgeo.org/mailman/listinfo/qgis-community-team
> >


-- 
Geoinformatik Büro Dassau - http://www.gbd-consult.de
FOSSGIS consulting , training , support  and analysis
Ackerstrasse 144c  ,  D - 40233 Düsseldorf  , Germany
Tel: +49-(0)211-47468178 , Mobil: +49-(0)171-4687540

--
Community Advisor - QGIS Project Steering Committee