Skip to content

Commit

Permalink
Fix bad merge
Browse files Browse the repository at this point in the history
  • Loading branch information
@tino097
tino097 committed Dec 14, 2018
1 parent accca7a commit 1431a83
Show file tree
Hide file tree
Showing 48 changed files with 0 additions and 399 deletions.
8 changes: 0 additions & 8 deletions ckan/i18n/ar/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,24 +3,16 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
# Omar Isbaitan <oisbaitan@yahoo.com>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Omar Isbaitan <oisbaitan@yahoo.com>, 2018\n"
"Language: ar\n"
"Language-Team: Arabic (https://www.transifex.com/okfn/teams/11162/ar/)\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/bg/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,24 +3,16 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
# Ivaylo Petrov, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Ivaylo Petrov, 2018\n"
"Language: bg\n"
"Language-Team: Bulgarian (https://www.transifex.com/okfn/teams/11162/bg/)"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/ca/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: ca\n"
"Language-Team: Catalan (https://www.transifex.com/okfn/teams/11162/ca/)\n"
Expand Down
10 changes: 0 additions & 10 deletions ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,14 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Jakub Klímek <klimek@ksi.mff.cuni.cz>, 2018
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Jakub Klímek <klimek@ksi.mff.cuni.cz>, 2018\n"
"Language-Team: Czech (Czech Republic) (https://www.transifex.com/okfn/teams/11162/cs_CZ/)\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
Expand All @@ -28,7 +19,6 @@ msgstr ""
"(https://www.transifex.com/okfn/teams/11162/cs_CZ/)\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && "
"n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3\n"
>>>>>>> 0d80c9715... Update po files
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
"Content-Transfer-Encoding: 8bit\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/da_DK/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: da_DK\n"
"Language-Team: Danish (Denmark) "
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/de/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,24 +3,16 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
# Ondics Githubler, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Ondics Githubler, 2018\n"
"Language: de\n"
"Language-Team: German (https://www.transifex.com/okfn/teams/11162/de/)\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/el/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,24 +3,16 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
# Sotirios Karampatakis <s.karampatakis@gmail.com>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Sotirios Karampatakis <s.karampatakis@gmail.com>, 2018\n"
"Language: el\n"
"Language-Team: Greek (https://www.transifex.com/okfn/teams/11162/el/)\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/en_AU/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: en_AU\n"
"Language-Team: English (Australia) "
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/en_GB/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: en_GB\n"
"Language-Team: English (United Kingdom) "
Expand Down
9 changes: 0 additions & 9 deletions ckan/i18n/es/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,29 +3,20 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Mihai Pantazi <malexandru_70@hotmail.com>, 2018
# Isabel M Ruiz Mellado <inactive+imruiz@transifex.com>, 2018
# David Portoles <dportoles@idearium-consultores.com>, 2018
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: David Portoles <dportoles@idearium-consultores.com>, 2018\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: es\n"
>>>>>>> 0d80c9715... Update po files
"Language-Team: Spanish (https://www.transifex.com/okfn/teams/11162/es/)\n"
"Plural-Forms: nplurals=2; plural=(n != 1)\n"
"MIME-Version: 1.0\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/es_AR/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,24 +3,16 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
# Ignacio L'Episcopo, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Ignacio L'Episcopo, 2018\n"
"Language: es_AR\n"
"Language-Team: Spanish (Argentina) "
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/fa_IR/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: fa_IR\n"
"Language-Team: Persian (Iran) "
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/fi/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: fi\n"
"Language-Team: Finnish (https://www.transifex.com/okfn/teams/11162/fi/)\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/fr/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,24 +3,16 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
# Mayeul Kauffmann, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Mayeul Kauffmann, 2018\n"
"Language: fr\n"
"Language-Team: French (https://www.transifex.com/okfn/teams/11162/fr/)\n"
Expand Down
8 changes: 0 additions & 8 deletions ckan/i18n/he/LC_MESSAGES/ckan.po
View file
Expand Up @@ -3,23 +3,15 @@
# This file is distributed under the same license as the ckan project.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
<<<<<<< HEAD
=======
# Translators:
# Adrià Mercader <adria.mercader@okfn.org>, 2018
>>>>>>> 0d80c9715... Update po files
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: ckan 2.8.0b0\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
<<<<<<< HEAD
"POT-Creation-Date: 2017-06-21 15:47+0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
=======
"POT-Creation-Date: 2018-03-27 16:10+0200\n"
"PO-Revision-Date: 2018-03-27 14:15+0000\n"
>>>>>>> 0d80c9715... Update po files
"Last-Translator: Adrià Mercader <adria.mercader@okfn.org>, 2018\n"
"Language: he\n"
"Language-Team: Hebrew (https://www.transifex.com/okfn/teams/11162/he/)\n"
Expand Down

0 comments on commit 1431a83

Please sign in to comment.