FUJIWARA Katsunori
f215738702
i18n-ja: synchronized with 87267040cd32
2015-06-01 10:50:15 +09:00
Wagner Bruna
d3f6348af8
i18n-pt_BR: synchronized with 1f494259cbf1
2015-05-22 11:54:43 -03:00
FUJIWARA Katsunori
4424b8d24d
i18n-ja: synchronized with 0fc13b42416a
2015-04-30 19:12:28 +09:00
Wagner Bruna
51af6ac437
i18n-pt_BR: synchronized with 7deb565901a9
2015-04-29 16:43:02 -03:00
Wagner Bruna
8c89a6489a
i18n-pt_BR: synchronized with 44dfca3ef1e3
2015-04-23 00:07:37 -03:00
Michael O'Connor
d4eb35d7ec
transaction: add missing newline to message
...
Add a missing newline to the "journal was created by a
different version of Mercurial" message.
2015-04-14 10:59:26 -04:00
Matt Mackall
8f35738cc3
merge with stable
2015-04-01 20:38:36 -05:00
Wagner Bruna
8c2719662d
i18n-pt_BR: synchronized with f920316ac560
2015-03-31 20:20:17 -03:00
Wagner Bruna
af401eafef
i18n-pt_BR: synchronized with be4e8b8e43d7
2015-03-01 00:18:43 -03:00
FUJIWARA Katsunori
5a992da389
i18n-ja: synchronized with be4e8b8e43d7
2015-03-01 01:28:05 +09:00
FUJIWARA Katsunori
c16c2eca4a
i18n-ja: synchronized with d197a07d4a2b
2015-02-01 08:24:08 +09:00
Wagner Bruna
edf02017e9
i18n-pt_BR: synchronized with 7c70060dff84
2015-01-29 10:13:18 -02:00
Wagner Bruna
465fe55cbb
i18n-pt_BR: synchronized with 962d40fe1951
2015-01-18 11:16:45 -02:00
Jordi Gutiérrez Hermoso
8eb132f5ea
style: kill ersatz if-else ternary operators
...
Although Python supports `X = Y if COND else Z`, this was only
introduced in Python 2.5. Since we have to support Python 2.4, it was
a very common thing to write instead `X = COND and Y or Z`, which is a
bit obscure at a glance. It requires some intricate knowledge of
Python to understand how to parse these one-liners.
We change instead all of these one-liners to 4-liners. This was
executed with the following perlism:
find -name "*.py" -exec perl -pi -e 's,(\s*)([\.\w]+) = \(?(\S+)\s+and\s+(\S*)\)?\s+or\s+(\S*)$,$1if $3:\n$1 $2 = $4\n$1else:\n$1 $2 = $5,' {} \;
I tweaked the following cases from the automatic Perl output:
prev = (parents and parents[0]) or nullid
port = (use_ssl and 443 or 80)
cwd = (pats and repo.getcwd()) or ''
rename = fctx and webutil.renamelink(fctx) or []
ctx = fctx and fctx or ctx
self.base = (mapfile and os.path.dirname(mapfile)) or ''
I also added some newlines wherever they seemd appropriate for readability
There are probably a few ersatz ternary operators still in the code
somewhere, lurking away from the power of a simple regex.
2015-03-13 17:00:06 -04:00
Matt Mackall
b08c6cab93
merge with stable
2014-12-29 13:10:47 -06:00
FUJIWARA Katsunori
ef3bad18bd
i18n-ja: synchronized with 04d70d13ef9d
2014-12-29 15:59:56 +09:00
Wagner Bruna
1546a1d329
i18n-pt_BR: synchronized with 480699610f70
2014-12-26 17:21:08 -02:00
Wagner Bruna
3b892bfd69
i18n-pt_BR: synchronized with a05dbabaa7d7
2014-12-01 11:21:30 -02:00
FUJIWARA Katsunori
43f343827a
i18n-ja: synchronized with 4b491ac93c5c
2014-11-29 14:32:12 +09:00
Matt Mackall
289d6b53bc
merge with stable
2014-12-01 19:34:11 -06:00
Mads Kiilerich
523c87c1fe
spelling: fixes from proofreading of spell checker issues
2014-04-17 22:47:38 +02:00
FUJIWARA Katsunori
7568a9762d
i18n-ja: synchronized with e47ebaad2ffc
2014-11-01 18:03:17 +09:00
Wagner Bruna
45eb8f69e8
i18n-pt_BR: synchronized with 237838ba8a0e
2014-10-31 22:30:39 -02:00
FUJIWARA Katsunori
659bd4d145
i18n-ja: synchronized with 736cb15b8fb9
2014-11-01 01:03:11 +09:00
Wagner Bruna
9c62163a53
i18n-pt_BR: synchronized with 5ee35e3c2f35
2014-10-27 20:38:17 -02:00
Wagner Bruna
9eb76d45d6
i18n-pt_BR: synchronized with ed876f44a269
2014-10-23 18:17:00 -02:00
Matt Mackall
600a8a1715
merge with i18n
2014-10-18 18:05:10 -05:00
Alexander Sauta
9578fc17f5
i18n-ru: synchronized with bc20b710d0da
2014-10-13 14:46:50 +01:00
Wagner Bruna
0be158ded2
i18n-pt_BR: minor fixes and rewording on histedit help text
2014-09-30 13:43:30 -03:00
Wagner Bruna
61b30f0d0e
i18n-pt_BR: synchronized with d307c14fbf45
2014-09-30 10:17:59 -03:00
Wagner Bruna
e7e5f8b6c3
i18n-pt_BR: synchronized with 7bd2f92d9634
2014-09-22 15:39:21 -03:00
Wagner Bruna
aef4c89e3e
i18n-pt_BR: synchronized with 359fb11497a4
2014-09-01 10:57:27 -03:00
FUJIWARA Katsunori
645a149940
i18n-ja: synchronized with 86be79fee795
2014-08-31 20:49:13 +09:00
Wagner Bruna
e74e5f203b
i18n-pt_BR: synchronized with 86be79fee795
2014-08-30 09:40:31 -03:00
Matt Mackall
c4175c9947
i18n-ru: fix RST breakage spotted by test-gendoc
...
test-gendoc complained:
% extracting documentation from ru
checking for parse errors
+ gendoc-ru.txt:5686: (WARNING/2) Field list ends without a blank
line; unexpected unindent.
+ gendoc-ru.txt:8327: (WARNING/2) Definition list ends without a
blank line; unexpected unindent.
2014-08-09 16:04:36 -05:00
Matt Mackall
b1763500b3
i18n-ru: undo fix buildbot breakage
...
Buildbot complained:
$ python check-translation.py *.po
+ ru.po:9576:fatal(promptchoice): number of choices differs between
msgid and msgstr
+ [1]
Prompt text was obviously wrong.. because it didn't include a prompt.
2014-08-09 15:46:54 -05:00
Alexander Sauta
fcd2aba024
i18n-ru: syncronized with 0c46fc3bf33b
2014-08-04 16:08:42 +01:00
Alexander Sauta
ffd3e9a4f6
merge with i18n
2014-08-04 16:21:58 +01:00
Alexander Sauta
46861b290d
i18n-ru: sync with 664883681beb (fuzzies)
2014-08-04 18:51:18 +04:00
Alexander Sauta
979c9fae76
i18n-ru: sync with 664883681beb (missing strings)
2014-08-01 19:49:28 +04:00
FUJIWARA Katsunori
609db83006
i18n-ja: synchronized with 79b027f3e471
2014-08-01 17:29:02 +09:00
Wagner Bruna
c6972296d9
i18n-pt_BR: synchronized with 132509f68e6a
2014-08-01 02:02:06 -03:00
FUJIWARA Katsunori
c96cb8047e
i18n-ja: synchronized with 30dda0e5f710
2014-08-01 01:13:53 +09:00
Vladimir Zakharov
31c92599e4
i18n-ru: update 'revisions' translation
2014-07-30 17:24:08 +04:00
Wagner Bruna
4676efefe3
i18n-pt_BR: synchronized with 664883681beb
2014-07-29 19:29:02 -03:00
Vladimir Zakharov
4b1133e73b
i18n-ru: update 'revsets' translation
2014-07-29 19:08:41 +04:00
Pierre-Yves David
7ff3cfd076
i18n: add parenthesis in Brazilian translation of the resolve message
...
Eu falo brasileiro agora. Eu não sou uma batata!
2014-07-26 03:35:42 +02:00
Wagner Bruna
d98e4eed2d
i18n-pt_BR: synchronized with 4bd0f3b99c93
2014-07-20 18:08:29 -03:00
Matt Mackall
b738313af7
merge with stable
2014-10-01 15:05:09 -05:00
Augie Fackler
f41d193435
merge with stable
2014-09-04 09:59:23 -04:00