Ojibwe is the correct spelling.

This commit is contained in:
William Kendrick 2008-04-29 16:37:23 +00:00
parent 7cc72c1b37
commit 6c05efb4d6
6 changed files with 34 additions and 31 deletions

View file

@ -7,7 +7,7 @@ bill@newbreedsoftware.com
http://www.tuxpaint.org/
June 17, 2002 - April 19, 2008
June 17, 2002 - April 28, 2008
$Id$
@ -411,7 +411,7 @@ $Id$
Yannig MARCHEGAY (Kokoyaya), Canonical Ltd, and Rosetta Contributors
via Caroline Ford <caroline.ford.work@googlemail.com>
* Ojibway
* Ojibwe
Ed Montgomery <edm@rocketmail.com>
* Polish

View file

@ -96,6 +96,9 @@ $Id$
to determine bitdepth. (Fixes bug where some Magic tools, e.g., Grass,
didn't work right on video depths other than 32bpp.)
* "Ojibwe" is the proper spelling of the language, accepting that as
a "--lang" option, too.
* New Starters:
-------------
* Spirograph

View file

@ -7,10 +7,12 @@
# Bill Kendrick
# bill@newbreedsoftware.com
#
# Sept. 4, 2005 - March 8, 2006
# Sept. 4, 2005 - March 28, 2008
# $Id$
LINKS:=links -dump -no-numbering -no-references
# Bah, "-no-numbering" and "-no-references" went away recently!? -bjk 2008.04.28
LINKS_OPTIONS:=-dump
LINKS:=links $(LINKS_OPTIONS)
.PHONY: all
all: README.txt OPTIONS.txt FAQ.txt EXTENDING.txt ADVANCED-STAMPS-HOWTO.txt

View file

@ -1,7 +1,7 @@
Tux Paint
version 0.9.20
Options Documentation
Options Documentation
Copyright 2002-2008 by Bill Kendrick and others
New Breed Software
@ -11,7 +11,7 @@
April 5, 2008
--------------------------------------------------------------------------
----------------------------------------------------------------------
Tux Paint Config.
@ -20,7 +20,7 @@
install and use this tool, or want a better understanding of the
available options, please continue reading.
--------------------------------------------------------------------------
----------------------------------------------------------------------
Configuration File
@ -60,7 +60,7 @@ Windows Users
as Plain Text, and make sure the filename doesn't have ".txt" at the
end...
--------------------------------------------------------------------------
----------------------------------------------------------------------
Available Options
@ -87,7 +87,6 @@ Windows Users
at least 480 tall.
Some examples:
* 640x480
* 1024x768
* 768x1024
@ -207,7 +206,7 @@ Windows Users
papersize=PAPERSIZE
(Platforms that use Tux Paint's internal PostScript generator --
(Platforms that use Tux Paint's internal PostScript generator -
not Windows, Mac OS X or BeOS.)
Tell Tux Paint what size PostScript to generate. If none is
@ -359,17 +358,16 @@ Windows Users
opens pictures.
If you do not override it, the default location is:
* Linux & Unix -- Under a hidden directory named ".tuxpaint"
* Linux & Unix - Under a hidden directory named ".tuxpaint"
in your home directory (aka "~" or "$HOME")
Example: "/home/username/.tuxpaint/saved/"
* Windows -- Inside a folder named "TuxPaint" in your
* Windows - Inside a folder named "TuxPaint" in your
"Application Data" folder.
Example:
"C:\Documents and Settings\Username\Application Data\TuxPaint\saved\"
* Mac OS X -- Inside a folder named "TuxPaint" in your
* Mac OS X - Inside a folder named "TuxPaint" in your
"Application Support" folder.
Example:
"/Users/Username/Library/Application Support/TuxPaint/saved/"
@ -396,17 +394,16 @@ Windows Users
directory.
If you do not override it, the default location is:
* Linux & Unix -- Under a hidden directory named ".tuxpaint"
* Linux & Unix - Under a hidden directory named ".tuxpaint"
in your home directory (aka "~" or "$HOME")
Example: "/home/username/.tuxpaint/brushes/"
* Windows -- Inside a folder named "TuxPaint" in your
* Windows - Inside a folder named "TuxPaint" in your
"Application Data" folder.
Example:
"C:\Documents and Settings\Username\Application Data\TuxPaint\brushes\"
* Mac OS X -- Inside a folder named "TuxPaint" in your
* Mac OS X - Inside a folder named "TuxPaint" in your
"Application Support" folder.
Example:
"/Users/Username/Library/Application Support/TuxPaint/brushes/"
@ -592,7 +589,7 @@ Windows Users
|--------------------+---------------------+---------------|
|occitan | | |
|--------------------+---------------------+---------------|
|ojibway | | |
|ojibwe |ojibway | |
|--------------------+---------------------+---------------|
|polish |polski | |
|--------------------+---------------------+---------------|
@ -651,7 +648,7 @@ Windows Users
|zapoteco | | |
+----------------------------------------------------------+
--------------------------------------------------------------------------
----------------------------------------------------------------------
Overriding System Config. Options using .tuxpaintrc
@ -672,7 +669,7 @@ Windows Users
print=yes
mixedcase=yes
--------------------------------------------------------------------------
----------------------------------------------------------------------
Command-Line Options
@ -776,7 +773,7 @@ Windows Users
Only your own configuration file, "~/.tuxpaintrc", if it
exists, will be used.
--------------------------------------------------------------------------
----------------------------------------------------------------------
Command-Line Informational Options
@ -802,7 +799,7 @@ Command-Line Informational Options
--lang help
Display a list of available languages in Tux Paint.
--------------------------------------------------------------------------
----------------------------------------------------------------------
Choosing a Different Language
@ -932,7 +929,7 @@ Available Languages
|---------+---------------------+-----------------+------------------|
|oc_FR | |Occitan | |
|---------+---------------------+-----------------+------------------|
|oj_CA | |Ojibway | |
|oj_CA | |Ojibwe |Ojibway |
|---------+---------------------+-----------------+------------------|
|pl_PL |Polski |Polish | |
|---------+---------------------+-----------------+------------------|
@ -1039,7 +1036,7 @@ Setting Your Environment's Locale
setenv LANG es_ES ; \
tuxpaint
--------------------------------------------------------------------------
----------------------------------------------------------------------
Windows Users
@ -1116,4 +1113,4 @@ Setting Your Environment's Locale
Under Unix and Linux, you can use the Makefile that comes with the
font to install the font in the appropriate location.
--------------------------------------------------------------------------
----------------------------------------------------------------------

View file

@ -862,9 +862,9 @@ New Breed Software</p>
<td>&nbsp;</td>
</tr>
<tr>
<td><code>ojibwe</code></td>
<td><code>ojibway</code></td>
<td>&nbsp;</td>
<td>&nbsp;</td>
</tr>
<tr>
<td><code>polish</code></td>
@ -1553,8 +1553,8 @@ New Breed Software</p>
<tr>
<td><code>oj_CA</code></td>
<td>&nbsp;</td>
<td>Ojibwe</td>
<td>Ojibway</td>
<td>&nbsp;</td>
</tr>
<tr>
<td><code>pl_PL</code></td>

View file

@ -25,7 +25,7 @@
$Id$
June 14, 2002 - April 5, 2008
June 14, 2002 - April 28, 2008
*/
#include <stdio.h>
@ -284,7 +284,8 @@ const language_to_locale_struct language_to_locale_array[] = {
{"norsk", "nn_NO.UTF-8"},
{"ndebele", "nr_ZA.UTF-8"},
{"occitan", "oc_FR.UTF-8"},
{"ojibway", "oj_CA.UTF-8"},
{"ojibwe", "oj_CA.UTF-8"}, // Proper spelling
{"ojibway", "oj_CA.UTF-8"}, // For compatibility
{"polish", "pl_PL.UTF-8"},
{"polski", "pl_PL.UTF-8"},
{"brazilian-portuguese", "pt_BR.UTF-8"},
@ -521,7 +522,7 @@ void show_lang_usage(FILE * f, const char *const prg)
/* nr */ " ndebele\n"
/* nn */ " norwegian nynorsk norsk\n"
/* oc */ " occitan\n"
/* oj */ " ojibway\n"
/* oj */ " ojibwe ojibway\n"
/* pl */ " polish polski\n"
/* pt_PT */ " portuguese portugues\n"
/* ro */ " romanian\n"