Merge branch 'pw/maint-p4-rcs-expansion-newline' into maint

diff --git a/git-gui/po/nb.po b/git-gui/po/nb.po
index 6de93c28c2e2b7cb0413521c987161c4a4fcb59d..d66aa5026391fbba38ff8b02c50c363965927131 100644 (file)
--- a/git-gui/po/nb.po
+++ b/git-gui/po/nb.po
@@ -2286,7 +2286,7 @@ msgid "Generation failed."
 msgstr "Generering feilet."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "Generering vellykket, men ingen nøkler er funnet."
 
 #: lib/sshkey.tcl:121