diff --git a/ckan/i18n/ar/LC_MESSAGES/ckan.po b/ckan/i18n/ar/LC_MESSAGES/ckan.po index c1ce1a1af35..8c525954147 100644 --- a/ckan/i18n/ar/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ar/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Omar Isbaitan , 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 , 2018\n" "Language: ar\n" "Language-Team: Arabic (https://www.transifex.com/okfn/teams/11162/ar/)\n" diff --git a/ckan/i18n/bg/LC_MESSAGES/ckan.po b/ckan/i18n/bg/LC_MESSAGES/ckan.po index ad04efacf82..bfb1a7cf4d4 100644 --- a/ckan/i18n/bg/LC_MESSAGES/ckan.po +++ b/ckan/i18n/bg/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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/)" diff --git a/ckan/i18n/ca/LC_MESSAGES/ckan.po b/ckan/i18n/ca/LC_MESSAGES/ckan.po index bcc3ee15595..243223cc54d 100644 --- a/ckan/i18n/ca/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ca/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: ca\n" "Language-Team: Catalan (https://www.transifex.com/okfn/teams/11162/ca/)\n" diff --git a/ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po b/ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po index d67476b7b36..f03ad26a6e8 100644 --- a/ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po +++ b/ckan/i18n/cs_CZ/LC_MESSAGES/ckan.po @@ -3,23 +3,14 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Jakub Klímek , 2018 # Adrià Mercader , 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 , 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 , 2018\n" @@ -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" diff --git a/ckan/i18n/da_DK/LC_MESSAGES/ckan.po b/ckan/i18n/da_DK/LC_MESSAGES/ckan.po index 00802f27de3..e5b8e9c8061 100644 --- a/ckan/i18n/da_DK/LC_MESSAGES/ckan.po +++ b/ckan/i18n/da_DK/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: da_DK\n" "Language-Team: Danish (Denmark) " diff --git a/ckan/i18n/de/LC_MESSAGES/ckan.po b/ckan/i18n/de/LC_MESSAGES/ckan.po index f3e38644fb0..075c6fbe2c5 100644 --- a/ckan/i18n/de/LC_MESSAGES/ckan.po +++ b/ckan/i18n/de/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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" diff --git a/ckan/i18n/el/LC_MESSAGES/ckan.po b/ckan/i18n/el/LC_MESSAGES/ckan.po index 420a535cd8c..bcc4c9c7039 100644 --- a/ckan/i18n/el/LC_MESSAGES/ckan.po +++ b/ckan/i18n/el/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Sotirios Karampatakis , 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 , 2018\n" "Language: el\n" "Language-Team: Greek (https://www.transifex.com/okfn/teams/11162/el/)\n" diff --git a/ckan/i18n/en_AU/LC_MESSAGES/ckan.po b/ckan/i18n/en_AU/LC_MESSAGES/ckan.po index 14b3cbb61f0..1dee77773a1 100644 --- a/ckan/i18n/en_AU/LC_MESSAGES/ckan.po +++ b/ckan/i18n/en_AU/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: en_AU\n" "Language-Team: English (Australia) " diff --git a/ckan/i18n/en_GB/LC_MESSAGES/ckan.po b/ckan/i18n/en_GB/LC_MESSAGES/ckan.po index 0666d32ca2c..3317e54864b 100644 --- a/ckan/i18n/en_GB/LC_MESSAGES/ckan.po +++ b/ckan/i18n/en_GB/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: en_GB\n" "Language-Team: English (United Kingdom) " diff --git a/ckan/i18n/es/LC_MESSAGES/ckan.po b/ckan/i18n/es/LC_MESSAGES/ckan.po index c762eb8ae0c..e95323556dc 100644 --- a/ckan/i18n/es/LC_MESSAGES/ckan.po +++ b/ckan/i18n/es/LC_MESSAGES/ckan.po @@ -3,29 +3,20 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Mihai Pantazi , 2018 # Isabel M Ruiz Mellado , 2018 # David Portoles , 2018 # Adrià Mercader , 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 , 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 , 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" diff --git a/ckan/i18n/es_AR/LC_MESSAGES/ckan.po b/ckan/i18n/es_AR/LC_MESSAGES/ckan.po index 9de225f8fc2..18d4687f189 100644 --- a/ckan/i18n/es_AR/LC_MESSAGES/ckan.po +++ b/ckan/i18n/es_AR/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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) " diff --git a/ckan/i18n/fa_IR/LC_MESSAGES/ckan.po b/ckan/i18n/fa_IR/LC_MESSAGES/ckan.po index 68b1d5f4dfa..6c3593abcef 100644 --- a/ckan/i18n/fa_IR/LC_MESSAGES/ckan.po +++ b/ckan/i18n/fa_IR/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: fa_IR\n" "Language-Team: Persian (Iran) " diff --git a/ckan/i18n/fi/LC_MESSAGES/ckan.po b/ckan/i18n/fi/LC_MESSAGES/ckan.po index b2f9d96e1af..d1197b7c044 100644 --- a/ckan/i18n/fi/LC_MESSAGES/ckan.po +++ b/ckan/i18n/fi/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: fi\n" "Language-Team: Finnish (https://www.transifex.com/okfn/teams/11162/fi/)\n" diff --git a/ckan/i18n/fr/LC_MESSAGES/ckan.po b/ckan/i18n/fr/LC_MESSAGES/ckan.po index 7f6837ad346..580a0e1bcde 100644 --- a/ckan/i18n/fr/LC_MESSAGES/ckan.po +++ b/ckan/i18n/fr/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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" diff --git a/ckan/i18n/he/LC_MESSAGES/ckan.po b/ckan/i18n/he/LC_MESSAGES/ckan.po index b7ab6cb5fd4..2f8836e6a9c 100644 --- a/ckan/i18n/he/LC_MESSAGES/ckan.po +++ b/ckan/i18n/he/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: he\n" "Language-Team: Hebrew (https://www.transifex.com/okfn/teams/11162/he/)\n" diff --git a/ckan/i18n/hr/LC_MESSAGES/ckan.po b/ckan/i18n/hr/LC_MESSAGES/ckan.po index 6a507a3572d..5e4a00504d4 100644 --- a/ckan/i18n/hr/LC_MESSAGES/ckan.po +++ b/ckan/i18n/hr/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: hr\n" "Language-Team: Croatian (https://www.transifex.com/okfn/teams/11162/hr/)\n" diff --git a/ckan/i18n/hu/LC_MESSAGES/ckan.po b/ckan/i18n/hu/LC_MESSAGES/ckan.po index d7fd3cb2bd8..16c46589bd3 100644 --- a/ckan/i18n/hu/LC_MESSAGES/ckan.po +++ b/ckan/i18n/hu/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: hu\n" "Language-Team: Hungarian (https://www.transifex.com/okfn/teams/11162/hu/)" diff --git a/ckan/i18n/id/LC_MESSAGES/ckan.po b/ckan/i18n/id/LC_MESSAGES/ckan.po index fb9a61d8668..66d31dac817 100644 --- a/ckan/i18n/id/LC_MESSAGES/ckan.po +++ b/ckan/i18n/id/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: id\n" "Language-Team: Indonesian " diff --git a/ckan/i18n/is/LC_MESSAGES/ckan.po b/ckan/i18n/is/LC_MESSAGES/ckan.po index 6d476fc6107..0837ff20f84 100644 --- a/ckan/i18n/is/LC_MESSAGES/ckan.po +++ b/ckan/i18n/is/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: is\n" "Language-Team: Icelandic (https://www.transifex.com/okfn/teams/11162/is/)" diff --git a/ckan/i18n/it/LC_MESSAGES/ckan.po b/ckan/i18n/it/LC_MESSAGES/ckan.po index 17606123008..18cfc1906dc 100644 --- a/ckan/i18n/it/LC_MESSAGES/ckan.po +++ b/ckan/i18n/it/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: it\n" "Language-Team: Italian (https://www.transifex.com/okfn/teams/11162/it/)\n" diff --git a/ckan/i18n/ja/LC_MESSAGES/ckan.po b/ckan/i18n/ja/LC_MESSAGES/ckan.po index 613816691e4..95695a3a484 100644 --- a/ckan/i18n/ja/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ja/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Azusa Akiyama , 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: Azusa Akiyama , 2018\n" "Language: ja\n" "Language-Team: Japanese (https://www.transifex.com/okfn/teams/11162/ja/)\n" diff --git a/ckan/i18n/km/LC_MESSAGES/ckan.po b/ckan/i18n/km/LC_MESSAGES/ckan.po index 344c8f16909..f61a8084f06 100644 --- a/ckan/i18n/km/LC_MESSAGES/ckan.po +++ b/ckan/i18n/km/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: km\n" "Language-Team: Khmer (https://www.transifex.com/okfn/teams/11162/km/)\n" diff --git a/ckan/i18n/ko_KR/LC_MESSAGES/ckan.po b/ckan/i18n/ko_KR/LC_MESSAGES/ckan.po index 5ebe2549c0c..24ebae3ddae 100644 --- a/ckan/i18n/ko_KR/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ko_KR/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: ko_KR\n" "Language-Team: Korean (Korea) " diff --git a/ckan/i18n/lt/LC_MESSAGES/ckan.po b/ckan/i18n/lt/LC_MESSAGES/ckan.po index 7fe27a507a0..0ba4e9e425f 100644 --- a/ckan/i18n/lt/LC_MESSAGES/ckan.po +++ b/ckan/i18n/lt/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: lt\n" "Language-Team: Lithuanian " diff --git a/ckan/i18n/lv/LC_MESSAGES/ckan.po b/ckan/i18n/lv/LC_MESSAGES/ckan.po index b71f5297313..cf7b088173f 100644 --- a/ckan/i18n/lv/LC_MESSAGES/ckan.po +++ b/ckan/i18n/lv/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: lv\n" "Language-Team: Latvian (https://www.transifex.com/okfn/teams/11162/lv/)\n" diff --git a/ckan/i18n/mk/LC_MESSAGES/ckan.po b/ckan/i18n/mk/LC_MESSAGES/ckan.po index 372a05f45e1..a10421bc93f 100644 --- a/ckan/i18n/mk/LC_MESSAGES/ckan.po +++ b/ckan/i18n/mk/LC_MESSAGES/ckan.po @@ -3,25 +3,17 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Aleksandar Jovanov , 2018 # Konstantin Sivakov , 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: Konstantin Sivakov , 2018\n" "Language: mk\n" "Language-Team: Macedonian " diff --git a/ckan/i18n/mn_MN/LC_MESSAGES/ckan.po b/ckan/i18n/mn_MN/LC_MESSAGES/ckan.po index 6498c74440d..5382e5d13fd 100644 --- a/ckan/i18n/mn_MN/LC_MESSAGES/ckan.po +++ b/ckan/i18n/mn_MN/LC_MESSAGES/ckan.po @@ -3,23 +3,14 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Zoljargal Munkhjargal , 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: Adrià Mercader , 2018\n" -"Language-Team: Mongolian (Mongolia) (https://www.transifex.com/okfn/teams/11162/mn_MN/)\n" -======= "POT-Creation-Date: 2018-03-27 16:10+0200\n" "PO-Revision-Date: 2018-03-27 14:15+0000\n" "Last-Translator: Zoljargal Munkhjargal , 2018\n" @@ -27,7 +18,6 @@ msgstr "" "Language-Team: Mongolian (Mongolia) " "(https://www.transifex.com/okfn/teams/11162/mn_MN/)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" ->>>>>>> 0d80c9715... Update po files "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" diff --git a/ckan/i18n/ne/LC_MESSAGES/ckan.po b/ckan/i18n/ne/LC_MESSAGES/ckan.po index 8dba2ed21ef..12f528ed751 100644 --- a/ckan/i18n/ne/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ne/LC_MESSAGES/ckan.po @@ -17,11 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -<<<<<<< HEAD -"Generated-By: Babel 2.4.0\n" -======= "Generated-By: Babel 2.3.4\n" ->>>>>>> 0d80c9715... Update po files #: ckanext/datapusher/helpers.py:21 msgid "Complete" @@ -4560,8 +4556,6 @@ msgstr "" #~ msgid "An error occurred: %(text)s %(error)s" #~ msgstr "" -<<<<<<< HEAD -======= #~ msgid "Cannot list entity of this type: %s" #~ msgstr "" @@ -4619,4 +4613,3 @@ msgstr "" #~ msgid "Submit" #~ msgstr "" ->>>>>>> 0d80c9715... Update po files diff --git a/ckan/i18n/nl/LC_MESSAGES/ckan.po b/ckan/i18n/nl/LC_MESSAGES/ckan.po index ca86456fcb4..15c2c0dcc0c 100644 --- a/ckan/i18n/nl/LC_MESSAGES/ckan.po +++ b/ckan/i18n/nl/LC_MESSAGES/ckan.po @@ -13,13 +13,8 @@ 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 , 2018\n" "Language: nl\n" "Language-Team: Dutch (https://www.transifex.com/okfn/teams/11162/nl/)\n" diff --git a/ckan/i18n/no/LC_MESSAGES/ckan.po b/ckan/i18n/no/LC_MESSAGES/ckan.po index bd29a809435..17b34cbced8 100644 --- a/ckan/i18n/no/LC_MESSAGES/ckan.po +++ b/ckan/i18n/no/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: nb_NO\n" "Language-Team: Norwegian (https://www.transifex.com/okfn/teams/11162/no/)" diff --git a/ckan/i18n/pl/LC_MESSAGES/ckan.po b/ckan/i18n/pl/LC_MESSAGES/ckan.po index f25715b0713..72fbfe79457 100644 --- a/ckan/i18n/pl/LC_MESSAGES/ckan.po +++ b/ckan/i18n/pl/LC_MESSAGES/ckan.po @@ -3,27 +3,18 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Teiron, 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: Adrià Mercader , 2018\n" -======= "POT-Creation-Date: 2018-03-27 16:10+0200\n" "PO-Revision-Date: 2018-03-27 14:15+0000\n" "Last-Translator: Teiron, 2018\n" "Language: pl\n" ->>>>>>> 0d80c9715... Update po files "Language-Team: Polish (https://www.transifex.com/okfn/teams/11162/pl/)\n" "Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && " "(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && " @@ -2721,15 +2712,11 @@ msgstr "" msgid "Trash" msgstr "Kosz" -<<<<<<< HEAD -#: ckan/templates/admin/config.html:16 -======= #: ckan/templates/admin/config.html:23 ckan/templates/macros/autoform.html:62 msgid "Site logo" msgstr "Logo strony" #: ckan/templates/admin/config.html:35 ->>>>>>> 0d80c9715... Update po files #: ckan/templates/admin/confirm_reset.html:7 msgid "Are you sure you want to reset the config?" msgstr "" diff --git a/ckan/i18n/pt_BR/LC_MESSAGES/ckan.po b/ckan/i18n/pt_BR/LC_MESSAGES/ckan.po index fa1016e4ea7..7e2a9551388 100644 --- a/ckan/i18n/pt_BR/LC_MESSAGES/ckan.po +++ b/ckan/i18n/pt_BR/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: pt_BR\n" "Language-Team: Portuguese (Brazil) " diff --git a/ckan/i18n/pt_PT/LC_MESSAGES/ckan.po b/ckan/i18n/pt_PT/LC_MESSAGES/ckan.po index d049738673d..03d1140d9ca 100644 --- a/ckan/i18n/pt_PT/LC_MESSAGES/ckan.po +++ b/ckan/i18n/pt_PT/LC_MESSAGES/ckan.po @@ -3,23 +3,14 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Rui , 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: Adrià Mercader , 2018\n" -"Language-Team: Portuguese (Portugal) (https://www.transifex.com/okfn/teams/11162/pt_PT/)\n" -======= "POT-Creation-Date: 2018-03-27 16:10+0200\n" "PO-Revision-Date: 2018-03-27 14:15+0000\n" "Last-Translator: Rui , 2018\n" @@ -27,7 +18,6 @@ msgstr "" "Language-Team: Portuguese (Portugal) " "(https://www.transifex.com/okfn/teams/11162/pt_PT/)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" ->>>>>>> 0d80c9715... Update po files "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -2609,8 +2599,6 @@ msgstr "Mostrar mais" msgid "Hide" msgstr "Ocultar" -<<<<<<< HEAD -======= #: ckan/public-bs2/base/test/spec/i18n.spec.js:13 #: ckan/public-bs2/base/test/spec/module.spec.js:385 #: ckan/public/base/test/spec/i18n.spec.js:13 @@ -2704,7 +2692,6 @@ msgid_plural "%(num)d missing translations" msgstr[0] "" msgstr[1] "" ->>>>>>> 0d80c9715... Update po files #: ckan/templates/error_document_template.html:3 #, python-format msgid "Error %(error_code)s" @@ -4218,15 +4205,11 @@ msgstr "Explorar" msgid "More information" msgstr "Mais informação" -<<<<<<< HEAD -#: ckan/templates/package/snippets/resource_view.html:11 -======= #: ckan/templates/package/snippets/resource_view.html:10 msgid "Fullscreen" msgstr "Ecrã cheio" #: ckan/templates/package/snippets/resource_view.html:18 ->>>>>>> 0d80c9715... Update po files msgid "Embed" msgstr "Incorporar " diff --git a/ckan/i18n/ro/LC_MESSAGES/ckan.po b/ckan/i18n/ro/LC_MESSAGES/ckan.po index 878a6e1f47d..2953bdc8514 100644 --- a/ckan/i18n/ro/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ro/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Bogdan Mateescu, 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: Bogdan Mateescu, 2018\n" "Language: ro\n" "Language-Team: Romanian (https://www.transifex.com/okfn/teams/11162/ro/)\n" diff --git a/ckan/i18n/ru/LC_MESSAGES/ckan.po b/ckan/i18n/ru/LC_MESSAGES/ckan.po index 922e790b42a..2bfba9d5cea 100644 --- a/ckan/i18n/ru/LC_MESSAGES/ckan.po +++ b/ckan/i18n/ru/LC_MESSAGES/ckan.po @@ -3,25 +3,17 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # tuffnatty , 2018 # Ivan Begtin , 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: Ivan Begtin , 2018\n" "Language: ru\n" "Language-Team: Russian (https://www.transifex.com/okfn/teams/11162/ru/)\n" diff --git a/ckan/i18n/sk/LC_MESSAGES/ckan.po b/ckan/i18n/sk/LC_MESSAGES/ckan.po index 97503068e2c..62c7f1d2e59 100644 --- a/ckan/i18n/sk/LC_MESSAGES/ckan.po +++ b/ckan/i18n/sk/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: sk\n" "Language-Team: Slovak (https://www.transifex.com/okfn/teams/11162/sk/)\n" diff --git a/ckan/i18n/sl/LC_MESSAGES/ckan.po b/ckan/i18n/sl/LC_MESSAGES/ckan.po index 17ad26b2f90..c5885777d2a 100644 --- a/ckan/i18n/sl/LC_MESSAGES/ckan.po +++ b/ckan/i18n/sl/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: sl\n" "Language-Team: Slovenian (https://www.transifex.com/okfn/teams/11162/sl/)" diff --git a/ckan/i18n/sq/LC_MESSAGES/ckan.po b/ckan/i18n/sq/LC_MESSAGES/ckan.po index ec80bd75fbc..8a18ef3c46f 100644 --- a/ckan/i18n/sq/LC_MESSAGES/ckan.po +++ b/ckan/i18n/sq/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: sq\n" "Language-Team: Albanian (https://www.transifex.com/okfn/teams/11162/sq/)\n" diff --git a/ckan/i18n/sr/LC_MESSAGES/ckan.po b/ckan/i18n/sr/LC_MESSAGES/ckan.po index b44770a7d3f..15f92e3da2f 100644 --- a/ckan/i18n/sr/LC_MESSAGES/ckan.po +++ b/ckan/i18n/sr/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: sr\n" "Language-Team: Serbian (https://www.transifex.com/okfn/teams/11162/sr/)\n" diff --git a/ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po b/ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po index f4fdcfe4ce0..03df65a1738 100644 --- a/ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po +++ b/ckan/i18n/sr_Latn/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: sr_Latn\n" "Language-Team: Serbian (Latin) " diff --git a/ckan/i18n/sv/LC_MESSAGES/ckan.po b/ckan/i18n/sv/LC_MESSAGES/ckan.po index f2a9bea5a17..697cbda0a49 100644 --- a/ckan/i18n/sv/LC_MESSAGES/ckan.po +++ b/ckan/i18n/sv/LC_MESSAGES/ckan.po @@ -3,27 +3,18 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Börje Lewin , 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: Adrià Mercader , 2018\n" -======= "POT-Creation-Date: 2018-03-27 16:10+0200\n" "PO-Revision-Date: 2018-03-27 14:15+0000\n" "Last-Translator: Börje Lewin , 2018\n" "Language: sv\n" ->>>>>>> 0d80c9715... Update po files "Language-Team: Swedish (https://www.transifex.com/okfn/teams/11162/sv/)\n" "Plural-Forms: nplurals=2; plural=(n != 1)\n" "MIME-Version: 1.0\n" diff --git a/ckan/i18n/th/LC_MESSAGES/ckan.po b/ckan/i18n/th/LC_MESSAGES/ckan.po index 3fdf53e9694..05da3e8481b 100644 --- a/ckan/i18n/th/LC_MESSAGES/ckan.po +++ b/ckan/i18n/th/LC_MESSAGES/ckan.po @@ -3,24 +3,16 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 2018 # Pongkiat Jongtriluck , 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: Pongkiat Jongtriluck , 2018\n" "Language: th\n" "Language-Team: Thai (https://www.transifex.com/okfn/teams/11162/th/)\n" diff --git a/ckan/i18n/tl/LC_MESSAGES/ckan.po b/ckan/i18n/tl/LC_MESSAGES/ckan.po index bb426a06f89..ff2dcc9aa3e 100644 --- a/ckan/i18n/tl/LC_MESSAGES/ckan.po +++ b/ckan/i18n/tl/LC_MESSAGES/ckan.po @@ -17,11 +17,7 @@ msgstr "" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -<<<<<<< HEAD -"Generated-By: Babel 2.4.0\n" -======= "Generated-By: Babel 2.3.4\n" ->>>>>>> 0d80c9715... Update po files #: ckanext/datapusher/helpers.py:21 msgid "Complete" @@ -4560,8 +4556,6 @@ msgstr "" #~ msgid "An error occurred: %(text)s %(error)s" #~ msgstr "" -<<<<<<< HEAD -======= #~ msgid "Cannot list entity of this type: %s" #~ msgstr "" @@ -4619,4 +4613,3 @@ msgstr "" #~ msgid "Submit" #~ msgstr "" ->>>>>>> 0d80c9715... Update po files diff --git a/ckan/i18n/tr/LC_MESSAGES/ckan.po b/ckan/i18n/tr/LC_MESSAGES/ckan.po index 5d6110dfddc..1f424497050 100644 --- a/ckan/i18n/tr/LC_MESSAGES/ckan.po +++ b/ckan/i18n/tr/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: tr\n" "Language-Team: Turkish (https://www.transifex.com/okfn/teams/11162/tr/)\n" diff --git a/ckan/i18n/uk/LC_MESSAGES/ckan.po b/ckan/i18n/uk/LC_MESSAGES/ckan.po index 5944cef3ca5..81de2f15ff6 100644 --- a/ckan/i18n/uk/LC_MESSAGES/ckan.po +++ b/ckan/i18n/uk/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: uk\n" "Language-Team: Ukrainian (https://www.transifex.com/okfn/teams/11162/uk/)" diff --git a/ckan/i18n/uk_UA/LC_MESSAGES/ckan.po b/ckan/i18n/uk_UA/LC_MESSAGES/ckan.po index 15ebbf48cd4..3bca88bd6de 100644 --- a/ckan/i18n/uk_UA/LC_MESSAGES/ckan.po +++ b/ckan/i18n/uk_UA/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: uk_UA\n" "Language-Team: Ukrainian (Ukraine) " diff --git a/ckan/i18n/vi/LC_MESSAGES/ckan.po b/ckan/i18n/vi/LC_MESSAGES/ckan.po index 6d1aaf34a39..b9aa57dae1e 100644 --- a/ckan/i18n/vi/LC_MESSAGES/ckan.po +++ b/ckan/i18n/vi/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: vi\n" "Language-Team: Vietnamese " diff --git a/ckan/i18n/zh_CN/LC_MESSAGES/ckan.po b/ckan/i18n/zh_CN/LC_MESSAGES/ckan.po index 4d3884cdbf4..2a873f5661b 100644 --- a/ckan/i18n/zh_CN/LC_MESSAGES/ckan.po +++ b/ckan/i18n/zh_CN/LC_MESSAGES/ckan.po @@ -3,23 +3,15 @@ # This file is distributed under the same license as the ckan project. # FIRST AUTHOR , 2018. # -<<<<<<< HEAD -======= # Translators: # Adrià Mercader , 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 , 2018\n" "Language: zh_Hans_CN\n" "Language-Team: Chinese (China) "