1 new commit in wintenApps:
https://bitbucket.org/nvdaaddonteam/wintenapps/commits/cff426579db5/
Changeset: cff426579db5
Branch: stable
User: NVDA translation automation
Date: 2017-02-10 18:35:41+00:00
Summary: Fixing conflict in bg translation
Affected #: 1 file
diff --git a/addon/locale/bg/LC_MESSAGES/nvda.po
b/addon/locale/bg/LC_MESSAGES/nvda.po
index c4e0084..493fbc5 100644
--- a/addon/locale/bg/LC_MESSAGES/nvda.po
+++ b/addon/locale/bg/LC_MESSAGES/nvda.po
@@ -8,7 +8,11 @@ msgstr ""
"Project-Id-Version: wintenApps 16.07\n"
"Report-Msgid-Bugs-To: nvda-translations@xxxxxxxxxxxxx\n"
"POT-Creation-Date: 2016-07-09 05:48+1000\n"
+<<<<<<< Updated upstream
"PO-Revision-Date: 2017-02-10 19:11+0100\n"
+=======
+"PO-Revision-Date: 2017-01-27 15:50+0200\n"
+>>>>>>> Stashed changes
"Last-Translator: Kostadin Kolev <k_kolev1985@xxxxxxx>\n"
"Language: bg\n"
"MIME-Version: 1.0\n"
Repository URL: https://bitbucket.org/nvdaaddonteam/wintenapps/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.
