Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixup some merge issues in po files

Browse Source
This commit is contained in:
prculley 2018-12-26 09:40:07 -06:00
parent 1b824c410b
commit acfbb0a763
13 changed files with 12962 additions and 11593 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

475
po/cs.po
View File

File diff suppressed because it is too large Load Diff

49
po/da.po
View File

@ -701,13 +701,14 @@ msgstr ""
msgid ""
"<b>Improving Gramps</b><br/>Users are encouraged to request enhancements to "
"Gramps. Requesting an enhancement can be done either through the gramps-"
"users or gramps-devel mailing lists, or by going to https://gramps-project.org/bugs/ and creating a Feature Request. Filing a Feature Request is "
"users or gramps-devel mailing lists, or by going to http://bugs.gramps-"
"project.org and creating a Feature Request. Filing a Feature Request is "
"preferred but it can be good to discuss your ideas on the email lists."
msgstr ""
"<b>Forbedring af Gramps</b><br/>Brugere opfordres til at anmode om "
"forbedringer af Gramps. Man kan anmode om en forbedring gennem postlisterne "
"gramps-users eller gramps-devel. Man kan også oprette en ønskeforespørgsel "
"('feature request') på https://gramps-project.org/bugs/. Anmodning gennem en "
"('feature request') på http://bugs.gramps-project.org. Anmodning gennem en "
"ønskeforespørgsel foretrækkes, men det kan være fornuftigt at diskutere dine "
"ideer på e-postlisterne."
@ -928,11 +929,11 @@ msgstr ""
#: ../data/tips.xml.in.h:46
msgid ""
"<b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps "
"is to use the Gramps bug tracking system at https://gramps-project.org/bugs/"
"is to use the Gramps bug tracking system at http://bugs.gramps-project.org"
msgstr ""
"<b>Rapportering af programfejl i Gramps</b><br/>Den bedste måde at "
"rapportere en programfejl i Gramps, er at bruge Gramps fejlsporingssystemet "
"på https://gramps-project.org/bugs/"
"på http://bugs.gramps-project.org"
#: ../data/tips.xml.in.h:47
msgid ""
@ -7743,18 +7744,18 @@ msgid "Marriage Contract abbreviation|m.con."
msgstr "ægtesk.kontr."
# Fra: http://genealogytipoftheday.blogspot.com/2010/08/marriage-bann.html
#
#
# Marriage Bann?
# A marriage bann is an announcement of an upcoming marriage.
# Usually made for three consecutive weeks in church, banns may also be
# publicly published announcements of an upcoming marriage.
#
#
# Usually done so that anyone with knowledge of why the couple should not be
# married could come forth with the reason.
#
#
# The publication (or announcement) of the banns does not necessarily mean
# that the marriage actually took place.
#
#
# Dansk oversættelse ...bryllupskundgørelse? -MBJ
#: ../gramps/gen/lib/eventtype.py:251
msgid "Marriage Banns abbreviation|m.ban."
@ -32661,8 +32662,8 @@ msgid "Looking for possible loop for each person"
msgstr "Leder efter mulige løkker for alle personer"
#: ../gramps/plugins/tool/mediamanager.py:68
msgid "manual|Media_Manager"
msgstr "Mediehåndtering"
msgid "manual|Media_Manager..."
msgstr "manual|Media_Manager..."
#: ../gramps/plugins/tool/mediamanager.py:88
#: ../gramps/plugins/tool/mediamanager.py:114
@ -36946,6 +36947,34 @@ msgstr ""
"%(strong1_start)s%(page_number)d%(strong_end)s af %(strong2_start)s"
"%(total_pages)d%(strong_end)s"
#: ../data/tips.xml.in.h:29
msgid ""
"<b>Improving Gramps</b><br/>Users are encouraged to request enhancements to "
"Gramps. Requesting an enhancement can be done either through the gramps-"
"users or gramps-devel mailing lists, or by going to https://gramps-project."
"org/bugs/ and creating a Feature Request. Filing a Feature Request is "
"preferred but it can be good to discuss your ideas on the email lists."
msgstr ""
"<b>Forbedring af Gramps</b><br/>Brugere opfordres til at anmode om "
"forbedringer af Gramps. Man kan anmode om en forbedring gennem postlisterne "
"gramps-users eller gramps-devel. Man kan også oprette en ønskeforespørgsel "
"('feature request') på https://gramps-project.org/bugs/. Anmodning gennem en "
"ønskeforespørgsel foretrækkes, men det kan være fornuftigt at diskutere dine "
"ideer på e-postlisterne."
#: ../data/tips.xml.in.h:46
msgid ""
"<b>Reporting Bugs in Gramps</b><br/>The best way to report a bug in Gramps "
"is to use the Gramps bug tracking system at https://gramps-project.org/bugs/"
msgstr ""
"<b>Rapportering af programfejl i Gramps</b><br/>Den bedste måde at "
"rapportere en programfejl i Gramps, er at bruge Gramps fejlsporingssystemet "
"på https://gramps-project.org/bugs/"
#: ../gramps/plugins/tool/mediamanager.py:68
msgid "manual|Media_Manager"
msgstr "Mediehåndtering"
#~ msgid "Data version"
#~ msgstr "Data version"

2006
po/de.po
View File

File diff suppressed because it is too large Load Diff

21961
po/eo.po
View File

File diff suppressed because it is too large Load Diff

5
po/fi.po
View File

@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: Gramps_5_fi\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-07-24 14:13+0100\n"
"PO-Revision-Date: 2018-08-08 14:40+0300\n"
"POT-Creation-Date: 2018-11-29 06:08+0200\n"
"PO-Revision-Date: 2018-11-29 06:48+0200\n"
"Last-Translator: Matti Niemelä <niememat@gmail.com>\n"
"Language-Team: suomi <niememat@gmail.com>\n"
"Language: fi\n"
@ -3388,7 +3388,6 @@ msgid "Schema version"
msgstr "Skeema versio"
#. translators: needed for Arabic, ignore otherwise
#. need for spacing on the french translation
#: ../gramps/gen/display/name.py:349
#: ../gramps/gui/views/treemodels/placemodel.py:131
#: ../gramps/plugins/lib/libtreebase.py:707

1
po/fr.po
View File

@ -21,6 +21,7 @@
# Frederic Chateaux, 2007-2008.
# Jérôme Rapinat <romjerome@yahoo.fr>, 2005-2017.
# Mathieu MD <mathieu.md@gmail.com>, 2012.
# Christophe <khrys63@gmail.com>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: 5.0.0\n"

15
po/hr.po
View File

@ -2,14 +2,15 @@
# This file is distributed under the same license as the Gramps package.
# Copyright (C) Gramps project
# josip <josip@pisoj.com>, 2008-2011.
# mivir <mivir@milotype.de>, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: Gramps 4.2\n"
"Project-Id-Version: Gramps 5.0.1\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-20 09:31-0500\n"
"PO-Revision-Date: 2015-07-13 23:42+0100\n"
"Last-Translator: josip <josip@pisoj.com>\n"
"POT-Creation-Date: 2018-07-24 14:13+0100\n"
"PO-Revision-Date: 2018-12-16 17:10+0100\n"
"Last-Translator: Milo Ivir <mail@milotype.de>\n"
"Language-Team: \n"
"Language: hr\n"
"MIME-Version: 1.0\n"
@ -18,10 +19,8 @@ msgstr ""
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
"X-Poedit-SourceCharset: UTF-8\n"
"X-Poedit-Basepath: C:\\msys32.old\\home\\jole\\Gramps\\po\n"
"X-Generator: Poedit 1.7.5\n"
"X-Poedit-SearchPath-0: C:\\msys32.old\\home\\jole\\Gramps\n"
"X-Poedit-SearchPath-1: C:\\msys32.old\\home\\jole\\Gramps\\gramps\n"
"X-Poedit-Basepath: .\n"
"X-Generator: Poedit 2.2\n"
#: ../data/gramps.appdata.xml.in.h:1
msgid ""

7
po/hu.po
View File

@ -6,15 +6,14 @@
# Egyeki Gergely <egeri@elte.hu>, 2003, 2004.
# Arpad Horvath <horvath.arpad@szgti.bmf.hu>, 2006.
# Kolesár András <translation@kolesar.hu>, 2009.
# Lajos Nemeséri <nemeseril@gmail.com>, 2016.
# Nemeséri Lajos <nemeseril@gmail.com>,2011, 2012, 2013, 2014, 2015, 2016, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: GRAMPS 4.2.X\n"
"Project-Id-Version: GRAMPS 5.0.X\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-20 09:31-0500\n"
"PO-Revision-Date: 2018-07-07 09:28+0200\n"
"POT-Creation-Date: 2018-07-24 14:13+0100\n"
"PO-Revision-Date: 2018-12-20 13:49+0100\n"
"Last-Translator: Nemeséri Lajos <nemeseril@gmail.com>\n"
"Language-Team: magyar <>\n"
"Language: hu\n"

2
po/nn.po
View File

@ -11438,7 +11438,6 @@ msgstr "Utklippstavle"
msgid "the object|See %s details"
msgstr "Sjå %s detaljar"
#. ---------------------------
#: ../gramps/gui/clipboard.py:1525 ../gramps/gui/plug/quick/_quicktable.py:149
#: ../gramps/gui/clipboard.py:1529
#, python-format
@ -34687,6 +34686,7 @@ msgstr ""
msgid "manual|Reorder_Gramps_ID"
msgstr "Reorganiserar_Gramps-IDar"
#. self.top.set_icon(ICON)
#: ../gramps/plugins/tool/reorderids.py:203
#: ../gramps/plugins/tool/reorderids.py:422
#: ../gramps/plugins/tool/reorderids.py:514

13
po/pt_PT.po
View File

@ -1,26 +1,25 @@
# Portuguese (Portugal) translation for Gramps
# This file is distributed under the same license as the Gramps package.
# Tradução em Português (Europeu) do GRAMPS
# Copyright (C) 2002 Free Software Foundation, Inc.
# Marcos Bedinelli <bedinelli@sourceforge.net>, 2002-2006.
# Luiz Gonzaga dos Santos Filho <lfilho@gmail.com>, 2007-2007.
# lcc <lcc@6zap.com>, 2009-2009.
# Frederico Muñoz <fsmunoz@gmail.com>, 2010-201, 2013.
# Pedro Albuquerque <palbuquerque73@gmail.com>, 2017.
# Frederico Muñoz <fsmunoz@gmail.com>, 2010-2011, 2013.
# Pedro Albuquerque <pmra@gmx.com>, 2017, 2018.
#
msgid ""
msgstr ""
"Project-Id-Version: GRAMPS 4.0\n"
"Project-Id-Version: GRAMPS 5.0\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-20 09:31-0500\n"
"PO-Revision-Date: 2017-09-17 08:28+0100\n"
"Last-Translator: Pedro Albuquerque <palbuquerque73@gmail.com>\n"
"Language-Team: Português <palbuquerque73@gmail.com>\n"
"Last-Translator: Pedro Albuquerque <pmra@gmx.com>\n"
"Language-Team: Portuguese <pmra@gmx.com>\n"
"Language: pt_PT\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural= n==1 || n%10==1 ? 0 : 1;\n"
"Plural-Forms: nplurals=2; plural=n != 1;\n"
"X-Generator: Gtranslator 2.91.6\n"
#: ../data/gramps.appdata.xml.in.h:1

6
po/ru.po
View File

@ -16,8 +16,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gramps50\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-06-30 18:30+0300\n"
"PO-Revision-Date: 2018-06-30 18:40+0300\n"
"POT-Creation-Date: 2018-12-04 14:34+0300\n"
"PO-Revision-Date: 2018-12-04 15:57+0300\n"
"Last-Translator: Ivan Komaritsyn <vantu5z@mail.ru>\n"
"Language-Team: Russian\n"
"Language: ru\n"
@ -22039,6 +22039,8 @@ msgstr "Отсутствует (главная) фамилия"
msgid "Gender unknown"
msgstr "Пол неизвестен"
# Предположение
# !!!FIXME!!!
#. localized year
#. inadequate information
#: ../gramps/plugins/drawreport/statisticschart.py:425

1
po/sl.po
View File

@ -14961,7 +14961,6 @@ msgstr "oznaka"
msgid "Close _without saving"
msgstr "Zapri _brez shranjevanja"
#. widget
#: ../gramps/gui/glade/dialog.glade:859
#: ../gramps/gui/plug/report/_bookdialog.py:625
#: ../gramps/gui/views/listview.py:1047

14
po/sv.po
View File

@ -20,20 +20,21 @@
# Jens Arvidsson <jya@sverige.nu>, 2002-2005.
# Stefan Björk <betula@users.sourceforge.net>, 2005-2006.
# Peter Landgren <peter.talken@telia.com>, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016, 2017.
# Pär Ekholm <par.ekholm@pekholm.se>, 2018.
msgid ""
msgstr ""
"Project-Id-Version: sv\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-05-20 09:31-0500\n"
"PO-Revision-Date: 2017-01-21 14:20+0100\n"
"Last-Translator: Peter Landgren <peter.talken@telia.com>\n"
"Language-Team: Swedish <kde-i18n-doc@kde.org>\n"
"Language: sv\n"
"POT-Creation-Date: 2018-07-24 14:13+0100\n"
"PO-Revision-Date: 2018-11-15 18:11+0100\n"
"Language-Team: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Lokalize 1.5\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.0.6\n"
"Last-Translator: Pär Ekholm <par.ekholm@pekholm.se>\n"
"Language: sv\n"
#: ../data/gramps.appdata.xml.in.h:1
msgid ""
@ -14960,7 +14961,6 @@ msgstr "etikett"
msgid "Close _without saving"
msgstr "Stäng _utan att spara"
#. widget
#: ../gramps/gui/glade/dialog.glade:859
#: ../gramps/gui/plug/report/_bookdialog.py:625
#: ../gramps/gui/views/listview.py:1047