Skip to content

locales: use --add-location=file to stop cacti.pot line-number churn #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
TheWitness merged 1 commit into from
Sep 29, 2026
Merged

locales: use --add-location=file to stop cacti.pot line-number churn #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion locales/build_gettext.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ fi
echo "Updating Cacti language gettext language file..."
cd ${BASE_PATH}

${XGETTEXT_BIN} --no-wrap --copyright-holder="The Cacti Group" --package-name="Cacti" --package-version=`cat include/cacti_version` --msgid-bugs-address="developers@cacti.net" -F -k__gettext -k__ -k__n:1,2 -k__x:1c,2 -k__xn:1c,2,3 -k__esc -k__esc_n:1,2 -k__esc_x:1c,2 -k__esc_xn:1c,2,3 -k__date -o locales/po/cacti.pot `find . -maxdepth 2 -name \*.php | sort`
${XGETTEXT_BIN} --no-wrap --add-location=file --from-code=UTF-8 --copyright-holder="The Cacti Group" --package-name="Cacti" --package-version=`cat include/cacti_version` --msgid-bugs-address="developers@cacti.net" -F -k__gettext -k__ -k__n:1,2 -k__x:1c,2 -k__xn:1c,2,3 -k__esc -k__esc_n:1,2 -k__esc_x:1c,2 -k__esc_xn:1c,2,3 -k__date -o locales/po/cacti.pot `find . -maxdepth 2 -name \*.php | sort`

sed -i 's/FULL NAME <EMAIL@ADDRESS\>/Howard Jones <howie@thingy.com>/g' locales/po/cacti.pot
sed -i 's/LANGUAGE <LL@li.org>/Howard Jones <howie@thingy.com>/g' locales/po/cacti.pot
Expand Down
101 changes: 50 additions & 51 deletions locales/po/cacti.pot
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Cacti \n"
"Report-Msgid-Bugs-To: developers@cacti.net\n"
"POT-Creation-Date: 2026-09-27 11:16-0400\n"
"POT-Creation-Date: 2026-09-28 16:07-0400\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Howard Jones <howie@thingy.com>>\n"
"Language-Team: Howard Jones <howie@thingy.com>\n"
Expand All @@ -17,202 +17,201 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"

#: quicktree.php:37 quicktree.php:349
#: quicktree.php
msgid "Save To New Tree"
msgstr ""

#: quicktree.php:38 quicktree.php:350
#: quicktree.php
msgid "Save To Branch"
msgstr ""

#: quicktree.php:39
#: quicktree.php
msgid "Clear All Graphs"
msgstr ""

#: quicktree.php:86
#: quicktree.php
msgid "Graph Added to QuickTree"
msgstr ""

#: quicktree.php:87
#: quicktree.php
#, php-format
msgid "Graph %s added to QuickTree. Goto the QuickTree page to move all Graphs to a new or existing Tree."
msgstr ""

#: quicktree.php:90
#: quicktree.php
msgid "Graph Not Added to QuickTree"
msgstr ""

#: quicktree.php:91
#: quicktree.php
#, php-format
msgid "Graph %s was NOT added to QuickTree as it's already there waiting to be placed on a Tree. Goto the QuickTree page to move all Graphs to a new or existing Tree."
msgstr ""

#: quicktree.php:95
#: quicktree.php
msgid "Graph Not Specified. Not added to QuickTree"
msgstr ""

#: quicktree.php:96
#: quicktree.php
msgid "No Graph was added to QuickTree as no Graph was specified."
msgstr ""

#: quicktree.php:108
#: quicktree.php
msgid "Click 'Continue' to Add the following Tree."
msgstr ""

#: quicktree.php:114 quicktree.php:158
#: quicktree.php
msgid "Tree Name"
msgstr ""

#: quicktree.php:117
#: quicktree.php
msgid "New Tree"
msgstr ""

#: quicktree.php:123 quicktree.php:175
#: quicktree.php
msgid "Branch Name"
msgstr ""

#: quicktree.php:126 quicktree.php:178 quicktree.php:335 setup.php:285
#: setup.php:292 setup.php:299 setup.php:306 setup.php:313 setup.php:320
#: quicktree.php setup.php
msgid "QuickTree"
msgstr ""

#: quicktree.php:134 quicktree.php:186
#: quicktree.php
msgid "Add To Branch"
msgstr ""

#: quicktree.php:134 quicktree.php:186
#: quicktree.php
msgid "Cancel"
msgstr ""

#: quicktree.php:134 quicktree.php:186
#: quicktree.php
msgid "Continue"
msgstr ""

#: quicktree.php:150
#: quicktree.php
msgid "Click 'Continue' to Add the following Tree Branch."
msgstr ""

#: quicktree.php:152
#: quicktree.php
msgid "Add to which Graph Tree?"
msgstr ""

#: quicktree.php:288
#: quicktree.php
msgid "QuickTree has Created Tree and/or Branch and added Graphs"
msgstr ""

#: quicktree.php:302
#: quicktree.php
msgid "QuickTree has no Graphs Queued"
msgstr ""

#: quicktree.php:338
#: quicktree.php
msgid "Information/Directions"
msgstr ""

#: quicktree.php:348
#: quicktree.php
msgid "The Graphs below are Queue to be added to a Cacti Tree. You may keep them here for as long as you like, or you can perform one of the following actions"
msgstr ""

#: quicktree.php:349
#: quicktree.php
msgid "Save your selection to a new Graph Tree so you can keep them for later and work on something new."
msgstr ""

#: quicktree.php:350
#: quicktree.php
msgid "Save your selection as a branch to an existing tree so that they appear in a specific section of an existing tree."
msgstr ""

#: quicktree.php:351
#: quicktree.php
msgid "Clear all graphs"
msgstr ""

#: quicktree.php:351
#: quicktree.php
msgid "Clear the Graphs on this page from the Graphs Queue so that you have a blank QuickTree ready for new selections"
msgstr ""

#: quicktree.php:352
#: quicktree.php
msgid "You can manage the individual graphs that appear here by clicking:"
msgstr ""

#: quicktree.php:353
#: quicktree.php
msgid "Add"
msgstr ""

#: quicktree.php:353
#: quicktree.php
msgid "Graph View Page"
msgstr ""

#: quicktree.php:353
#: quicktree.php
#, php-format
msgid "This icon is next to a Graph on the %s tab."
msgstr ""

#: quicktree.php:354
#: quicktree.php
msgid "Delete"
msgstr ""

#: quicktree.php:354
#: quicktree.php
msgid "This icon next to the Graphs below to remove them from the QuickTree Queue."
msgstr ""

#: quicktree.php:355
#: quicktree.php
msgid "Note:"
msgstr ""

#: quicktree.php:356
#: quicktree.php
msgid "Adding, removing or clearing on this page does not affect any other parts of Cacti (only Creating/Saving does)"
msgstr ""

#: quicktree.php:373
#: quicktree.php
msgid "Actions"
msgstr ""

#: quicktree.php:397
#: quicktree.php
msgid "Remove This Graph From QuickTree"
msgstr ""

#: quicktree.php:408
#: quicktree.php
msgid "No Graphs Added Yet"
msgstr ""

#: setup.php:61
#: setup.php
msgid "QuickTree Management"
msgstr ""

#: setup.php:106
#: setup.php
msgid "Misc"
msgstr ""

#: setup.php:110 setup.php:191
#: setup.php
msgid "Quicktree"
msgstr ""

#: setup.php:114
#: setup.php
msgid "Page Style"
msgstr ""

#: setup.php:115
#: setup.php
msgid "Where to display the QuickTree page"
msgstr ""

#: setup.php:118
#: setup.php
msgid "Tab"
msgstr ""

#: setup.php:119
#: setup.php
msgid "Console Menu"
msgstr ""

#: setup.php:120
#: setup.php
msgid "Both Tab and Console Menu"
msgstr ""

#: setup.php:219
#: setup.php
msgid "Add this graph to QuickTree"
msgstr ""

#: setup.php:242
#: setup.php
msgid "Management"
msgstr ""

#: setup.php:242
#: setup.php
msgid "QuickTree Trees"
msgstr ""
Loading