Commit Graph

12135 Commits

Author SHA1 Message Date
Toshi MARUYAMA
f91c463b93 Merged r15113 from trunk to 3.2-stable (#21882)
Russian wiki translation for 3.1-stable updated by Kirill Gritsaenko.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15116 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 06:53:37 +00:00
Toshi MARUYAMA
73cc3708b0 Merged r15112 from trunk to 3.2-stable (#21881)
Russian wiki translation for 2.6-stable updated by Kirill Gritsaenko.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15115 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-30 06:53:25 +00:00
Toshi MARUYAMA
f0c1d52bd1 Merged r15105 from trunk to 3.2-stable.
request at least rails-html-sanitizer 1.0.3 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15107 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 11:45:41 +00:00
Toshi MARUYAMA
604b3472d4 Merged r15103 from trunk to 3.2-stable.
update Rails to 4.2.5.1.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15106 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 11:45:29 +00:00
Toshi MARUYAMA
274378ceb2 Merged r15099 from trunk to 3.2-stable (#21843)
fix nokogiri version comment.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15100 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 04:28:16 +00:00
Toshi MARUYAMA
3215633744 Merged r15096 from trunk to 3.2-stable (#21843)
Request at least nokogiri 1.6.7.2 because of security advisories.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15097 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-26 04:18:45 +00:00
Jean-Philippe Lang
253202c4af Merged r15013 (#21656).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15079 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:47:55 +00:00
Jean-Philippe Lang
3519d2148f Merged r15077 (#21740).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15078 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:44:38 +00:00
Jean-Philippe Lang
c2cba83338 Merged r15026 (#21487).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15076 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:42:50 +00:00
Jean-Philippe Lang
1adeee686e Merged r15024 and r15025 (#21453).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15075 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-21 04:41:49 +00:00
Toshi MARUYAMA
46310f32c5 Merged r15051 from trunk to 3.2-stable (#21620)
Turkish translation for 3.2-stable updated by Bahri Yardim.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15053 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-10 03:22:59 +00:00
Toshi MARUYAMA
330b438d9f Merged r15050 from trunk to 3.2-stable (#21620, #21689)
Turkish translation for 3.1-stable updated by Bahri Yardim.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15052 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-10 03:22:49 +00:00
Toshi MARUYAMA
ef86873ea2 Merged r15046 from trunk to 3.2-stable (#21635)
German translations for 3.2-stable updated by Benedikt Huss.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15048 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 19:42:46 +00:00
Toshi MARUYAMA
492e0b7a26 Merged r15045 from trunk to 3.2-stable (#21635, #21687)
German translations for 3.1-stable updated by Benedikt Huss.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15047 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 19:42:35 +00:00
Toshi MARUYAMA
4c4a52d7c3 Merged r15040 from trunk to 3.2-stable (#21527)
Russian translation for 3.2-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15043 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 16:45:49 +00:00
Toshi MARUYAMA
bb43848378 Merged r15039 from trunk to 3.2-stable (#21527, #21686)
Russian translation for 3.1-stable updated by Alexander Ryabinovskiy.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15042 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 16:45:38 +00:00
Toshi MARUYAMA
19138c3943 Merged r15032 from trunk to 3.2-stable (#21521)
Spanish and Spanish Panama translation updated by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15038 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 14:47:31 +00:00
Toshi MARUYAMA
1b4361873f Merged r15031 from trunk to 3.2-stable (#21521)
Spanish "permission_import_issues" and "label_import_issues" translation fixed by Leonel Iturralde.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15037 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 14:47:19 +00:00
Toshi MARUYAMA
a9f8ce0181 Merged r15030 from trunk to 3.2-stable (#21533)
Bulgarian translation updated by Ivan Cenov.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15035 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 13:15:55 +00:00
Toshi MARUYAMA
79615bdb11 Merged r15029 from trunk to 3.2-stable (#21511)
Japanese translation updated by Go MAEDA.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15034 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 13:15:40 +00:00
Toshi MARUYAMA
495e8892e3 Merged r15028 from trunk to 3.2-stable (#21506)
Traditional Chinese translation updated by ChunChang Lo.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15033 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 13:15:24 +00:00
Jean-Philippe Lang
18d0e40711 Merged r14985 (#21535).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15023 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 09:14:51 +00:00
Jean-Philippe Lang
fd39037b50 Merged r14987 (#21534).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15022 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 09:13:28 +00:00
Jean-Philippe Lang
a4a400e606 Merged r14966 (#21436).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15021 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 09:12:45 +00:00
Jean-Philippe Lang
ea90298f2a Merged r14986 (#21531).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15020 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 09:11:54 +00:00
Jean-Philippe Lang
9cb3cb9d01 Merged r14984 (#21551).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15016 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 08:43:24 +00:00
Jean-Philippe Lang
fd3b332070 Merged r14988 and r14988 (#21504).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15014 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-09 08:41:01 +00:00
Toshi MARUYAMA
924b9cfe6f Merged r15007 from trunk to 3.2-stable (#21522)
Simplified Chinese translation updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15010 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-07 04:16:57 +00:00
Toshi MARUYAMA
cd63df3b26 Merged r14974 and r14975 from trunk to 3.2-stable (#21447)
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15009 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-07 04:16:44 +00:00
Toshi MARUYAMA
b7a06818fc Merged r15006 from trunk to 3.2-stable (#21588)
Simplified Chinese "field_cvs_module" translation fixed by qian hu.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15008 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-07 04:15:59 +00:00
Toshi MARUYAMA
33e17fbd85 Merged r15004 from trunk to 3.2-stable (#21454)
Simplified Chinese translation for 3.2-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@15005 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 13:19:27 +00:00
Toshi MARUYAMA
77d83289b1 Merged r14995 from trunk to 3.2-stable (#21456)
Simplified Chinese wiki translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14998 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 11:22:41 +00:00
Toshi MARUYAMA
26056f3291 Merged r14994 from trunk to 3.2-stable (#21456, #21650)
Simplified Chinese wiki "project:someproject" translation for 2.6-stable updated by Hang Xie.

r13795 changed English "project:someproject" to project:some-project.
However, Japanese and Traditional Chinese kept translated "project:some-project".
Therefore, this Simplified Chinese translation is valid.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14997 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 11:22:26 +00:00
Toshi MARUYAMA
b2d4a2d74e Merged r14993 from trunk to 3.2-stable (#21456, #21650)
Simplified Chinese wiki translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14996 e93f8b46-1217-0410-a6f0-8f06a7374b81
2016-01-06 11:22:15 +00:00
Toshi MARUYAMA
072eec8851 Merged r14977 from trunk to 3.2-stable (#21569)
Request at least nokogiri 1.6.7.1 because of security advisories.

Patch by Jan Schulz-Hofen.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14990 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-21 04:17:05 +00:00
Jean-Philippe Lang
1560c9caa8 Merged r14967 to r14969 (#21488).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14982 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 08:12:58 +00:00
Jean-Philippe Lang
60c75d8508 Merged r14970 to r14972 (#21477).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14980 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 08:01:58 +00:00
Jean-Philippe Lang
a1d76f9365 Merged r14973 (#21219).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14978 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-19 07:58:38 +00:00
Toshi MARUYAMA
9820c3a8e3 Merged r14963 from trunk to 3.2-stable (#19017)
pdf: use all lower cases for DejaVuSansMono.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14964 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 12:38:05 +00:00
Toshi MARUYAMA
3eb2ad6617 Merged r14960 from trunk to 3.2-stable (#19017)
pdf: remove italic from DejaVuSansMono.

DejaVuSansMono Italic Arabic font has problem.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14962 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 12:24:28 +00:00
Toshi MARUYAMA
60dea89b2a Merged r14959 from trunk to 3.2-stable (#19017)
pdf: use "family" parameter instead of l(:general_pdf_fontname) at SetFont method.

Contributed by Jun NAITOH.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 12:24:18 +00:00
Jean-Philippe Lang
f483ee832f Merged r14957.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14958 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 11:27:55 +00:00
Jean-Philippe Lang
33ea4193c5 Merged r14955.
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14956 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 11:14:28 +00:00
Jean-Philippe Lang
9ead3ea0a5 Merged r14948 and r14949 (#19097).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14954 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 10:54:03 +00:00
Jean-Philippe Lang
0a45d594d5 Merged r14897 to r14900 and r14949 (#21258).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14953 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 10:51:56 +00:00
Jean-Philippe Lang
fbe3828b1a Merged r14946 (#21382).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14952 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-06 10:45:18 +00:00
Jean-Philippe Lang
f2fd790555 Merged r14944 (#21413).
git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14945 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 10:12:54 +00:00
Toshi MARUYAMA
421793c8a2 Merged r14928 from trunk to 3.2-stable (#21412)
Simplified Chinese translation for 3.1-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14931 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 05:54:39 +00:00
Toshi MARUYAMA
473fffc7fb Merged r14927 from trunk to 3.2-stable (#21412, #21431)
Simplified Chinese translation for 3.0-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14930 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 05:54:27 +00:00
Toshi MARUYAMA
c7793c4748 Merged r14926 from trunk to 3.2-stable (#21412, #21430)
Simplified Chinese translation for 2.6-stable updated by Hang Xie.

git-svn-id: http://svn.redmine.org/redmine/branches/3.2-stable@14929 e93f8b46-1217-0410-a6f0-8f06a7374b81
2015-12-05 05:54:15 +00:00