[Bf-translations-svn] SVN commit: /data/svn/bf-translations [1643] branches/hi/hi.po: reached to 6

[Bastien Montagne]

Hi Roshan,

On 18/03/2013 13:12, bf-translations at blender.org wrote:
> Revision: 1643
>            http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=1643
> Author:   roshan
> Date:     2013-03-18 12:12:23 +0000 (Mon, 18 Mar 2013)
> Log Message:
> -----------
> reached to 6
>
> Modified Paths:
> --------------
>      branches/hi/hi.po
>
> Modified: branches/hi/hi.po
> ===================================================================
> --- branches/hi/hi.po	2013-03-18 08:06:35 UTC (rev 1642)
> +++ branches/hi/hi.po	2013-03-18 12:12:23 UTC (rev 1643)
> @@ -2,18 +2,22 @@
>   # FIRST AUTHOR<EMAIL at ADDRESS>, YEAR.
>   msgid ""
>   msgstr ""
> -"Project-Id-Version: Blender 2.66 (sub 1) (r55197)\n"
> +"Project-Id-Version: Blender 2.66 (sub 1) (r55023)\n"
>   "Report-Msgid-Bugs-To: \n"
> -"POT-Creation-Date: 2013-03-11 21:14:31\n"
> +<<<<<<<  .mine
> +"POT-Creation-Date: 2013-03-04 15:04:05\n"
>   "PO-Revision-Date: 2013-03-11 16:02+0\n"
> +=======
> +"POT-Creation-Date: \n"
> +"PO-Revision-Date: 2013-03-18 12:00-0000\n"
> +>>>>>>>  .r13
>   "Last-Translator: Roshan Lal Gumasta (AniSecrets)<info at anisecrets.com>\n"
>   "Language-Team: Hindi<www.anisecrets.com>\n"
> -"Language: \n"
>   "MIME-Version: 1.0\n"
>   "Content-Type: text/plain; charset=UTF-8\n"
>   "Content-Transfer-Encoding: 8bit\n"
>   "Plural-Forms: \n"
> -"X-Generator: Easy Po 0.9.4\n"
> +"X-Generator: Poedit 1.5.5\n"
>   "X-Poedit-SourceCharset: UTF-8"

Please note the "+<<<<<<< .mine", "+=======" and "+>>>>>>> .r13" lines. 
These define what's called in CVS systems a merge conflict, i.e. SVN did 
not find a way to do the merge of this part itself. So it's up to you to 
decide what to do (usually either keep your version, or the upstream one).

In anyway, as I already said you last week, _*DO NOT COMMIT FILES WITH 
SUCH LINES_*! They are completely broken (completely unusable as po 
files). Last week I took the time to cleanup your file, this time I 
won't! If it's not solved before this evening (european hour), I will 
simply revert your commit before I update the branches from current 
Blender trunk.

Best regards,
Bastien