po: Update Turkish translation (second try)
volkangezer at gmail.com
Tue Jul 16 13:12:08 CDT 2013
2013/7/16 Francois Gouget <fgouget at free.fr>:
> -<<<<<<< HEAD
> -"PO-Revision-Date: 2013-07-13 04:49+0200\n"
> -"PO-Revision-Date: 2013-07-04 00:10+0200\n"
> ->>>>>>> 598685e6c5992355de35b4345e91eb4e50b9f07e
> +"PO-Revision-Date: 2013-07-13 05:00+0200\n"
> -#: attrib.rc:27 cmd.rc:322
> +#: attrib.rc:27 cmd.rc:325
> These look wrong: there is currently no conflict in the checked-in PO
> file and there should not be any line-number changes in the patch. So it
> won't apply to the current Git repository. Something must have happened
> when you rebased or generated the diff.
Thanks for info. What do you suggest me doing? Will I lose updated
strings if I do revert and do it again?
> Francois Gouget <fgouget at free.fr> http://fgouget.free.fr/
> In a world without fences who needs Gates?
More information about the wine-patches