[Qgis-community-team] translation disappeared

[Otto Dassau]

Hi Minoru,

ok, I pushed the reapplied commits into translation branch and wait for the
other commits from Yoichi. Hopefully we are uptodate then again.

Regards and thanks!
Otto

Am Tue, 25 Jun 2013 19:49:43 +0900
schrieb Minoru Akagi <akaginch at gmail.com>:

> Hi Otto,
> 
> The following command can reapply the commits. I'm not sure if this is
> the best way, though. Yoichi's commits are not included here. He will
> be able to recover them by himself. Could you execute this command?
> 
> git cherry-pick 9c995ce ea58c04 125bfe4 25777d6 05c5fde eca2586 fe9865a
> 831f342
> 
> 
> Minoru
> 
> 2013/6/25 Minoru Akagi <akaginch at gmail.com>:
> > Hi,
> > There are some files that were reverted unintentionally. We can see
> > that the commits of the changes remain in the branch, so we will be
> > able to commit them again.
> >
> > Minoru
> >
> > 2013/6/25 Otto Dassau <dassau at gbd-consult.de>:
> >> Hi Minoru,
> >>
> >> as Nathan said, do you still have the commits you did, so we can commit
> >> them to manual_en_v1.8 branch again?
> >>
> >> Otto
> >>
> >> Am Tue, 25 Jun 2013 12:50:52 +0900
> >> schrieb Minoru Akagi <akaginch at gmail.com>:
> >>
> >>> Unfortunately, the commits from f517e89 to the revert-commit were not
> >>> reapplied by git-revert (due to complicated commit graph?). They
> >>> should be reapplied manually. Could someone help us, please?
> >>>
> >>> Minoru
> >>>
> >>> 2013/6/25 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
> >>> >>
> >>> >
> >>> >
> >>> > _______________________________________________
> >>> > 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