diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-02-29 21:22:52 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-02-29 21:22:52 -0800 |
| commit | dfb9a34ababeee98a9f241636c1fe6e98c754f7a (patch) | |
| tree | e2a8f43ec4ad0220a6f3511e75d0c7ae8c960e6a /git-gui/po/git-gui.pot | |
| parent | df4a824341f34b1d2d890ce3e9dd7f6df6475953 (diff) | |
| parent | f49b6c10b7ded8c46df8ad52621faf3a04a2aa72 (diff) | |
| download | git-dfb9a34ababeee98a9f241636c1fe6e98c754f7a.tar.gz | |
Merge branch 'master' of git://repo.or.cz/git-gui
* 'master' of git://repo.or.cz/git-gui:
git-gui: fix typo in lib/spellcheck.tcl
git-gui: Shorten Aspell version strings to just Aspell version number
git-gui: Gracefully display non-aspell version errors to users
git-gui: Catch and display aspell startup failures to the user
git-gui: Only bind the spellcheck popup suggestion hook once
git-gui: Remove explicit references to 'aspell' in message strings
git-gui: Ensure all spellchecker 'class' variables are initialized
git-gui: Update German translation.
git-gui: (i18n) Add newly added translation strings to template.
Diffstat (limited to 'git-gui/po/git-gui.pot')
| -rw-r--r-- | git-gui/po/git-gui.pot | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/git-gui/po/git-gui.pot b/git-gui/po/git-gui.pot index 3f139da6c7..2e332849fb 100644 --- a/git-gui/po/git-gui.pot +++ b/git-gui/po/git-gui.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2008-02-02 10:14+0100\n" +"POT-Creation-Date: 2008-02-16 21:24+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -1474,10 +1474,10 @@ msgstr "" #: lib/merge.tcl:119 #, tcl-format -msgid "Merging %s and %s" +msgid "Merging %s and %s..." msgstr "" -#: lib/merge.tcl:131 +#: lib/merge.tcl:130 msgid "Merge completed successfully." msgstr "" @@ -1592,7 +1592,11 @@ msgstr "" msgid "New Branch Name Template" msgstr "" -#: lib/option.tcl:176 +#: lib/option.tcl:191 +msgid "Spelling Dictionary:" +msgstr "" + +#: lib/option.tcl:215 msgid "Change Font" msgstr "" @@ -1709,6 +1713,26 @@ msgstr "" msgid "Cannot write icon:" msgstr "" +#: lib/spellcheck.tcl:37 +msgid "Not connected to aspell" +msgstr "" + +#: lib/spellcheck.tcl:41 +msgid "Unrecognized aspell version" +msgstr "" + +#: lib/spellcheck.tcl:135 +msgid "No Suggestions" +msgstr "" + +#: lib/spellcheck.tcl:336 +msgid "Unexpected EOF from aspell" +msgstr "" + +#: lib/spellcheck.tcl:340 +msgid "Spell Checker Failed" +msgstr "" + #: lib/status_bar.tcl:83 #, tcl-format msgid "%s ... %*i of %*i %s (%3i%%)" |