Patches #603
Merge in xonotic/xonotic-data.pk3dir.git: divVerent/typofix
| Status: | Resolved | Start: | 08/25/2011 | |
|---|---|---|---|---|
| Priority: | Normal | Due date: | ||
| Assigned to: |  Samual |
% Done: | 0% |
|
| Category: | - | |||
| Target version: | Xonotic - 0.6 | |||
| Milestones: | ||||
| Votes: | 0 |
Description
Purpose of the branch:
This must be merged after 0.5 release, or we break the translation files.
Repository: xonotic/xonotic-data.pk3dir.git
Commit: 61105a89caa02da1166d554a52b91212729107dc
Branch: divVerent/typofix
Merge commands:
cd data/xonotic-data.pk3dir git checkout master git reset --hard origin/master git pull && git diff '61105a89caa02da1166d554a52b91212729107dc'..'origin/divVerent/typofix' # please check that the diff you just saw did not contain anything complex that # needs a new merge request, and review these changes git merge --no-ff 'origin/divVerent/typofix' # please make sure this merge worked, and if not, fix merge conflicts and git # commit BEFORE the next command # # also, THIS is the point to do final pre-merge testing # # use git reset --hard origin/master to bail out git push && git push --delete origin 'divVerent/typofix'
Diffstat:
qcsrc/client/scoreboard.qc | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
Revision log:
commit 61105a89caa02da1166d554a52b91212729107dc
Author: Rudolf Polzer <divVerent@xonotic.org>
Commit: Rudolf Polzer <divVerent@xonotic.org>
fix a typo
User agreed to the GPLv2+.
Diff:
1 diff --git a/qcsrc/client/scoreboard.qc b/qcsrc/client/scoreboard.qc
2 index 93f8518..a474554 100644
3 --- a/qcsrc/client/scoreboard.qc
4 +++ b/qcsrc/client/scoreboard.qc
5 @@ -240,7 +240,7 @@ void Cmd_HUD_Help(float argc)
6 print(_("^3|---------------------------------------------------------------|\n"));
7 print(_("Usage:\n"));
8 print(_("^2scoreboard_columns_set default\n"));
9 - print(_("^2scoreboard_columns_set ^7filed1 field2 ...\n"));
10 + print(_("^2scoreboard_columns_set ^7field1 field2 ...\n"));
11 print(_("The following field names are recognized (case insensitive):\n"));
12 print(_("You can use a ^3|^7 to start the right-aligned fields.\n\n"));
13
History
Updated by mand1nga 9 months ago
- Status changed from New to Feedback
I find weird that you didn't commit this change to master right away. At least looks like something easy to fix on the translation files, using about any translator.
Should we update all the translated files after this?
What about that the requests for translations that you've sent recently? Should we send them again?
Updated by divVerent 9 months ago
If we change a single english string, we'd have to send all need-translation requests again. We should not send out these requests twice after a few days, when most have not even responded to the first one yet.
Also, this is just a help text and does not justify restarting the translation-fixing process.
Updated by terencehill 9 months ago
There another small issue with that help, the first field description is misaligned because of 2 more color codes.
print(_("^3name^7 or ^3nick^7 Name of a player\n"));
print(_("^3ping^7 Ping time\n"));
print(_("^3pl^7 Packet loss\n"));
print(_("^3kills^7 Number of kills\n"));
print(_("^3deaths^7 Number of deaths\n"));
print(_("^3suicides^7 Number of suicides\n"));
...
For a correct alignment 4 extra spaces must be added:
print(_("^3name^7 or ^3nick^7 Name of a player\n"));
print(_("^3ping^7 Ping time\n"));
print(_("^3pl^7 Packet loss\n"));
print(_("^3kills^7 Number of kills\n"));
print(_("^3deaths^7 Number of deaths\n"));
print(_("^3suicides^7 Number of suicides\n"));
...
Updated by Samual 8 months ago
- Status changed from Feedback to Resolved
- Assigned to set to Samual
- Target version set to 0.6
Merged, but should we make a new tracker item for anything else remaining to be done later?
Updated by terencehill 8 months ago
I've fixed the above explained bug in the branch terencehill/align_fix, but I can't make a merge request as the diff is empty (patch consists only of spacing change).