github-mirror/fish-shell
2
0
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2024-11-25 09:39:52 +08:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Solve remaining conflicts sv.po

Browse Source 
Sorry!
This commit is contained in:
Fabian Homborg 2019-12-21 11:07:35 +01:00
parent 126e37ab26
commit f0df211f4c
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
po/sv.po
View File

@ -57676,22 +57676,7 @@ msgstr ""
msgid "Command used to find descriptions for commands" msgid "Command used to find descriptions for commands"
msgstr "" msgstr ""
<<<<<<< HEAD
#: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3 #: /tmp/fish/implicit/share/functions/fish_git_prompt.fish:3
=======
#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:1
#: share/functions/__fish_git_prompt.fish:173
msgid "Helper function for __fish_git_prompt"
msgstr ""
#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:2
#: share/functions/__fish_git_prompt.fish:348
msgid "Prompt function for Git"
msgstr ""
#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:3
#: share/functions/__fish_git_prompt.fish:458
>>>>>>> Remove all fuzzy translations (see also #6418)
msgid "" msgid ""
"fish_git_prompt helper, tells whether or not the current branch has staged " "fish_git_prompt helper, tells whether or not the current branch has staged "
"files" "files"
@ -57715,24 +57700,6 @@ msgstr ""
msgid "fish_git_prompt helper, checks color variables" msgid "fish_git_prompt helper, checks color variables"
msgstr "" msgstr ""
<<<<<<< HEAD
=======
#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:8
#: share/functions/__fish_git_prompt.fish:730
msgid "Event handler, repaints prompt when functionality changes"
msgstr ""
#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:9
#: share/functions/__fish_git_prompt.fish:748
msgid "Event handler, repaints prompt when any color changes"
msgstr ""
#: /tmp/fish/implicit/share/functions/__fish_git_prompt.fish:10
#: share/functions/__fish_git_prompt.fish:768
msgid "Event handler, repaints prompt when any char changes"
msgstr ""
>>>>>>> Remove all fuzzy translations (see also #6418)
#: /tmp/fish/implicit/share/functions/__fish_gnu_complete.fish:1 #: /tmp/fish/implicit/share/functions/__fish_gnu_complete.fish:1
msgid "" msgid ""
"Wrapper for the complete built-in. Skips the long completions on non-GNU " "Wrapper for the complete built-in. Skips the long completions on non-GNU "