widelands

Merge lp:~widelands-dev/widelands/move-two-fonts into lp:widelands

  1. move-two-fonts
  2. Merge into trunk
Proposed by Hans Joachim Desserud
Status: Merged
Merged at revision: 7335
Proposed branch: lp:~widelands-dev/widelands/move-two-fonts
Merge into: lp:widelands
Diff against target: 30 lines (+2/-2)
1 file modified
i18n/fonts.lua (+2/-2)
To merge this branch: bzr merge lp:~widelands-dev/widelands/move-two-fonts
Reviewer Review Type Date Requested Status
GunChleoc Approve
Review via email: mp+245380@code.launchpad.net

Description of the change

Spin-off from https://code.launchpad.net/~widelands-dev/widelands/copyright-file/+merge/245297.

Moved the two fonts into their own directories, updated the paths in i18n/fonts.lua.
Anything else I need to update?

To post a comment you must log in.
Revision history for this message
GunChleoc (gunchleoc) wrote :

No, it's all done by the lua config - cmake etc only care about the i18n or fonts directory.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'i18n/fonts.lua'
2--- i18n/fonts.lua 2014-12-02 07:19:33 +0000
3+++ i18n/fonts.lua 2014-12-26 16:09:15 +0000
4@@ -41,7 +41,7 @@
5 },
6
7 devanagari = {
8- serif = "nakula.ttf",
9+ serif = "Nakula/nakula.ttf",
10 direction = "rtl"
11 },
12
13@@ -56,7 +56,7 @@
14 },
15
16 myanmar = {
17- serif = "mmrCensus.ttf",
18+ serif = "mmrCensus/mmrCensus.ttf",
19 },
20
21 sinhala = {
22
23=== added directory 'i18n/fonts/Nakula'
24=== renamed file 'i18n/fonts/COPYING' => 'i18n/fonts/Nakula/COPYING'
25=== renamed file 'i18n/fonts/README.nakula' => 'i18n/fonts/Nakula/README.nakula'
26=== renamed file 'i18n/fonts/nakula.ttf' => 'i18n/fonts/Nakula/nakula.ttf'
27=== added directory 'i18n/fonts/mmrCensus'
28=== renamed file 'i18n/fonts/OFL.txt' => 'i18n/fonts/mmrCensus/OFL.txt'
29=== renamed file 'i18n/fonts/README.mmrCensus' => 'i18n/fonts/mmrCensus/README.mmrCensus'
30=== renamed file 'i18n/fonts/mmrCensus.ttf' => 'i18n/fonts/mmrCensus/mmrCensus.ttf'

Subscribers

People subscribed via source and target branches

to status/vote changes: