Merge lp:~bkerensa/ubuntu/precise/git/fix-for-879427 into lp:ubuntu/precise/git

[Benjamin Kerensa]

[Benjamin Kerensa (bkerensa)]

Fixed Typo in multiple files.

[Anders Kaseorg (andersk)]

Can you please submit your patch upstream by following the directions in Documentation/SubmittingPatches? Then the fix will make its way into Ubuntu after upstream releases a new version.

(It would be inconvenient for Ubuntu to take the patch directly because we would stop getting automatic updates from Debian, and manual work would be required to merge each new version—that’s not worth it for a simple spelling fix.)

[Benjamin Kerensa (bkerensa)]

I submitted this to debian and they requested I submit it upstream of them to git.

http://article.gmane.org/gmane.comp.version-control.git/192299

A patch is available if the git folks apply it.

[Michael Terry (mterry)]

(Marked this a work-in-progress so it stops showing up in the Ubuntu review queue)

Unmerged revisions

24. By Benjamin Kerensa on 2012-03-05

* Fixed Typo (LP: #879427)
*

=== modified file 'debian/changelog'
--- debian/changelog	2012-01-27 21:23:27 +0000
+++ debian/changelog	2012-03-05 00:50:22 +0000
@@ -1,3 +1,15 @@
+git (1:1.7.9-1ubuntu2) precise; urgency=low
+
+  * Fixed Typo (LP: #879427)
+
+ -- Benjamin Kerensa <[e-mail]>  Sun, 04 Mar 2012 16:41:53 -0800
+
+git (1:1.7.9-1ubuntu1) precise; urgency=low
+
+  * 
+
+ -- Benjamin Kerensa <[e-mail]>  Sun, 04 Mar 2012 16:41:13 -0800
+
 git (1:1.7.9-1) unstable; urgency=low
 
   * merge branch debian-experimental.

=== modified file 'git-gui/po/de.po'
--- git-gui/po/de.po	2010-04-03 15:07:19 +0000
+++ git-gui/po/de.po	2012-03-05 00:50:22 +0000
@@ -2397,7 +2397,7 @@
 msgstr "Schlüsselerzeugung fehlgeschlagen."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "Schlüsselerzeugung erfolgreich, aber keine Schlüssel gefunden."
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/fr.po'
--- git-gui/po/fr.po	2010-04-03 15:07:19 +0000
+++ git-gui/po/fr.po	2012-03-05 00:50:22 +0000
@@ -2399,7 +2399,7 @@
 msgstr "La génération a échoué."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "La génération a réussi, mais aucune clé n'a été trouvée."
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/git-gui.pot'
--- git-gui/po/git-gui.pot	2010-04-03 15:07:19 +0000
+++ git-gui/po/git-gui.pot	2012-03-05 00:50:22 +0000
@@ -2203,7 +2203,7 @@
 msgstr ""
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr ""
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/hu.po'
--- git-gui/po/hu.po	2010-04-03 15:07:19 +0000
+++ git-gui/po/hu.po	2012-03-05 00:50:22 +0000
@@ -2354,7 +2354,7 @@
 msgstr "A generálás nem sikerült."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "A generálás sikeres, de egy kulcs se található."
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/it.po'
--- git-gui/po/it.po	2010-04-03 15:07:19 +0000
+++ git-gui/po/it.po	2012-03-05 00:50:22 +0000
@@ -2397,7 +2397,7 @@
 msgstr "Errore durante la creazione della chiave."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "La chiave è stata creata con successo, ma non è stata trovata."
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/ja.po'
--- git-gui/po/ja.po	2010-04-03 15:07:19 +0000
+++ git-gui/po/ja.po	2012-03-05 00:50:22 +0000
@@ -2362,7 +2362,7 @@
 msgstr "生成に失敗しました。"
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "生成には成功しましたが、鍵が見つかりません。"
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/nb.po'
--- git-gui/po/nb.po	2010-04-03 15:07:19 +0000
+++ git-gui/po/nb.po	2012-03-05 00:50:22 +0000
@@ -2286,7 +2286,7 @@
 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

=== modified file 'git-gui/po/pt_br.po'
--- git-gui/po/pt_br.po	2011-04-20 07:46:58 +0000
+++ git-gui/po/pt_br.po	2012-03-05 00:50:22 +0000
@@ -2375,7 +2375,7 @@
 msgstr "A geração da chave falhou."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "A geração da chave foi bem-sucedida, mas nenhuma chave foi encontrada."
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/ru.po'
--- git-gui/po/ru.po	2011-04-20 07:46:58 +0000
+++ git-gui/po/ru.po	2012-03-05 00:50:22 +0000
@@ -2370,7 +2370,7 @@
 msgstr "Ключ не создан."
 
 #: lib/sshkey.tcl:118
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "Создание ключа завершилось, но результат не был найден"
 
 #: lib/sshkey.tcl:121

=== modified file 'git-gui/po/sv.po'
--- git-gui/po/sv.po	2011-10-31 09:45:53 +0000
+++ git-gui/po/sv.po	2012-03-05 00:50:22 +0000
@@ -2382,7 +2382,7 @@
 msgstr "Misslyckades med att skapa."
 
 #: lib/sshkey.tcl:120
-msgid "Generation succeded, but no keys found."
+msgid "Generation succeeded, but no keys found."
 msgstr "Lyckades skapa nyckeln, men hittar inte någon nyckel."
 
 #: lib/sshkey.tcl:123