summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJabiertxof <jabier.arraiza@marker.es>2019-01-31 09:20:43 +0000
committerJabier Arraiza <jabier.arraiza@marker.es>2019-02-09 18:31:30 +0000
commit15ace00a01391d6a033e2025c66b48ad6ef3bd69 (patch)
tree840ca88a756510a209ff9cd045f7c72ae351d589
parentMix init-tool and xgettext to allow inx and glade files (diff)
downloadinkscape-15ace00a01391d6a033e2025c66b48ad6ef3bd69.tar.gz
inkscape-15ace00a01391d6a033e2025c66b48ad6ef3bd69.zip
Remove po updated fines to minimice diff
-rw-r--r--po/POTFILES.in4
-rw-r--r--po/POTFILES.ui.in2
2 files changed, 5 insertions, 1 deletions
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