diff --git a/share/functions/__fish_any_arg_in.fish b/share/functions/__fish_any_arg_in.fish
index ad8d8de75..6bd90bb50 100644
--- a/share/functions/__fish_any_arg_in.fish
+++ b/share/functions/__fish_any_arg_in.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # returns 0 only if any argument is on of the supplied arguments
 function __fish_any_arg_in
     set -l haystack $argv
diff --git a/share/functions/__fish_anypager.fish b/share/functions/__fish_anypager.fish
index 7426c5911..2a7e20a83 100644
--- a/share/functions/__fish_anypager.fish
+++ b/share/functions/__fish_anypager.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_anypager --description "Print a pager to use"
     set -l pager
     # We prefer $PAGER if we have it
diff --git a/share/functions/__fish_anypython.fish b/share/functions/__fish_anypython.fish
index c9fa84ac4..567d22ae1 100644
--- a/share/functions/__fish_anypython.fish
+++ b/share/functions/__fish_anypython.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_anypython
     # Try python3 first, because that's usually faster and generally nicer.
     # Do not consider the stub /usr/bin/python3 that comes installed on Darwin to be Python
diff --git a/share/functions/__fish_append.fish b/share/functions/__fish_append.fish
index 07e447d94..10b5075da 100644
--- a/share/functions/__fish_append.fish
+++ b/share/functions/__fish_append.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_append -d "Internal completion function for appending string to the commandline" --argument-names sep
     set -e argv[1]
     set -l str (commandline -tc | string replace -rf "(.*$sep)[^$sep]*" '$1' | string replace -r -- '--.*=' '')
diff --git a/share/functions/__fish_apropos.fish b/share/functions/__fish_apropos.fish
index f0b3bb906..4cb02b5c5 100644
--- a/share/functions/__fish_apropos.fish
+++ b/share/functions/__fish_apropos.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 if not type -q apropos
     function __fish_apropos
     end
diff --git a/share/functions/__fish_argcomplete_complete.fish b/share/functions/__fish_argcomplete_complete.fish
index 0986b6427..3e175557f 100644
--- a/share/functions/__fish_argcomplete_complete.fish
+++ b/share/functions/__fish_argcomplete_complete.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_argcomplete_complete
     set -lx _ARGCOMPLETE 1
     set -lx _ARGCOMPLETE_IFS \n
diff --git a/share/functions/__fish_cache_put.fish b/share/functions/__fish_cache_put.fish
index a9162e909..5e95c340f 100644
--- a/share/functions/__fish_cache_put.fish
+++ b/share/functions/__fish_cache_put.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_cache_put
     set -l cache_file $argv[1]
     touch $cache_file
diff --git a/share/functions/__fish_cache_sourced_completions.fish b/share/functions/__fish_cache_sourced_completions.fish
index 333e48f47..0c23d7e7d 100644
--- a/share/functions/__fish_cache_sourced_completions.fish
+++ b/share/functions/__fish_cache_sourced_completions.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_cache_sourced_completions
     # Allow a `--name=foo` option which ends up in the filename.
     argparse -s name= -- $argv
diff --git a/share/functions/__fish_cached.fish b/share/functions/__fish_cached.fish
index 5dc2b8cfc..625b00b05 100644
--- a/share/functions/__fish_cached.fish
+++ b/share/functions/__fish_cached.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_cached --description "Cache the command output for a given amount of time"
 
     argparse --min-args 1 --max-args 1 --stop-nonopt 't/max-age=!_validate_int --min 0' 'k/cache-key=' -- $argv
diff --git a/share/functions/__fish_cancel_commandline.fish b/share/functions/__fish_cancel_commandline.fish
index a5f1290ec..7cc65321f 100644
--- a/share/functions/__fish_cancel_commandline.fish
+++ b/share/functions/__fish_cancel_commandline.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # This is meant to be bound to something like ctrl-c
 function __fish_cancel_commandline
     commandline -f cancel-commandline
diff --git a/share/functions/__fish_change_key_bindings.fish b/share/functions/__fish_change_key_bindings.fish
index b8512ed9e..89ae6e08b 100644
--- a/share/functions/__fish_change_key_bindings.fish
+++ b/share/functions/__fish_change_key_bindings.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_change_key_bindings --argument-names bindings
     set -g __fish_active_key_bindings $bindings
     # Allow the user to set the variable universally
diff --git a/share/functions/__fish_commandline_is_singlequoted.fish b/share/functions/__fish_commandline_is_singlequoted.fish
index 2c421358e..6fbcf62ff 100644
--- a/share/functions/__fish_commandline_is_singlequoted.fish
+++ b/share/functions/__fish_commandline_is_singlequoted.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # TODO: This function is deprecated. It was used in fish_clipboard_paste
 # which some users copied, so maybe leave it around for a few years.
 function __fish_commandline_is_singlequoted --description "Return 0 if the current token has an open single-quote"
diff --git a/share/functions/__fish_complete_atool_archive_contents.fish b/share/functions/__fish_complete_atool_archive_contents.fish
index 6d03e1a6c..d52750269 100644
--- a/share/functions/__fish_complete_atool_archive_contents.fish
+++ b/share/functions/__fish_complete_atool_archive_contents.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_atool_archive_contents --description 'List archive contents'
     set -l cmd (commandline -cxp)
     set -e cmd[1]
diff --git a/share/functions/__fish_complete_blockdevice.fish b/share/functions/__fish_complete_blockdevice.fish
index ce0185e06..da859918f 100644
--- a/share/functions/__fish_complete_blockdevice.fish
+++ b/share/functions/__fish_complete_blockdevice.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # Helper function for completions that need to enumerate block devices.
 function __fish_complete_blockdevice
     set -l cmd (commandline -ct)
diff --git a/share/functions/__fish_complete_cd.fish b/share/functions/__fish_complete_cd.fish
index 190f9b935..8f27e44d7 100644
--- a/share/functions/__fish_complete_cd.fish
+++ b/share/functions/__fish_complete_cd.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # This function only emits completions that might result from matches against $CDPATH. We rely on
 # the core file name completion logic to include all other possible matches.
 function __fish_complete_cd -d "Completions for the cd command"
diff --git a/share/functions/__fish_complete_clang.fish b/share/functions/__fish_complete_clang.fish
index 87aad29e4..f3448504f 100644
--- a/share/functions/__fish_complete_clang.fish
+++ b/share/functions/__fish_complete_clang.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # This function is compatible with clang, clang++, and variations thereof, and is shared
 # by clang.fish and clang++.fish.
 # We dynamically query the head at `(commandline -x)[1]` to get the correct completions.
diff --git a/share/functions/__fish_complete_command.fish b/share/functions/__fish_complete_command.fish
index 5f546dc1f..e161aa36b 100644
--- a/share/functions/__fish_complete_command.fish
+++ b/share/functions/__fish_complete_command.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_command --description 'Complete using all available commands'
     set -l ctoken "$(commandline -ct)"
     switch $ctoken
diff --git a/share/functions/__fish_complete_convert_options.fish b/share/functions/__fish_complete_convert_options.fish
index 686149b09..4d2646d25 100644
--- a/share/functions/__fish_complete_convert_options.fish
+++ b/share/functions/__fish_complete_convert_options.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_convert_options --description 'Complete Convert options' --argument-names what
     switch $what
         case format Format
diff --git a/share/functions/__fish_complete_directories.fish b/share/functions/__fish_complete_directories.fish
index ce844d5c6..fb0b8f95c 100644
--- a/share/functions/__fish_complete_directories.fish
+++ b/share/functions/__fish_complete_directories.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 #
 # Find directories that complete $argv[1], output them as completions
 # with description $argv[2] if defined, otherwise use 'Directory'.
diff --git a/share/functions/__fish_complete_freedesktop_icons.fish b/share/functions/__fish_complete_freedesktop_icons.fish
index ae5a9aaf8..8cad857f1 100644
--- a/share/functions/__fish_complete_freedesktop_icons.fish
+++ b/share/functions/__fish_complete_freedesktop_icons.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_freedesktop_icons -d 'List installed icon names according to `https://specifications.freedesktop.org/icon-theme-spec/0.13/`'
     # The latest `icon-theme-spec` as of 2024-08-10 is 0.13
     # https://specifications.freedesktop.org/icon-theme-spec/latest/
diff --git a/share/functions/__fish_complete_gpg_key_id.fish b/share/functions/__fish_complete_gpg_key_id.fish
index 18a372b10..d64e160f1 100644
--- a/share/functions/__fish_complete_gpg_key_id.fish
+++ b/share/functions/__fish_complete_gpg_key_id.fish
@@ -1,5 +1,6 @@
-# Helper function for contextual autocompletion of GPG key ids
+# localization: skip(private)
 
+# Helper function for contextual autocompletion of GPG key ids
 function __fish_complete_gpg_key_id -d 'Complete using gpg key ids' -a __fish_complete_gpg_command list_arg
     # Use user id as description
     set -l keyid
diff --git a/share/functions/__fish_complete_gpg_user_id.fish b/share/functions/__fish_complete_gpg_user_id.fish
index b43e6c5fd..f0231237f 100644
--- a/share/functions/__fish_complete_gpg_user_id.fish
+++ b/share/functions/__fish_complete_gpg_user_id.fish
@@ -1,5 +1,6 @@
-# Helper function for contextual autocompletion of gpg user ids
+# localization: skip(private)
 
+# Helper function for contextual autocompletion of gpg user ids
 function __fish_complete_gpg_user_id -d "Complete using gpg user ids" -a __fish_complete_gpg_command list_arg
     # gpg doesn't seem to like it when you use the whole key name as a
     # completion, so we skip the <EMAIL> part and use it as a description.
diff --git a/share/functions/__fish_complete_group_ids.fish b/share/functions/__fish_complete_group_ids.fish
index 3e1604219..5c089ef76 100644
--- a/share/functions/__fish_complete_group_ids.fish
+++ b/share/functions/__fish_complete_group_ids.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_group_ids --description "Complete group IDs with group name as description"
     if command -sq getent
         getent group | string replace -f -r '^([[:alpha:]_][^:]*):[^:]*:(\d+).*' '$2\t$1'
diff --git a/share/functions/__fish_complete_groups.fish b/share/functions/__fish_complete_groups.fish
index 5acc21290..408c7face 100644
--- a/share/functions/__fish_complete_groups.fish
+++ b/share/functions/__fish_complete_groups.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_groups --description "Print a list of local groups, with group members as the description"
     if command -sq getent
         getent group | while read -l line
diff --git a/share/functions/__fish_complete_job_pids.fish b/share/functions/__fish_complete_job_pids.fish
index 056e061f6..a90571c21 100644
--- a/share/functions/__fish_complete_job_pids.fish
+++ b/share/functions/__fish_complete_job_pids.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_job_pids --description "Print a list of job PIDs and their commands"
     if set -l jobpids (jobs -p)
         # when run at the commandline, the first line of output is a header, but
diff --git a/share/functions/__fish_complete_list.fish b/share/functions/__fish_complete_list.fish
index b2e5c88f3..1d6e86979 100644
--- a/share/functions/__fish_complete_list.fish
+++ b/share/functions/__fish_complete_list.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_list --argument-names div cmd prefix iprefix
     if not set -q cmd[1]
         echo "Usage:
diff --git a/share/functions/__fish_complete_lpr_option.fish b/share/functions/__fish_complete_lpr_option.fish
index 97499fe64..3b5c011e1 100644
--- a/share/functions/__fish_complete_lpr_option.fish
+++ b/share/functions/__fish_complete_lpr_option.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_lpr_option --description 'Complete lpr option'
     set -l optstr "$(commandline -t)"
     switch $optstr
diff --git a/share/functions/__fish_complete_man.fish b/share/functions/__fish_complete_man.fish
index b639e572d..5b7a84168 100644
--- a/share/functions/__fish_complete_man.fish
+++ b/share/functions/__fish_complete_man.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_man
     # Try to guess what section to search in. If we don't know, we
     # use [^)]*, which should match any section.
diff --git a/share/functions/__fish_complete_path.fish b/share/functions/__fish_complete_path.fish
index 7956abc6c..7b9236014 100644
--- a/share/functions/__fish_complete_path.fish
+++ b/share/functions/__fish_complete_path.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_path --description "Complete using path"
     set -l target
     set -l description
diff --git a/share/functions/__fish_complete_pg_database.fish b/share/functions/__fish_complete_pg_database.fish
index 6a17389ea..74b27818c 100644
--- a/share/functions/__fish_complete_pg_database.fish
+++ b/share/functions/__fish_complete_pg_database.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_pg_database
     psql -AtqwlXF \t 2>/dev/null | awk 'NF > 1 { print $1 }'
 end
diff --git a/share/functions/__fish_complete_pg_user.fish b/share/functions/__fish_complete_pg_user.fish
index 4770e5c9c..4e9236684 100644
--- a/share/functions/__fish_complete_pg_user.fish
+++ b/share/functions/__fish_complete_pg_user.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_pg_user
     psql -AtqwXc 'select usename from pg_user' template1 2>/dev/null
 end
diff --git a/share/functions/__fish_complete_pids.fish b/share/functions/__fish_complete_pids.fish
index da3291165..bef29d93d 100644
--- a/share/functions/__fish_complete_pids.fish
+++ b/share/functions/__fish_complete_pids.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_pids -d "Print a list of process identifiers along with brief descriptions"
     # This may be a bit slower, but it's nice - having the tty displayed is really handy
     # 'tail -n +2' deletes the first line, which contains the headers
diff --git a/share/functions/__fish_complete_ppp_peer.fish b/share/functions/__fish_complete_ppp_peer.fish
index faabba378..422e75a49 100644
--- a/share/functions/__fish_complete_ppp_peer.fish
+++ b/share/functions/__fish_complete_ppp_peer.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_ppp_peer --description 'Complete isp name for pon/poff'
     find /etc/ppp/peers/ -type f -printf '%f\n'
 
diff --git a/share/functions/__fish_complete_proc.fish b/share/functions/__fish_complete_proc.fish
index 30364e2d4..bea9a7e82 100644
--- a/share/functions/__fish_complete_proc.fish
+++ b/share/functions/__fish_complete_proc.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_proc
     # "comm=" means "print comm field with an empty name", which causes the header to be removed.
     # On many systems, comm is truncated (e.g. on Linux it's 15 chars),
diff --git a/share/functions/__fish_complete_subcommand.fish b/share/functions/__fish_complete_subcommand.fish
index 7edca8a98..c801fb125 100644
--- a/share/functions/__fish_complete_subcommand.fish
+++ b/share/functions/__fish_complete_subcommand.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_subcommand -d "Complete subcommand" --no-scope-shadowing
     # How many non-option tokens we skip in the input commandline before completing the subcommand
     # Usually 1; use "--fcs-skip=2" to make it 2 (see e.g. tmux and ssh completions)
diff --git a/share/functions/__fish_complete_suffix.fish b/share/functions/__fish_complete_suffix.fish
index c7d3e4795..1b999528e 100644
--- a/share/functions/__fish_complete_suffix.fish
+++ b/share/functions/__fish_complete_suffix.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # Find files ending in any of the non-switch arguments and output them as completions.
 # * --description provides the description that should be part of each generated completion,
 # * --prefix=DIR makes __fish_complete_suffix behave as if it were called in DIR rather than $PWD
diff --git a/share/functions/__fish_complete_user_at_hosts.fish b/share/functions/__fish_complete_user_at_hosts.fish
index 4d3a11be1..96f140465 100644
--- a/share/functions/__fish_complete_user_at_hosts.fish
+++ b/share/functions/__fish_complete_user_at_hosts.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_user_at_hosts -d "Print list host-names with user@"
     for user_at in (commandline -ct | string match -r '.*@'; or echo "")(__fish_print_hostnames)
         echo $user_at
diff --git a/share/functions/__fish_complete_user_ids.fish b/share/functions/__fish_complete_user_ids.fish
index a48c1f740..58087faa5 100644
--- a/share/functions/__fish_complete_user_ids.fish
+++ b/share/functions/__fish_complete_user_ids.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_user_ids --description "Complete user IDs with user name as description"
     if command -sq getent
         getent passwd | string replace -f -r '^([[:alpha:]_][^:]*):[^:]*:(\d+).*' '$2\t$1'
diff --git a/share/functions/__fish_complete_users.fish b/share/functions/__fish_complete_users.fish
index 6f6c29c62..4083e70d4 100644
--- a/share/functions/__fish_complete_users.fish
+++ b/share/functions/__fish_complete_users.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # This should be used where you want user names with a description. Such as in an argument
 # completion. If you just want a list of user names use __fish_print_users.
 # The string replace command takes into account GECOS-formatted description fields, by retaining
diff --git a/share/functions/__fish_complete_zfs_pools.fish b/share/functions/__fish_complete_zfs_pools.fish
index fb2471567..ba4bae1ec 100644
--- a/share/functions/__fish_complete_zfs_pools.fish
+++ b/share/functions/__fish_complete_zfs_pools.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_complete_zfs_pools -d "Completes with available ZFS pools"
     zpool list -o name,comment -H | string replace -a \t'-' ''
 end
diff --git a/share/functions/__fish_concat_completions.fish b/share/functions/__fish_concat_completions.fish
index bf4187ed4..c59b86e2e 100644
--- a/share/functions/__fish_concat_completions.fish
+++ b/share/functions/__fish_concat_completions.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # This function is intended to be used to generate completions in `-a "(...)"` calls for arguments that take 1..n values
 # separated by commas and we dynamically or statically generated a list of n values that must be combined and permuted
 # in order to appease both the `complete` machinery and the target application.
diff --git a/share/functions/__fish_config_interactive.fish b/share/functions/__fish_config_interactive.fish
index 6304c60a0..479d0212c 100644
--- a/share/functions/__fish_config_interactive.fish
+++ b/share/functions/__fish_config_interactive.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 #
 # Initializations that should only be performed when entering interactive mode.
 #
diff --git a/share/functions/__fish_contains_opt.fish b/share/functions/__fish_contains_opt.fish
index 151169b4e..74b39d5e2 100644
--- a/share/functions/__fish_contains_opt.fish
+++ b/share/functions/__fish_contains_opt.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_contains_opt -d "Checks if a specific option has been given in the current commandline"
     set -l next_short
     set -l short_opt
diff --git a/share/functions/__fish_crux_packages.fish b/share/functions/__fish_crux_packages.fish
index d9d505f9a..035676e73 100644
--- a/share/functions/__fish_crux_packages.fish
+++ b/share/functions/__fish_crux_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # a function to obtain a list of installed packages with CRUX pkgutils
 function __fish_crux_packages -d 'Obtain a list of installed packages'
     pkginfo -i | string split -f1 ' '
diff --git a/share/functions/__fish_cursor_konsole.fish b/share/functions/__fish_cursor_konsole.fish
index e6941a451..5c1970359 100644
--- a/share/functions/__fish_cursor_konsole.fish
+++ b/share/functions/__fish_cursor_konsole.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_cursor_konsole -d 'Set cursor (konsole)'
     set -l shape $argv[1]
     switch "$shape"
diff --git a/share/functions/__fish_cursor_xterm.fish b/share/functions/__fish_cursor_xterm.fish
index e05a1b9a5..9efe9c14e 100644
--- a/share/functions/__fish_cursor_xterm.fish
+++ b/share/functions/__fish_cursor_xterm.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_cursor_xterm -d 'Set cursor (xterm)'
     set -l shape $argv[1]
 
diff --git a/share/functions/__fish_describe_command.fish b/share/functions/__fish_describe_command.fish
index 89a8fee3d..3532732af 100644
--- a/share/functions/__fish_describe_command.fish
+++ b/share/functions/__fish_describe_command.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 #
 # This function is used internally by the fish command completion code
 #
diff --git a/share/functions/__fish_echo.fish b/share/functions/__fish_echo.fish
index 9f0948799..8b148353b 100644
--- a/share/functions/__fish_echo.fish
+++ b/share/functions/__fish_echo.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 set -l erase_line "$(
     if status test-feature ignore-terminfo
         echo \e\[K
diff --git a/share/functions/__fish_first_token.fish b/share/functions/__fish_first_token.fish
index 0ab1117cb..04a51f723 100644
--- a/share/functions/__fish_first_token.fish
+++ b/share/functions/__fish_first_token.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # Retrieves the first non-switch argument from the command line buffer
 function __fish_first_token
     set -l tokens (commandline -cx)
diff --git a/share/functions/__fish_gnu_complete.fish b/share/functions/__fish_gnu_complete.fish
index d49bcbdfa..09ec8bad6 100644
--- a/share/functions/__fish_gnu_complete.fish
+++ b/share/functions/__fish_gnu_complete.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_gnu_complete -d "Wrapper for the complete built-in. Skips the long completions on non-GNU systems"
     set -l is_gnu 0
 
diff --git a/share/functions/__fish_indent.fish b/share/functions/__fish_indent.fish
index b4c69c2ea..3da31f499 100644
--- a/share/functions/__fish_indent.fish
+++ b/share/functions/__fish_indent.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 set -l dir "$(path dirname -- (status fish-path 2>/dev/null))"
 
 if command -v $dir/fish_indent >/dev/null
diff --git a/share/functions/__fish_is_first_arg.fish b/share/functions/__fish_is_first_arg.fish
index f9983b0aa..6916433c4 100644
--- a/share/functions/__fish_is_first_arg.fish
+++ b/share/functions/__fish_is_first_arg.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # determine if this is the very first argument (regardless if switch or not)
 function __fish_is_first_arg
     set -l tokens (commandline -pxc)
diff --git a/share/functions/__fish_is_first_token.fish b/share/functions/__fish_is_first_token.fish
index a89cf39cd..207698c1b 100644
--- a/share/functions/__fish_is_first_token.fish
+++ b/share/functions/__fish_is_first_token.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_is_first_token -d 'Test if no non-switch argument has been specified yet'
     __fish_is_nth_token 1
 end
diff --git a/share/functions/__fish_is_git_repository.fish b/share/functions/__fish_is_git_repository.fish
index 57046b890..aaa45750e 100644
--- a/share/functions/__fish_is_git_repository.fish
+++ b/share/functions/__fish_is_git_repository.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_is_git_repository --description 'Check if the current directory is a git repository'
     git rev-parse --is-inside-work-tree 2>/dev/null >/dev/null
 end
diff --git a/share/functions/__fish_is_nth_token.fish b/share/functions/__fish_is_nth_token.fish
index f854afdd6..395f8483c 100644
--- a/share/functions/__fish_is_nth_token.fish
+++ b/share/functions/__fish_is_nth_token.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_is_nth_token --description 'Test if current token is the Nth (ignoring command and switches/flags)' --argument-names n
     set -l tokens (commandline -pxc)
     set -l tokens (string replace -r --filter '^([^-].*)' '$1' -- $tokens)
diff --git a/share/functions/__fish_is_switch.fish b/share/functions/__fish_is_switch.fish
index 5981afa58..ca170710e 100644
--- a/share/functions/__fish_is_switch.fish
+++ b/share/functions/__fish_is_switch.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # Whether or not the current token is a switch
 function __fish_is_switch
     string match -qr -- '^-' ""(commandline -ct)
diff --git a/share/functions/__fish_is_token_n.fish b/share/functions/__fish_is_token_n.fish
index 5dbcdfda7..2146fd09e 100644
--- a/share/functions/__fish_is_token_n.fish
+++ b/share/functions/__fish_is_token_n.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_is_token_n --description 'Test if current token is on Nth place' --argument-names n
     __fish_is_nth_token $n
 end
diff --git a/share/functions/__fish_is_zfs_feature_enabled.fish b/share/functions/__fish_is_zfs_feature_enabled.fish
index 8949ce41e..43f5161ae 100644
--- a/share/functions/__fish_is_zfs_feature_enabled.fish
+++ b/share/functions/__fish_is_zfs_feature_enabled.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_is_zfs_feature_enabled \
     -a feature pool \
     -d "Returns 0 if the given ZFS pool feature is active or enabled for the given pool or for any pool if none specified"
diff --git a/share/functions/__fish_make_cache_dir.fish b/share/functions/__fish_make_cache_dir.fish
index 1d6714a7b..85fb364dd 100644
--- a/share/functions/__fish_make_cache_dir.fish
+++ b/share/functions/__fish_make_cache_dir.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_make_cache_dir --description "Create and return XDG_CACHE_HOME"
     set -l xdg_cache_home $XDG_CACHE_HOME
     if test -z "$xdg_cache_home"; or string match -qv '/*' -- $xdg_cache_home; or set -q xdg_cache_home[2]
diff --git a/share/functions/__fish_make_completion_signals.fish b/share/functions/__fish_make_completion_signals.fish
index 4891fd587..8068668f6 100644
--- a/share/functions/__fish_make_completion_signals.fish
+++ b/share/functions/__fish_make_completion_signals.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_make_completion_signals --description 'Make list of kill signals for completion'
     set -q __kill_signals
     and return 0
diff --git a/share/functions/__fish_man_page.fish b/share/functions/__fish_man_page.fish
index 44b9bb26a..6a83270db 100644
--- a/share/functions/__fish_man_page.fish
+++ b/share/functions/__fish_man_page.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_man_page
     # Get all commandline tokens not starting with "-", up to and including the cursor's
     set -l args (string match -rv '^-|^$' -- (commandline -cpx && commandline -t))
diff --git a/share/functions/__fish_md5.fish b/share/functions/__fish_md5.fish
index 58e33a1ec..84b6049cf 100644
--- a/share/functions/__fish_md5.fish
+++ b/share/functions/__fish_md5.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_md5
     if type -q md5sum
         # GNU systems
@@ -5,7 +6,7 @@ function __fish_md5
             if test $argv[1] = -s
                 echo $argv[2] | md5sum | string split ' ' -f 1
             else
-                printf (_ "%s: Too many arguments %s\n") fish_md5 $argv >&2
+                printf "%s: Too many arguments %s\n" fish_md5 $argv >&2
             end
         else
             md5sum $argv[1] | string split ' ' -f 1
@@ -17,7 +18,7 @@ function __fish_md5
             if test $argv[1] = -s
                 md5 -s $argv[2]
             else
-                printf (_ "%s: Too many arguments %s\n") fish_md5 $argv >&2
+                printf "%s: Too many arguments %s\n" fish_md5 $argv >&2
             end
         else
             md5 -q $argv[1]
diff --git a/share/functions/__fish_mktemp_relative.fish b/share/functions/__fish_mktemp_relative.fish
index 60742f7b1..36e86fbbc 100644
--- a/share/functions/__fish_mktemp_relative.fish
+++ b/share/functions/__fish_mktemp_relative.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_mktemp_relative
     # OSX mktemp is rather restricted - no suffix, no way to automatically use TMPDIR
     if not set -q TMPDIR[1]
diff --git a/share/functions/__fish_move_last.fish b/share/functions/__fish_move_last.fish
index abb9a7793..7a7d8bc46 100644
--- a/share/functions/__fish_move_last.fish
+++ b/share/functions/__fish_move_last.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_move_last -d "Move the last element of a directory history from src to dest"
     set -l src $argv[1]
     set -l dest $argv[2]
diff --git a/share/functions/__fish_no_arguments.fish b/share/functions/__fish_no_arguments.fish
index c40b6fbff..09f008084 100644
--- a/share/functions/__fish_no_arguments.fish
+++ b/share/functions/__fish_no_arguments.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_no_arguments -d "Internal fish function"
     set -l cmd (commandline -pxc) (commandline -tc)
     set -e cmd[1]
diff --git a/share/functions/__fish_not_contain_opt.fish b/share/functions/__fish_not_contain_opt.fish
index 87cf573b5..c0bcea99e 100644
--- a/share/functions/__fish_not_contain_opt.fish
+++ b/share/functions/__fish_not_contain_opt.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_not_contain_opt -d "Checks that a specific option is not in the current command line"
     set -l next_short
     set -l short_opt
diff --git a/share/functions/__fish_npm_helper.fish b/share/functions/__fish_npm_helper.fish
index 155d7eb37..c5dce0640 100644
--- a/share/functions/__fish_npm_helper.fish
+++ b/share/functions/__fish_npm_helper.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # This file is explicitly sourced by the npm and yarn completions
 # It is used to enumerate entries from the npm registry, interact with a locally installed
 # package.json file, and more.
diff --git a/share/functions/__fish_nth_token.fish b/share/functions/__fish_nth_token.fish
index e41e83e56..13b5fdcc3 100644
--- a/share/functions/__fish_nth_token.fish
+++ b/share/functions/__fish_nth_token.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_nth_token --description 'Prints the Nth token (ignoring command and switches/flags)' --argument-names n
     set -l tokens (commandline -px | string replace -r --filter '^([^-].*)' '$1')
     # Increment $n by one to account for ignoring the command
diff --git a/share/functions/__fish_number_of_cmd_args_wo_opts.fish b/share/functions/__fish_number_of_cmd_args_wo_opts.fish
index 62357b06b..e881aaa77 100644
--- a/share/functions/__fish_number_of_cmd_args_wo_opts.fish
+++ b/share/functions/__fish_number_of_cmd_args_wo_opts.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_number_of_cmd_args_wo_opts
     count (__fish_print_cmd_args_without_options)
 end
diff --git a/share/functions/__fish_paginate.fish b/share/functions/__fish_paginate.fish
index 3b6e4b4dd..696dbfdfc 100644
--- a/share/functions/__fish_paginate.fish
+++ b/share/functions/__fish_paginate.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_paginate -d "Paginate the current command using the users default pager"
     set -l cmd (__fish_anypager)
     or return 1
diff --git a/share/functions/__fish_parent_directories.fish b/share/functions/__fish_parent_directories.fish
index 8c101f97d..cadd69f57 100644
--- a/share/functions/__fish_parent_directories.fish
+++ b/share/functions/__fish_parent_directories.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # Generates a list of parent directories for a given path
 # i.e. /a/b/c/d -> [/a/b/c/, /a/b/, /a/, and /a]
 function __fish_parent_directories
diff --git a/share/functions/__fish_paste.fish b/share/functions/__fish_paste.fish
index 981c0983a..3f8e11d5a 100644
--- a/share/functions/__fish_paste.fish
+++ b/share/functions/__fish_paste.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_paste
     # Also split on \r, otherwise it looks confusing
     set -l data (string split \r -- $argv[1] | string split \n)
diff --git a/share/functions/__fish_prepend_sudo.fish b/share/functions/__fish_prepend_sudo.fish
index 1c72e8f08..0eb014b1d 100644
--- a/share/functions/__fish_prepend_sudo.fish
+++ b/share/functions/__fish_prepend_sudo.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_prepend_sudo -d " DEPRECATED: use fish_commandline_prepend instead. Prepend 'sudo ' to the beginning of the current commandline"
     fish_commandline_prepend sudo
 end
diff --git a/share/functions/__fish_prev_arg_in.fish b/share/functions/__fish_prev_arg_in.fish
index 41fa241fd..71446476a 100644
--- a/share/functions/__fish_prev_arg_in.fish
+++ b/share/functions/__fish_prev_arg_in.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # returns 0 only if previous argument is one of the supplied arguments
 function __fish_prev_arg_in
     set -l tokens (commandline -cx)
diff --git a/share/functions/__fish_preview_current_file.fish b/share/functions/__fish_preview_current_file.fish
index c8712380a..238fc8566 100644
--- a/share/functions/__fish_preview_current_file.fish
+++ b/share/functions/__fish_preview_current_file.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_preview_current_file --description "Open the file at the cursor in a pager"
     if __fish_edit_command_if_at_cursor
         return 0
diff --git a/share/functions/__fish_print_VBox_vms.fish b/share/functions/__fish_print_VBox_vms.fish
index 3f7e04329..c3417b5de 100644
--- a/share/functions/__fish_print_VBox_vms.fish
+++ b/share/functions/__fish_print_VBox_vms.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_VBox_vms
     set -l print_names true
     set -l print_uuids true
diff --git a/share/functions/__fish_print_addresses.fish b/share/functions/__fish_print_addresses.fish
index cd9141eea..d1cdb4a74 100644
--- a/share/functions/__fish_print_addresses.fish
+++ b/share/functions/__fish_print_addresses.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_addresses --description "List own network addresses with interface as description"
     # if --all is given, also print 0.0.0.0 and ::
     if contains -- --all $argv
diff --git a/share/functions/__fish_print_apt_packages.fish b/share/functions/__fish_print_apt_packages.fish
index 102895b1b..c76fef097 100644
--- a/share/functions/__fish_print_apt_packages.fish
+++ b/share/functions/__fish_print_apt_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_apt_packages
     argparse --name=__fish_print_packages i/installed -- $argv
     or return
diff --git a/share/functions/__fish_print_cmd_args.fish b/share/functions/__fish_print_cmd_args.fish
index 29129afcc..5e74924af 100644
--- a/share/functions/__fish_print_cmd_args.fish
+++ b/share/functions/__fish_print_cmd_args.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_cmd_args
     commandline -pxc
 end
diff --git a/share/functions/__fish_print_cmd_args_without_options.fish b/share/functions/__fish_print_cmd_args_without_options.fish
index b38c224b1..3fecd1f37 100644
--- a/share/functions/__fish_print_cmd_args_without_options.fish
+++ b/share/functions/__fish_print_cmd_args_without_options.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_cmd_args_without_options
     __fish_print_cmd_args | string match -re '^[^-]'
 end
diff --git a/share/functions/__fish_print_commands.fish b/share/functions/__fish_print_commands.fish
index b9b05b907..506b15fd0 100644
--- a/share/functions/__fish_print_commands.fish
+++ b/share/functions/__fish_print_commands.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_commands --description "Print a list of documented fish commands"
     if set -q __fish_data_dir[1] && test -d $__fish_data_dir/man/man1/
         for file in $__fish_data_dir/man/man1/**.1*
diff --git a/share/functions/__fish_print_debian_apache_confs.fish b/share/functions/__fish_print_debian_apache_confs.fish
index 39d732e19..000dd7687 100644
--- a/share/functions/__fish_print_debian_apache_confs.fish
+++ b/share/functions/__fish_print_debian_apache_confs.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_debian_apache_confs
     # Helper script for completions for a2enconf/a2disconf
     for conf in /etc/apache2/conf-available/*.conf
diff --git a/share/functions/__fish_print_debian_apache_mods.fish b/share/functions/__fish_print_debian_apache_mods.fish
index 36a1fb984..1d194a597 100644
--- a/share/functions/__fish_print_debian_apache_mods.fish
+++ b/share/functions/__fish_print_debian_apache_mods.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_debian_apache_mods
     # Helper script for completions for a2enmod/a2dismod
     for mod in /etc/apache2/mods-available/*.load
diff --git a/share/functions/__fish_print_debian_apache_sites.fish b/share/functions/__fish_print_debian_apache_sites.fish
index d3f1bbe37..15347c5d2 100644
--- a/share/functions/__fish_print_debian_apache_sites.fish
+++ b/share/functions/__fish_print_debian_apache_sites.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_debian_apache_sites
     # Helper script for completions for a2ensite/a2dissite
     for site in /etc/apache2/sites-available/*
diff --git a/share/functions/__fish_print_encodings.fish b/share/functions/__fish_print_encodings.fish
index 6d1722fae..174c3d0f2 100644
--- a/share/functions/__fish_print_encodings.fish
+++ b/share/functions/__fish_print_encodings.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_encodings -d "Complete using available character encodings"
     if iconv --usage &>/dev/null # only GNU has this flag
         # Note: GNU iconv changes its output to contain the forward slashes below when stdout is not a tty.
diff --git a/share/functions/__fish_print_eopkg_packages.fish b/share/functions/__fish_print_eopkg_packages.fish
index c749ecd35..b986ba232 100644
--- a/share/functions/__fish_print_eopkg_packages.fish
+++ b/share/functions/__fish_print_eopkg_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_eopkg_packages
     type -q -f eopkg || return 1
 
diff --git a/share/functions/__fish_print_filesystems.fish b/share/functions/__fish_print_filesystems.fish
index 0d5266de4..4d55bbe16 100644
--- a/share/functions/__fish_print_filesystems.fish
+++ b/share/functions/__fish_print_filesystems.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_filesystems -d "Print a list of all known filesystem types"
     set -l fs adfs affs autofs btrfs coda coherent cramfs devpts efs ext ext2 ext3 ffs
     set -a fs hfs hpfs iso9660 jfs minix msdos ncpfs nfs ntfs proc qnx4 ramfs
diff --git a/share/functions/__fish_print_gpg_algo.fish b/share/functions/__fish_print_gpg_algo.fish
index 445e19c6a..b7fae2125 100644
--- a/share/functions/__fish_print_gpg_algo.fish
+++ b/share/functions/__fish_print_gpg_algo.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # Helper function for contextual autocompletion of GPG crypto algorithm options
 
 function __fish_print_gpg_algo -d "Complete using all algorithms of the type specified in argv[2] supported by gpg. argv[2] is a regexp" -a __fish_complete_gpg_command
diff --git a/share/functions/__fish_print_groups.fish b/share/functions/__fish_print_groups.fish
index 275527018..b94fcece9 100644
--- a/share/functions/__fish_print_groups.fish
+++ b/share/functions/__fish_print_groups.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # This should be used where you want group names without a description. If you also want
 # a description, such as when getting a list of groups for a completion, you probably want
 # __fish_complete_groups.
diff --git a/share/functions/__fish_print_help.fish b/share/functions/__fish_print_help.fish
index f18aad7f8..56a809864 100644
--- a/share/functions/__fish_print_help.fish
+++ b/share/functions/__fish_print_help.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_help --description "Print help for the specified fish function or builtin"
     set -l item $argv[1]
     switch $item
@@ -73,7 +74,7 @@ function __fish_print_help_pre_4.1 --description "Print help message for the spe
             set -a format -rLL={$cols}n
         end
     else
-        echo fish: (_ "Cannot format help; no parser found") >&2
+        echo "fish: Cannot format help; no parser found" >&2
         return 1
     end
 
diff --git a/share/functions/__fish_print_hostnames.fish b/share/functions/__fish_print_hostnames.fish
index 47827f23f..3307755c8 100644
--- a/share/functions/__fish_print_hostnames.fish
+++ b/share/functions/__fish_print_hostnames.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_hostnames -d "Print a list of known hostnames"
     # This function used to primarily query `getent hosts` and only read from `/etc/hosts` if
     # `getent` did not exist or `getent hosts` failed, based off the (documented) assumption that
diff --git a/share/functions/__fish_print_interfaces.fish b/share/functions/__fish_print_interfaces.fish
index 3677bd409..7462bd017 100644
--- a/share/functions/__fish_print_interfaces.fish
+++ b/share/functions/__fish_print_interfaces.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_interfaces --description "Print a list of known network interfaces"
     if test -d /sys/class/net
         path basename /sys/class/net/*
diff --git a/share/functions/__fish_print_lpr_options.fish b/share/functions/__fish_print_lpr_options.fish
index 9227031f9..a4e5cd6d5 100644
--- a/share/functions/__fish_print_lpr_options.fish
+++ b/share/functions/__fish_print_lpr_options.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_lpr_options --description 'Print lpr options'
     lpoptions -l 2>/dev/null | sed 's+\(.*\)/\(.*\):.*$+\1\t\2+'
 
diff --git a/share/functions/__fish_print_lpr_printers.fish b/share/functions/__fish_print_lpr_printers.fish
index d54cc4430..4c9f0792a 100644
--- a/share/functions/__fish_print_lpr_printers.fish
+++ b/share/functions/__fish_print_lpr_printers.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_lpr_printers --description 'Print lpr printers'
     lpstat -p 2>/dev/null | sed 's/^\S*\s\(\S*\)\s\(.*\)$/\1\t\2/'
 
diff --git a/share/functions/__fish_print_modules.fish b/share/functions/__fish_print_modules.fish
index 388072e93..2a9fb7393 100644
--- a/share/functions/__fish_print_modules.fish
+++ b/share/functions/__fish_print_modules.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # Helper function for completions that need to enumerate Linux modules
 function __fish_print_modules
     find /lib/modules/(uname -r)/{kernel,misc} -type f 2>/dev/null | sed -e 's$/.*/\([^/.]*\).*$\1$'
diff --git a/share/functions/__fish_print_mounted.fish b/share/functions/__fish_print_mounted.fish
index 1b1486a81..19e29b70c 100644
--- a/share/functions/__fish_print_mounted.fish
+++ b/share/functions/__fish_print_mounted.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_mounted --description 'Print mounted devices'
     if test -r /etc/mtab
         # In mtab, spaces are replaced by a literal '\040'
diff --git a/share/functions/__fish_print_opkg_packages.fish b/share/functions/__fish_print_opkg_packages.fish
index 8ef525b9c..8d865eb23 100644
--- a/share/functions/__fish_print_opkg_packages.fish
+++ b/share/functions/__fish_print_opkg_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_opkg_packages
     type -q -f opkg || return 1
 
diff --git a/share/functions/__fish_print_packages.fish b/share/functions/__fish_print_packages.fish
index 4d3bbdb7c..b165b2ae3 100644
--- a/share/functions/__fish_print_packages.fish
+++ b/share/functions/__fish_print_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_packages
     # This is `__fish_print_packages`. It prints packages,
     # from the first package manager it finds.
diff --git a/share/functions/__fish_print_pacman_packages.fish b/share/functions/__fish_print_pacman_packages.fish
index 01e23747c..6cbffe036 100644
--- a/share/functions/__fish_print_pacman_packages.fish
+++ b/share/functions/__fish_print_pacman_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_pacman_packages
     # Caches for 5 minutes
     type -q -f pacman || return 1
diff --git a/share/functions/__fish_print_pacman_repos.fish b/share/functions/__fish_print_pacman_repos.fish
index daa866350..a317b50ed 100644
--- a/share/functions/__fish_print_pacman_repos.fish
+++ b/share/functions/__fish_print_pacman_repos.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_pacman_repos --description "Print the repositories configured for arch's pacman package manager"
     string match -er "\[.*\]" </etc/pacman.conf | string match -r -v "^#|options" | string replace -ra "\[|\]" ""
 end
diff --git a/share/functions/__fish_print_pipestatus.fish b/share/functions/__fish_print_pipestatus.fish
index 16ef90b94..efe75a855 100644
--- a/share/functions/__fish_print_pipestatus.fish
+++ b/share/functions/__fish_print_pipestatus.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_pipestatus --description "Print pipestatus for prompt"
     set -l last_status
     if set -q __fish_last_status
diff --git a/share/functions/__fish_print_pkg_add_packages.fish b/share/functions/__fish_print_pkg_add_packages.fish
index a40225600..64601dbb1 100644
--- a/share/functions/__fish_print_pkg_add_packages.fish
+++ b/share/functions/__fish_print_pkg_add_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_pkg_add_packages
     # pkg_info on OpenBSD provides versioning info which we want for
     # installed packages but, calling it directly can cause delays in
diff --git a/share/functions/__fish_print_pkg_packages.fish b/share/functions/__fish_print_pkg_packages.fish
index ea0476235..2a73efb72 100644
--- a/share/functions/__fish_print_pkg_packages.fish
+++ b/share/functions/__fish_print_pkg_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_pkg_packages
     # Pkg is fast on FreeBSD and provides versioning info which we want for
     # installed packages
diff --git a/share/functions/__fish_print_port_packages.fish b/share/functions/__fish_print_port_packages.fish
index 440901d4e..cdf9aaf8e 100644
--- a/share/functions/__fish_print_port_packages.fish
+++ b/share/functions/__fish_print_port_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_port_packages
     type -q -f port || return 1
 
diff --git a/share/functions/__fish_print_portage_available_pkgs.fish b/share/functions/__fish_print_portage_available_pkgs.fish
index f4bf25c39..94e1b8172 100644
--- a/share/functions/__fish_print_portage_available_pkgs.fish
+++ b/share/functions/__fish_print_portage_available_pkgs.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_portage_available_pkgs --description 'Print all available packages'
     set -l paths (__fish_print_portage_repository_paths)
     set -q paths[1]
diff --git a/share/functions/__fish_print_portage_installed_pkgs.fish b/share/functions/__fish_print_portage_installed_pkgs.fish
index a776d9e51..1e04c31bb 100644
--- a/share/functions/__fish_print_portage_installed_pkgs.fish
+++ b/share/functions/__fish_print_portage_installed_pkgs.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_portage_installed_pkgs --description 'Print all installed packages (non-deduplicated)'
     find /var/db/pkg -mindepth 2 -maxdepth 2 -type d -printf '%P\n' 2>/dev/null | string replace -r -- '-[0-9][0-9.]*.*$' ''
 end
diff --git a/share/functions/__fish_print_portage_packages.fish b/share/functions/__fish_print_portage_packages.fish
index 5eae83ff4..cb699f883 100644
--- a/share/functions/__fish_print_portage_packages.fish
+++ b/share/functions/__fish_print_portage_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_portage_packages
     # This completes the package name from the portage tree.
     # True for installing new packages. Function for printing
diff --git a/share/functions/__fish_print_portage_repository_paths.fish b/share/functions/__fish_print_portage_repository_paths.fish
index dd3c6d020..7eab886b2 100644
--- a/share/functions/__fish_print_portage_repository_paths.fish
+++ b/share/functions/__fish_print_portage_repository_paths.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_portage_repository_paths --description 'Print the paths of all configured repositories'
     set -l a /etc/portage/repos.conf
     set -l b
diff --git a/share/functions/__fish_print_rpm_packages.fish b/share/functions/__fish_print_rpm_packages.fish
index d27c22143..2154416f7 100644
--- a/share/functions/__fish_print_rpm_packages.fish
+++ b/share/functions/__fish_print_rpm_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_rpm_packages
     type -q -f rpm /usr/share/yum-cli/completion-helper.py || return 1
 
diff --git a/share/functions/__fish_print_service_names.fish b/share/functions/__fish_print_service_names.fish
index 134dc0b93..57ff54d6b 100644
--- a/share/functions/__fish_print_service_names.fish
+++ b/share/functions/__fish_print_service_names.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_service_names -d 'All services known to the system'
     if test -d /run/systemd/system # Systemd systems
         # For the `service` command, this needs to be without the type suffix
diff --git a/share/functions/__fish_print_svn_rev.fish b/share/functions/__fish_print_svn_rev.fish
index 6a7d567cb..81c6648a6 100644
--- a/share/functions/__fish_print_svn_rev.fish
+++ b/share/functions/__fish_print_svn_rev.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_svn_rev --description 'Print svn revisions'
     printf '%s' (svnversion | sed 's=[^0-9:]*==g')
 end
diff --git a/share/functions/__fish_print_users.fish b/share/functions/__fish_print_users.fish
index 200cd5a8e..610dc5573 100644
--- a/share/functions/__fish_print_users.fish
+++ b/share/functions/__fish_print_users.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # This should be used where you want user names without a description. If you also want
 # a description, such as when getting a list of users for a completion, you probably want
 # __fish_complete_users.
diff --git a/share/functions/__fish_print_windows_drives.fish b/share/functions/__fish_print_windows_drives.fish
index 0d92b4560..b5b68b95f 100644
--- a/share/functions/__fish_print_windows_drives.fish
+++ b/share/functions/__fish_print_windows_drives.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_windows_drives --description 'Print Windows drives'
     wmic logicaldisk get name | tail +2
 end
diff --git a/share/functions/__fish_print_windows_users.fish b/share/functions/__fish_print_windows_users.fish
index 8f91769b4..4bdcb2698 100644
--- a/share/functions/__fish_print_windows_users.fish
+++ b/share/functions/__fish_print_windows_users.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_windows_users --description 'Print Windows user names'
     wmic useraccount get name | tail +2
 end
diff --git a/share/functions/__fish_print_xbps_packages.fish b/share/functions/__fish_print_xbps_packages.fish
index ee1ac21ab..324d70993 100644
--- a/share/functions/__fish_print_xbps_packages.fish
+++ b/share/functions/__fish_print_xbps_packages.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_xbps_packages
     # Caches for 5 minutes
     type -q -f xbps-query || return 1
diff --git a/share/functions/__fish_print_xdg_applications_directories.fish b/share/functions/__fish_print_xdg_applications_directories.fish
index d7a71532c..6ff68b285 100644
--- a/share/functions/__fish_print_xdg_applications_directories.fish
+++ b/share/functions/__fish_print_xdg_applications_directories.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_xdg_applications_directories --description 'Print directories where desktop files are stored'
     set -l data_home $XDG_DATA_HOME
     if test -z "$data_home"
diff --git a/share/functions/__fish_print_xdg_mimetypes.fish b/share/functions/__fish_print_xdg_mimetypes.fish
index 047f2cea4..1eadb73fb 100644
--- a/share/functions/__fish_print_xdg_mimetypes.fish
+++ b/share/functions/__fish_print_xdg_mimetypes.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_xdg_mimetypes --description 'Print XDG mime types'
     set -l files (__fish_print_xdg_applications_directories)/mimeinfo.cache
     # If we have no file, don't run `cat` without arguments!
diff --git a/share/functions/__fish_print_xwindows.fish b/share/functions/__fish_print_xwindows.fish
index ab5a4140b..238219136 100644
--- a/share/functions/__fish_print_xwindows.fish
+++ b/share/functions/__fish_print_xwindows.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_xwindows --description 'Print X windows'
     xwininfo -root -children | sed '/^\s\+0x/!d; /(has no name)/d; s/^\s*\(\S\+\)\s\+"\(.\+\)":\s\+(\(.*\)).*$/\1\t\2 (\3)/'
 end
diff --git a/share/functions/__fish_print_zfs_snapshots.fish b/share/functions/__fish_print_zfs_snapshots.fish
index 8d0cbf0d8..e7b8b9561 100644
--- a/share/functions/__fish_print_zfs_snapshots.fish
+++ b/share/functions/__fish_print_zfs_snapshots.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_print_zfs_snapshots -d "Lists ZFS snapshots"
     set fast_results (zfs list -o name -H)
     printf "%s\n" $fast_results
diff --git a/share/functions/__fish_protontricks_complete_appid.fish b/share/functions/__fish_protontricks_complete_appid.fish
index 504854065..3a8125b67 100644
--- a/share/functions/__fish_protontricks_complete_appid.fish
+++ b/share/functions/__fish_protontricks_complete_appid.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_protontricks_complete_appid
     protontricks -l |
         string match --regex '.*\(\d+\)' |
diff --git a/share/functions/__fish_ps.fish b/share/functions/__fish_ps.fish
index a59b937e4..fb265afe9 100644
--- a/share/functions/__fish_ps.fish
+++ b/share/functions/__fish_ps.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_ps
     switch (command -s ps | path resolve | path basename)
         case busybox
diff --git a/share/functions/__fish_reg__complete_keys.fish b/share/functions/__fish_reg__complete_keys.fish
index e818a2e33..8ee1f703d 100644
--- a/share/functions/__fish_reg__complete_keys.fish
+++ b/share/functions/__fish_reg__complete_keys.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_reg__complete_keys
     set -l current_token (commandline -tc | string unescape)
 
diff --git a/share/functions/__fish_seen_argument.fish b/share/functions/__fish_seen_argument.fish
index 3153f4f00..d2939e677 100644
--- a/share/functions/__fish_seen_argument.fish
+++ b/share/functions/__fish_seen_argument.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_seen_argument --description 'Check whether argument is used'
     argparse --move-unknown 's/short=+&' 'o/old=+&' 'l/long=+&' 'w/windows=+&' -- $argv
 
diff --git a/share/functions/__fish_seen_subcommand_from.fish b/share/functions/__fish_seen_subcommand_from.fish
index 806f114a1..12f11a7e0 100644
--- a/share/functions/__fish_seen_subcommand_from.fish
+++ b/share/functions/__fish_seen_subcommand_from.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+
 #
 # Test to see if we've seen a subcommand from a list.
 # This logic may seem backwards, but the commandline will often be much shorter
diff --git a/share/functions/__fish_set_locale.fish b/share/functions/__fish_set_locale.fish
index dec2919ca..47d1621fd 100644
--- a/share/functions/__fish_set_locale.fish
+++ b/share/functions/__fish_set_locale.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+
 # Try to set the locale from the system configuration if we did not inherit any. One case where this
 # can happen is a linux with systemd where the user logs in via getty (e.g., on the system console).
 # See https://github.com/fish-shell/fish-shell/issues/3092. This isn't actually our job, so there's
diff --git a/share/functions/__fish_shared_key_bindings.fish b/share/functions/__fish_shared_key_bindings.fish
index 70130349d..99db9617a 100644
--- a/share/functions/__fish_shared_key_bindings.fish
+++ b/share/functions/__fish_shared_key_bindings.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_shared_key_bindings -d "Bindings shared between emacs and vi mode"
     # These are some bindings that are supposed to be shared between vi mode and default mode.
     # They are supposed to be unrelated to text-editing (or movement).
diff --git a/share/functions/__fish_should_complete_switches.fish b/share/functions/__fish_should_complete_switches.fish
index 81a71926a..354c34d1e 100644
--- a/share/functions/__fish_should_complete_switches.fish
+++ b/share/functions/__fish_should_complete_switches.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 # Returns whether we *should* complete a -s or --long argument.
 # The preference is NOT to do so, i.e. prefer subcommands over switches.
 function __fish_should_complete_switches
diff --git a/share/functions/__fish_systemctl.fish b/share/functions/__fish_systemctl.fish
index 2e9e52d7a..8a40c8722 100644
--- a/share/functions/__fish_systemctl.fish
+++ b/share/functions/__fish_systemctl.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_systemctl --description 'Call systemctl with some options from the current commandline'
     # We don't want to complete with ANSI color codes
     set -lu SYSTEMD_COLORS
diff --git a/share/functions/__fish_systemctl_services.fish b/share/functions/__fish_systemctl_services.fish
index 8e956f12b..a7e4ce887 100644
--- a/share/functions/__fish_systemctl_services.fish
+++ b/share/functions/__fish_systemctl_services.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_systemctl_services
     # We don't want to complete with ANSI color codes
     set -lu SYSTEMD_COLORS
diff --git a/share/functions/__fish_systemd_machine_images.fish b/share/functions/__fish_systemd_machine_images.fish
index 0b40434a6..e607edd10 100644
--- a/share/functions/__fish_systemd_machine_images.fish
+++ b/share/functions/__fish_systemd_machine_images.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # Like for running machines, I'm assuming machinectl doesn't allow spaces in image names
 # This does not include the special image ".host" since it isn't valid for most operations
 function __fish_systemd_machine_images
diff --git a/share/functions/__fish_systemd_machines.fish b/share/functions/__fish_systemd_machines.fish
index 09f49dc08..6b17aaf1d 100644
--- a/share/functions/__fish_systemd_machines.fish
+++ b/share/functions/__fish_systemd_machines.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+#
 # It seems machinectl will eliminate spaces from machine names so we don't need to handle that
 function __fish_systemd_machines
     # We don't want to complete with ANSI color codes
diff --git a/share/functions/__fish_tokenizer_state.fish b/share/functions/__fish_tokenizer_state.fish
index eee33eea2..b6cb9ee1f 100644
--- a/share/functions/__fish_tokenizer_state.fish
+++ b/share/functions/__fish_tokenizer_state.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_tokenizer_state --description "Print the state of the tokenizer at the end of the given string"
     # Go through the token char-by-char in a state machine.
     # The states are:
diff --git a/share/functions/__fish_uname.fish b/share/functions/__fish_uname.fish
index 895c89e6e..b78fc694d 100644
--- a/share/functions/__fish_uname.fish
+++ b/share/functions/__fish_uname.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_uname
     if not set -q __fish_uname
         set -g __fish_uname (uname)
diff --git a/share/functions/__fish_use_subcommand.fish b/share/functions/__fish_use_subcommand.fish
index f183a5980..b1ee1f886 100644
--- a/share/functions/__fish_use_subcommand.fish
+++ b/share/functions/__fish_use_subcommand.fish
@@ -1,3 +1,4 @@
+# localization: skip(private)
 function __fish_use_subcommand -d "Test if a non-switch argument has been given in the current commandline"
     set -l cmd (commandline -pxc)
     set -e cmd[1]
diff --git a/share/functions/__fish_whatis.fish b/share/functions/__fish_whatis.fish
index e490155f0..506ac253e 100644
--- a/share/functions/__fish_whatis.fish
+++ b/share/functions/__fish_whatis.fish
@@ -1,3 +1,5 @@
+# localization: skip(private)
+
 # uses `whatis` if available to describe a command
 
 function __fish_whatis
diff --git a/share/functions/__terlar_git_prompt.fish b/share/functions/__terlar_git_prompt.fish
index 1cec1eafc..f4df958f7 100644
--- a/share/functions/__terlar_git_prompt.fish
+++ b/share/functions/__terlar_git_prompt.fish
@@ -1,4 +1,5 @@
-function __terlar_git_prompt --description 'Write out the git prompt'
+# localization: skip(private)
+function __terlar_git_prompt
     set -q __fish_git_prompt_showdirtystate
     or set -g __fish_git_prompt_showdirtystate 1
     set -q __fish_git_prompt_showuntrackedfiles