notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Ojibwe is the correct spelling.

Browse source
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
Download patch file Download diff file Expand all files Collapse all files

4
docs/AUTHORS.txt
View file

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

3
docs/CHANGES.txt
View file

@ -96,6 +96,9 @@ $Id$
to determine bitdepth. (Fixes bug where some Magic tools, e.g., Grass, to determine bitdepth. (Fixes bug where some Magic tools, e.g., Grass,
didn't work right on video depths other than 32bpp.) 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: * New Starters:
------------- -------------
* Spirograph * Spirograph

6
docs/Makefile
View file

@ -7,10 +7,12 @@
# Bill Kendrick # Bill Kendrick
# bill@newbreedsoftware.com # bill@newbreedsoftware.com
# #
# Sept. 4, 2005 - March 8, 2006 # Sept. 4, 2005 - March 28, 2008
# $Id$ # $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 .PHONY: all
all: README.txt OPTIONS.txt FAQ.txt EXTENDING.txt ADVANCED-STAMPS-HOWTO.txt all: README.txt OPTIONS.txt FAQ.txt EXTENDING.txt ADVANCED-STAMPS-HOWTO.txt

41
docs/OPTIONS.txt
View file

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

4
docs/html/OPTIONS.html
View file

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

7
src/i18n.c
View file

@ -25,7 +25,7 @@
$Id$ $Id$
June 14, 2002 - April 5, 2008 June 14, 2002 - April 28, 2008
*/ */
#include <stdio.h> #include <stdio.h>
@ -284,7 +284,8 @@ const language_to_locale_struct language_to_locale_array[] = {
{"norsk", "nn_NO.UTF-8"}, {"norsk", "nn_NO.UTF-8"},
{"ndebele", "nr_ZA.UTF-8"}, {"ndebele", "nr_ZA.UTF-8"},
{"occitan", "oc_FR.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"}, {"polish", "pl_PL.UTF-8"},
{"polski", "pl_PL.UTF-8"}, {"polski", "pl_PL.UTF-8"},
{"brazilian-portuguese", "pt_BR.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" /* nr */ " ndebele\n"
/* nn */ " norwegian nynorsk norsk\n" /* nn */ " norwegian nynorsk norsk\n"
/* oc */ " occitan\n" /* oc */ " occitan\n"
/* oj */ " ojibway\n" /* oj */ " ojibwe ojibway\n"
/* pl */ " polish polski\n" /* pl */ " polish polski\n"
/* pt_PT */ " portuguese portugues\n" /* pt_PT */ " portuguese portugues\n"
/* ro */ " romanian\n" /* ro */ " romanian\n"