summaryrefslogtreecommitdiff
path: root/libs/ardour/po
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2013-01-08 13:19:35 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2013-01-08 13:19:35 +0000
commit6f14ccc335e236619331220ccaee9d60bb25c63f (patch)
treee653cd2a3f74512736a0904f490a3523a6d3ec8c /libs/ardour/po
parent1b66aa86052eeee2c0e11afc7df1cc279c911cdb (diff)
fix ru.po after bad svn merge
git-svn-id: svn://localhost/ardour2/branches/3.0@13808 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/po')
-rw-r--r--libs/ardour/po/ru.po5
1 files changed, 0 insertions, 5 deletions
diff --git a/libs/ardour/po/ru.po b/libs/ardour/po/ru.po
index 42c12e4088..bc8e0b90a4 100644
--- a/libs/ardour/po/ru.po
+++ b/libs/ardour/po/ru.po
@@ -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"