diff --git a/share/completions/bundle.fish b/share/completions/bundle.fish
index 8499d03b9..f3ac35228 100644
--- a/share/completions/bundle.fish
+++ b/share/completions/bundle.fish
@@ -137,7 +137,7 @@ complete -f -n '__fish_bundle_no_command' -c bundle -a 'viz' --description 'Gene
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s f -l file --description 'The name to use for the generated file (see format option)'
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s v -l version --description 'Show each gem version'
 complete -f -n '__fish_bundle_using_command viz' -c bundle -s r -l requirements --description 'Show the version of each required dependency'
-complete -f -n '__fish_bundle_using_command viz' -c bundle -s F -l format --description 'Output a specific format (png, jpg, svg, dot, ...)'
+complete -f -n '__fish_bundle_using_command viz' -c bundle -s F -l format --description 'Output a specific format (png, jpg, svg, dot, …)'
 
 # Init
 complete -f -n '__fish_bundle_no_command' -c bundle -a 'init' --description 'Generate a simple Gemfile, placed in the current directory'
diff --git a/share/completions/cvs.fish b/share/completions/cvs.fish
index a2a1fb903..2ceadcbe0 100644
--- a/share/completions/cvs.fish
+++ b/share/completions/cvs.fish
@@ -347,7 +347,7 @@ complete -c cvs -n 'contains \'rannotate\' (commandline -poc)' -s D -x --descrip
 # Completions for the 'rdiff' subcommand
 #
 
-complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s r -x --description 'Date [-r rev2 | -D date2] modules...'
+complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s r -x --description 'Date [-r rev2 | -D date2] modules…'
 complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s f --description 'Force a head revision match if tag/date not found.'
 complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s l --description 'Local directory only, not recursive'
 complete -c cvs -n 'contains \'rdiff\' (commandline -poc)' -s R --description 'Process directories recursively.'
diff --git a/share/completions/effectv.fish b/share/completions/effectv.fish
index 971894c36..f0ad760ef 100644
--- a/share/completions/effectv.fish
+++ b/share/completions/effectv.fish
@@ -37,7 +37,7 @@ complete -c effectv -f -a "BrokenTV" -d "Simulates broken TV"
 complete -c effectv -f -a "WarholTV" -d "Homage to Andy Warhol"
 complete -c effectv -f -a "MatrixTV" -d "A Matrix like effect"
 complete -c effectv -f -a "PUPTV" -d "Comes from \"Partial UPdate\", certain part of image is updated at a frame"
-complete -c effectv -f -a "ChameleonTV" -d "Vanishing into the wall..."
+complete -c effectv -f -a "ChameleonTV" -d "Vanishing into the wall…"
 
 complete -c effectv -o help -d "show usage information"
 complete -c effectv -o device -r -d "[FILE] use device FILE for video4linux (default is /dev/video0)"
diff --git a/share/completions/git.fish b/share/completions/git.fish
index 4e9c9e2df..2041ad11d 100644
--- a/share/completions/git.fish
+++ b/share/completions/git.fish
@@ -5,9 +5,9 @@ function __fish_git_commits
     # Complete commits with their subject line as the description
     # This allows filtering by subject with the new pager!
     # Because even subject lines can be quite long,
-    # trim them (abbrev'd hash+tab+subject) to 70 characters
+    # trim them (abbrev'd hash+tab+subject) to 73 characters
     command git log --pretty=tformat:"%h"\t"%s" --all ^/dev/null \
-    | string replace -r '(.{70}).+' '$1...'
+    | string replace -r '(.{73}).+' '$1…'
 end
 
 function __fish_git_branches
diff --git a/share/completions/mvn.fish b/share/completions/mvn.fish
index 4f3c5331f..4fcc0646c 100644
--- a/share/completions/mvn.fish
+++ b/share/completions/mvn.fish
@@ -709,7 +709,7 @@ complete -c mvn -a "appengine:backends_rollback" -d "Roll back a previously in-p
 complete -c mvn -a "appengine:start_module_version" -d "Start the specified module version."
 complete -c mvn -a "appengine:migrate_traffic" -d "Change the default version, but more gently than set_default_version."
 complete -c mvn -a "appengine:update_dispatch" -d "Update application dispatch.xml."
-complete -c mvn -a "appengine:endpoints_get_client_lib" -d "App Engine endpoints get-client-lib ... command."
+complete -c mvn -a "appengine:endpoints_get_client_lib" -d "App Engine endpoints get-client-lib … command."
 complete -c mvn -a "appengine:debug" -d "Debug the specified VM Runtime instance."
 complete -c mvn -a "appengine:set_default_version" -d "Set the default serving version."
 complete -c mvn -a "appengine:enhance" -d "Runs the datanucleus enhancer."
diff --git a/share/completions/patch.fish b/share/completions/patch.fish
index 0bf5ab047..a70869666 100644
--- a/share/completions/patch.fish
+++ b/share/completions/patch.fish
@@ -9,7 +9,7 @@ complete -c patch -s B -l prefix -r -f --description "Prefix pref to a file name
 complete -c patch -l binary --description "Read and write all files in binary mode"
 complete -c patch -s c -l context --description "Interpret the patch file as a ordinary context diff"
 complete -c patch -s d -l directory -r -f --description "Change to the directory dir immediately"
-complete -c patch -s D -l ifdef -r -f --description "Use the #ifdef ... #endif construct to mark changes"
+complete -c patch -s D -l ifdef -r -f --description "Use the #ifdef…#endif construct to mark changes"
 complete -c patch -l dry-run --description "Print the results of applying the patches without actually changing any files"
 complete -c patch -s e -l ed --description "Interpret the patch file as an ed script"
 complete -c patch -s E -l remove-empty-files --description "Remove output files that are empty after the patches have been applied"
diff --git a/share/completions/scanimage.fish b/share/completions/scanimage.fish
index 63a9ad8df..cb65d650a 100644
--- a/share/completions/scanimage.fish
+++ b/share/completions/scanimage.fish
@@ -9,7 +9,7 @@ complete -c scanimage -l color -d 'Sets the picture\'s color [0..255]: 133'
 complete -c scanimage -l contrast -d 'Controls the contrast of the acquired image [0..255]: 128'
 complete -c scanimage -l white-level -d 'Selects what radiance level should be considered "white" [0..255]: 124'
 complete -c scanimage -l custom-gamma -d 'Use custom gamma gable'
-complete -c scanimage -l gamma-table -r -d 'Gamma-correction table [0..255,...]'
+complete -c scanimage -l gamma-table -r -d 'Gamma-correction table [0..255, …]'
 complete -c scanimage -l mode -xa 'Lineart Gray Color' -d 'Scan mode'
 
 complete -c scanimage -s d -l device-name -d 'Device name to use' -xa '(scanimage -f "%d%n")'
diff --git a/share/functions/__fish_git_prompt.fish b/share/functions/__fish_git_prompt.fish
index 9591ef386..ae5f54e65 100644
--- a/share/functions/__fish_git_prompt.fish
+++ b/share/functions/__fish_git_prompt.fish
@@ -179,7 +179,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
     set -l verbose
     set -l name
 
-    # Default to informative if show_informative_status is set
+    # Default to informative if __fish_git_prompt_show_informative_status is set
     if test -n "$__fish_git_prompt_show_informative_status"
         set informative 1
     end
@@ -232,7 +232,7 @@ function __fish_git_prompt_show_upstream --description "Helper function for __fi
         case git
             set upstream '@{upstream}'
         case svn\*
-            # get the upstream from the 'git-svn-id: ...' in a commit message
+            # get the upstream from the 'git-svn-id: …' in a commit message
             # (git-svn uses essentially the same procedure internally)
             set -l svn_upstream (git log --first-parent -1 --grep="^git-svn-id: \($svn_url_pattern\)" ^/dev/null)
             if test (count $svn_upstream) -ne 0
@@ -581,7 +581,7 @@ function __fish_git_prompt_operation_branch_bare --description "__fish_git_promp
                 # Shorten the sha ourselves to 8 characters - this should be good for most repositories,
                 # and even for large ones it should be good for most commits
                 if set -q sha
-                    set branch (string match -r '^.{8}' -- $sha)...
+                    set branch (string match -r '^.{8}' -- $sha)…
                 else
                     set branch unknown
                 end
diff --git a/share/functions/__fish_move_last.fish b/share/functions/__fish_move_last.fish
index c1d060439..4646561f8 100644
--- a/share/functions/__fish_move_last.fish
+++ b/share/functions/__fish_move_last.fish
@@ -6,7 +6,7 @@ function __fish_move_last -d "Move the last element of a directory history from
 
 	if test $size_src = 0
 		# Cannot make this step
-		printf (_ "Hit end of history...\n")
+		printf (_ "Hit end of history…\n")
 		return 1
 	end
 
diff --git a/share/functions/popd.fish b/share/functions/popd.fish
index 94114752b..44a19593d 100644
--- a/share/functions/popd.fish
+++ b/share/functions/popd.fish
@@ -1,5 +1,5 @@
 
-function popd --description "Pop dir from stack"
+function popd --description "Pop directory from the stack and cd to it"
 	if count $argv >/dev/null
 		switch $argv[1]
 			case -h --h --he --hel --help
@@ -11,10 +11,9 @@ function popd --description "Pop dir from stack"
 	if test $dirstack[1]
 		cd $dirstack[1]
 	else
-		printf (_ "%s: Directory stack is empty...\n") popd
+		printf (_ "%s: Directory stack is empty…\n") popd 1>&2
 		return 1
 	end
 
 	set -e dirstack[1]
-
 end