Am Samstag, 28. Dezember 2013, 00:54:44 schrieb Nazarii Vitak: > 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.
Are you sure you didn't change anything in your local copy of that file? Maybe you reran intltool-update to check how much was translated? You should copy the uk.po file to a safe location, update and compare: cd po/ intltool-update uk <remember the number of translated strings> mv uk.po uk.po.bak git checkout uk.po git pull intltool-update uk <does it report the same amount of strings?> git checkout uk.po Now you can decide if you want to delete uk.po.bak or keep it because it contains actual changes. > Thanks for help in advance and Happy New Year! > > Cheers, > Nazarii Tobias [...]
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ 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
