fixup some merge issues in po files

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

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"