summaryrefslogtreecommitdiff
path: root/debian/po/templates.pot
diff options
context:
space:
mode:
Diffstat (limited to 'debian/po/templates.pot')
-rw-r--r--debian/po/templates.pot18
1 files changed, 12 insertions, 6 deletions
diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f53c455..79ecfb5 100644
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -1,6 +1,6 @@
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
+# This file is distributed under the same license as the ucf package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: ucf\n"
"Report-Msgid-Bugs-To: ucf@packages.debian.org\n"
-"POT-Creation-Date: 2014-05-07 01:28-0700\n"
+"POT-Creation-Date: 2018-02-16 15:56-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -70,7 +70,7 @@ msgstr ""
#. Choices
#. Translators, please keep translations *short* (less than 65 columns)
#: ../templates:3001
-msgid "do a 3-way merge between available versions (experimental)"
+msgid "do a 3-way merge between available versions"
msgstr ""
#. Type: select
@@ -92,14 +92,20 @@ msgstr ""
#. Type: select
#. Description
-#. Type: select
-#. Description
-#: ../templates:3002 ../templates:4002
+#: ../templates:3002
msgid ""
"A new version (${NEW}) of configuration file ${FILE} is available, but the "
"version installed currently has been locally modified."
msgstr ""
+#. Type: select
+#. Description
+#: ../templates:4002
+msgid ""
+"${BASENAME}: A new version (${NEW}) of configuration file ${FILE} is "
+"available, but the version installed currently has been locally modified."
+msgstr ""
+
#. Type: note
#. Description
#: ../templates:5001