From 3dad5a32b4bc74bfed19b3f55d389692f7de919a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Rapinat?= Date: Fri, 17 May 2013 08:49:50 +0000 Subject: [PATCH] 6749: remove remaining patching lines svn: r22338 --- po/nl.po | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/po/nl.po b/po/nl.po index c87ccf886..d18bb82fc 100644 --- a/po/nl.po +++ b/po/nl.po @@ -6108,13 +6108,9 @@ msgstr "PNG-afbeelding" msgid "Graphviz File" msgstr "Graphviz-bestand" -<<<<<<< .mine #: ../gramps/gen/plug/menu/_enumeratedlist.py:125 #, python-format 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'" #. ------------------------------------------------------------------------ @@ -6122,19 +6118,17 @@ msgstr "Waarde '%(val)s' niet gevonden voor optie '%(opt)s'" #. Private Constants #. #. ------------------------------------------------------------------------ -======= + #: ../gramps/gen/plug/menu/_enumeratedlist.py:125 #, python-format msgid "Value '%(val)s' not found for option '%(opt)s'" msgstr "" ->>>>>>> .r22329 #. ------------------------------------------------------------------------ #. #. Private Constants #. #. ------------------------------------------------------------------------ ->>>>>>> .r22314 #: ../gramps/gen/plug/report/_book.py:75 ../gramps/gui/plug/_dialogs.py:60 #: ../gramps/gui/plug/report/_bookdialog.py:89 #: ../gramps/gui/viewmanager.py:123