1
0
mirror of https://github.com/Tha14/toxic.git synced 2025-12-07 10:36:34 +01:00

manually fix merge conflicts

This commit is contained in:
Jfreegman
2015-06-29 03:11:21 -04:00
6 changed files with 35 additions and 24 deletions

View File

@@ -1,14 +1,14 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# Copyright (C) 2015 Toxic Team
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-05-28 15:47+0200\n"
"Project-Id-Version: Toxic 0.6.0\n"
"Report-Msgid-Bugs-To: JFreegman@tox.chat\n"
"POT-Creation-Date: 2015-05-30 11:30+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"