Hi everyone,
Great thanks for big Christmas gift (dt 1.4)!
Hope everyone had a good Christmas time!
Am I correct that if my translation was pushed into the master I should be
able to run git pull command without any issues, or not?
Just few min ago I have tried "git pull" and find out the next outcome:
alkhimmikk@Alchemist:~/darktable$ git pull
remote: Counting objects: 128, done.
remote: Compressing objects: 100% (105/105), done.
remote: Total 128 (delta 69), reused 75 (delta 20)
Receiving objects: 100% (128/128), 392.19 KiB | 282 KiB/s, done.
Resolving deltas: 100% (69/69), done.
>From git://github.com/darktable-org/darktable
b71aeed..e5ee7e6 master -> origin/master
* [new branch] darktable-1.4.x -> origin/darktable-1.4.x
>From git://github.com/darktable-org/darktable
* [new tag] release-1.4 -> release-1.4
* [new tag] release-1.5 -> release-1.5
Updating b71aeed..e5ee7e6
error: Your local changes to the following files would be overwritten by
merge:
po/uk.po
Please, commit your changes or stash them before you can merge.
Aborting
Previously I have the same message, but at that time I have changed copy of
uk.po, so I suggested that it was ok.
Thanks for help in advance and Happy New Year!
Cheers,
Nazarii
On 23 December 2013 01:51, Tobias Ellinghaus <h...@gmx.de> wrote:
> Am Montag, 23. Dezember 2013, 01:01:41 schrieb Nazarii Vitak:
> > Hi again
> >
> > Sorry for this - I definitely forgot to update template and thanks for
> > reminding.
> > Updated version is in the attachment. Hope not to late.
>
> Thanks, just in time. Pushed.
>
> > Cheers,
> >
> > Nazarii
>
> Tobias
>
> > On 21 December 2013 08:51, Tobias Ellinghaus <h...@gmx.de> wrote:
> > > Am Donnerstag, 12. Dezember 2013, 23:26:10 schrieb Nazarii Vitak:
> > > > Hi
> > >
> > > Hello again,
> > >
> > > > this is my update of ukrainian translation.
> > >
> > > we just had a look at the current state of translations and noticed
> that
> > > yours
> > > is missing about 20%. My guess is that you forgot to run
> "intltool-update
> > > uk"
> > > inside the directory po/.
> > >
> > > > Hope it is not too late to send it :)
> > >
> > > It would be awesome if you could update this over the weekend. Plans
> are
> > > to
> > > tag the release on monday, so you would have 2 days.
> > >
> > > Tobias
> > >
> > > PS: Every other developer should check this, too. There will be a
> separate
> > > mail with the official numbers.
> > >
> > > > On 24 November 2013 10:28, Tobias Ellinghaus <h...@gmx.de> wrote:
> > > > > Tada, STRING FREEZE!
> > >
> > >
> --------------------------------------------------------------------------
> > >
> > > > > ---- Shape the Mobile Experience: Free Subscription
> > > > > Software experts and developers: Be at the forefront of tech
> > >
> > > innovation.
> > >
> > > > > Intel(R) Software Adrenaline delivers strategic insight and
> > >
> > > game-changing
> > >
> > > > > conversations that shape the rapidly evolving mobile landscape.
> Sign
> > > > > up
> > > > > now.
> > >
> > >
> http://pubads.g.doubleclick.net/gampad/clk?id=63431311&iu=/4140/ostg.clktr
> > >
> > > > > k
> > > > > _______________________________________________
> > > > > darktable-devel mailing list
> > > > > darktable-devel@lists.sourceforge.net
> > > > > https://lists.sourceforge.net/lists/listinfo/darktable-devel
>
>
> ------------------------------------------------------------------------------
> Rapidly troubleshoot problems before they affect your business. Most IT
> organizations don't have a clear picture of how application performance
> affects their revenue. With AppDynamics, you get 100% visibility into your
> Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics
> Pro!
> http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
> _______________________________________________
> darktable-devel mailing list
> darktable-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/darktable-devel
>
>
------------------------------------------------------------------------------
Rapidly troubleshoot problems before they affect your business. Most IT
organizations don't have a clear picture of how application performance
affects their revenue. With AppDynamics, you get 100% visibility into your
Java,.NET, & PHP application. Start your 15-day FREE TRIAL of AppDynamics Pro!
http://pubads.g.doubleclick.net/gampad/clk?id=84349831&iu=/4140/ostg.clktrk
_______________________________________________
darktable-devel mailing list
darktable-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/darktable-devel
