From 15ace00a01391d6a033e2025c66b48ad6ef3bd69 Mon Sep 17 00:00:00 2001 From: Jabiertxof Date: Thu, 31 Jan 2019 10:20:43 +0100 Subject: Remove po updated fines to minimice diff --- po/POTFILES.in | 4 ++++ po/POTFILES.ui.in | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/po/POTFILES.in b/po/POTFILES.in index eddaf60ed..540f81683 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,11 +1,15 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. <<<<<<< HEAD +<<<<<<< HEAD # Generated by generate_POTFILES.sh at Tue Feb 5 20:06:57 CET 2019 [encoding: UTF-8] ======= # Generated by generate_POTFILES.sh at Thu Jan 31 04:07:47 CET 2019 >>>>>>> Mix init-tool and xgettext to allow inx and glade files +======= +# Generated by generate_POTFILES.sh at Thu Jan 31 10:19:23 CET 2019 +>>>>>>> Remove po updated fines to minimice diff org.inkscape.Inkscape.appdata.xml.in org.inkscape.Inkscape.desktop.in share/filters/filters.svg.h diff --git a/po/POTFILES.ui.in b/po/POTFILES.ui.in index b5745ec57..916928ece 100644 --- a/po/POTFILES.ui.in +++ b/po/POTFILES.ui.in @@ -1,6 +1,6 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -# Generated by generate_POTFILES.sh at Thu Jan 31 04:07:47 CET 2019 +# Generated by generate_POTFILES.sh at Thu Jan 31 10:19:23 CET 2019 ../share/ui/commands-toolbar.ui ../share/ui/select-toolbar.ui ../share/ui/snap-toolbar.ui -- cgit v1.2.3