fix ru.po after bad svn merge
authorPaul Davis <paul@linuxaudiosystems.com>
Tue, 8 Jan 2013 13:19:35 +0000 (13:19 +0000)
committerPaul Davis <paul@linuxaudiosystems.com>
Tue, 8 Jan 2013 13:19:35 +0000 (13:19 +0000)
git-svn-id: svn://localhost/ardour2/branches/3.0@13808 d708f5d6-7413-0410-9779-e7cbd77b26cf

libs/ardour/po/ru.po

index 42c12e4088ba7279d4aabe53b8f9acac3bd15dd4..bc8e0b90a40bcf035eeb7cb2c0bc77b457ca3cb1 100644 (file)
@@ -7,13 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: libardour 3\n"
 "Report-Msgid-Bugs-To: \n"
-<<<<<<< .mine
 "POT-Creation-Date: 2013-01-07 23:22+0400\n"
 "PO-Revision-Date: 2013-01-05 12:34+0300\n"
-=======
-"POT-Creation-Date: 2013-01-07 14:22-0500\n"
-"PO-Revision-Date: 2012-07-15 15:36+0400\n"
->>>>>>> .r13801
 "Last-Translator: Александр Прокудин <alexandre.prokoudine@gmail.com>\n"
 "Language-Team: русский <>\n"
 "Language: \n"