[Bf-translations-svn] SVN commit: /data/svn/bf-translations [2222] branches/hi/hi.po:

[bf-translations at blender.org]

Revision: 2222
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-translations&revision=2222
Author:   roshan
Date:     2013-09-13 05:50:48 +0000 (Fri, 13 Sep 2013)
Log Message:
-----------


Modified Paths:
--------------
    branches/hi/hi.po

Modified: branches/hi/hi.po
===================================================================
--- branches/hi/hi.po	2013-09-13 05:36:58 UTC (rev 2221)
+++ branches/hi/hi.po	2013-09-13 05:50:48 UTC (rev 2222)
@@ -5,23 +5,21 @@
 "Project-Id-Version: Blender 2.68 (sub 4) (r59969)\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2013-09-09 22:21:46\n"
-<<<<<<< .mine
-"PO-Revision-Date: 2013-09-12 21:08+0500\n"
-"Last-Translator: Roshan Lal Gumasta (AniSecrets) <info at anisecrets.com>\n"
-=======
-"PO-Revision-Date: 2013-09-13 10:50+0530\n"
+"PO-Revision-Date: 2013-09-13 11:16+0530\n"
 "Last-Translator: \n"
->>>>>>> .r2220
 "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.7\n"
 
 #. :src: bpy.types.ActionGroup
 msgid "Action Group"
+
+
+#. :src: bpy.types.ActionGroup
+msgid "Action Group"
 msgstr "कार्य समूह"
 
 #. :src: bpy.types.ActionGroup