From 6f14ccc335e236619331220ccaee9d60bb25c63f Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 8 Jan 2013 13:19:35 +0000 Subject: fix ru.po after bad svn merge git-svn-id: svn://localhost/ardour2/branches/3.0@13808 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/po/ru.po | 5 ----- 1 file changed, 5 deletions(-) (limited to 'libs/ardour/po') 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: Александр Прокудин \n" "Language-Team: русский <>\n" "Language: \n" -- cgit v1.2.3