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

6749: remove remaining patching lines

Browse Source 
svn: r22338
This commit is contained in:
Jérôme Rapinat 2013-05-17 08:49:50 +00:00
parent 4b69296158
commit 3dad5a32b4
1 changed files with 1 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
po/nl.po
View File

@ -6108,13 +6108,9 @@ msgstr "PNG-afbeelding"
msgid "Graphviz File" msgid "Graphviz File"
msgstr "Graphviz-bestand" msgstr "Graphviz-bestand"
<<<<<<< .mine
#: ../gramps/gen/plug/menu/_enumeratedlist.py:125 #: ../gramps/gen/plug/menu/_enumeratedlist.py:125
#, python-format #, python-format
msgid "Value '%(val)s' not found for option '%(opt)s'" msgid "Value '%(val)s' not found for option '%(opt)s'"
<<<<<<< .mine
msgstr "Waarde '%(val)s' niet gevonden voor optie '%(opt)s'"
=======
msgstr "Waarde '%(val)s' niet gevonden voor optie '%(opt)s'" msgstr "Waarde '%(val)s' niet gevonden voor optie '%(opt)s'"
#. ------------------------------------------------------------------------ #. ------------------------------------------------------------------------
@ -6122,19 +6118,17 @@ msgstr "Waarde '%(val)s' niet gevonden voor optie '%(opt)s'"
#. Private Constants #. Private Constants
#. #.
#. ------------------------------------------------------------------------ #. ------------------------------------------------------------------------
=======
#: ../gramps/gen/plug/menu/_enumeratedlist.py:125 #: ../gramps/gen/plug/menu/_enumeratedlist.py:125
#, python-format #, python-format
msgid "Value '%(val)s' not found for option '%(opt)s'" msgid "Value '%(val)s' not found for option '%(opt)s'"
msgstr "" msgstr ""
>>>>>>> .r22329
#. ------------------------------------------------------------------------ #. ------------------------------------------------------------------------
#. #.
#. Private Constants #. Private Constants
#. #.
#. ------------------------------------------------------------------------ #. ------------------------------------------------------------------------
>>>>>>> .r22314
#: ../gramps/gen/plug/report/_book.py:75 ../gramps/gui/plug/_dialogs.py:60 #: ../gramps/gen/plug/report/_book.py:75 ../gramps/gui/plug/_dialogs.py:60
#: ../gramps/gui/plug/report/_bookdialog.py:89 #: ../gramps/gui/plug/report/_bookdialog.py:89
#: ../gramps/gui/viewmanager.py:123 #: ../gramps/gui/viewmanager.py:123