← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to client/gui-xaw/Freeciv.h

  • Committer: Package Import Robot
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2011-08-28 22:40:00 UTC
  • mfrom: (1.2.19 upstream)
  • Revision ID: package-import@ubuntu.com-20110828224000-j2r1erewlem25dox
Tags: 2.3.0-1
[ Karl Goetz ]
* New upstream version.
* Fix themes_sdl_use_system_fonts.diff to apply cleanly on 2.3.0
* Massage work_around_unity_induced_breakage.diff to get it
  applying to the new codebase (The patch assumes commits made
  after 2.3.0 was tagged upstream).

[ Clint Adams ]
* Fudge build system to think there is no libtool mismatch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
client/gui-xaw/Freeciv.h
2
2
/* DO NOT EDIT THIS FILE, EDIT ../../data/Freeciv */
3
3
/**************************************************/
4
4
"Freeciv*gotAppDefFile:                       True",
5
 
"Freeciv*version:                             2.2.7",
 
5
"Freeciv*version:                             2.3.0",
6
6
"Freeciv.title:                               Freeciv",
7
7
"Freeciv.iconName:                            Freeciv",
8
8
"Freeciv*borderColor:                         black",
1451
1451
"Freeciv*reporteconomyclosecommand.bottom:      chainBottom",
1452
1452
"Freeciv*reporteconomyclosecommand.left:                chainLeft",
1453
1453
"Freeciv*reporteconomyclosecommand.right:       chainLeft",
1454
 
"Freeciv*reporteconomysellobsoletecommand.label:                _(\"Sell Obsolete\")",
1455
 
"Freeciv*reporteconomysellobsoletecommand.fromVert:     reporteconomylabel2",
1456
 
"Freeciv*reporteconomysellobsoletecommand.fromHoriz:    reporteconomyclosecommand",
1457
 
"Freeciv*reporteconomysellobsoletecommand.top:          chainBottom",
1458
 
"Freeciv*reporteconomysellobsoletecommand.bottom:       chainBottom",
1459
 
"Freeciv*reporteconomysellobsoletecommand.left:         chainLeft",
1460
 
"Freeciv*reporteconomysellobsoletecommand.right:                chainLeft",
 
1454
"Freeciv*reporteconomysellredundantcommand.label:       _(\"Sell Redundant\")",
 
1455
"Freeciv*reporteconomysellredundantcommand.fromVert:    reporteconomylabel2",
 
1456
"Freeciv*reporteconomysellredundantcommand.fromHoriz:   reporteconomyclosecommand",
 
1457
"Freeciv*reporteconomysellredundantcommand.top:         chainBottom",
 
1458
"Freeciv*reporteconomysellredundantcommand.bottom:      chainBottom",
 
1459
"Freeciv*reporteconomysellredundantcommand.left:                chainLeft",
 
1460
"Freeciv*reporteconomysellredundantcommand.right:       chainLeft",
1461
1461
"Freeciv*reporteconomysellallcommand.label:     _(\"Sell All\")",
1462
1462
"Freeciv*reporteconomysellallcommand.fromVert:  reporteconomylabel2",
1463
 
"Freeciv*reporteconomysellallcommand.fromHoriz: reporteconomysellobsoletecommand",
 
1463
"Freeciv*reporteconomysellallcommand.fromHoriz: reporteconomysellredundantcommand",
1464
1464
"Freeciv*reporteconomysellallcommand.top:       chainBottom",
1465
1465
"Freeciv*reporteconomysellallcommand.bottom:    chainBottom",
1466
1466
"Freeciv*reporteconomysellallcommand.left:      chainLeft",
1754
1754
"Freeciv*buynodialog.*.dlabel.borderWidth:  0",
1755
1755
"Freeciv*buynodialog.*.button0.label:     _(\"Darn\")",
1756
1756
"Freeciv*buynodialog.*.button0.fromVert:  dlabel",
1757
 
"Freeciv*caravandialog.title: _(\"Your Caravan Has Arrived\")",
 
1757
"Freeciv*caravandialog.title: _(\"Your Unit Has Arrived\")",
1758
1758
"Freeciv*caravandialog.*.dlabel.borderWidth:  0",
1759
1759
"Freeciv*caravandialog.*.button0.label:     _(\"Establish trade route\")",
1760
1760
"Freeciv*caravandialog.*.button0.fromVert:  dlabel",
2224
2224
   Shift<Key>f:       key-open-find-city()             \\n\
2225
2225
   Shift<Key>l:       key-open-goto-airlift()          \\n\
2226
2226
   Shift<Key>n:       key-unit-nuke()                  \\n\
 
2227
   Shift<Key>o:       key-unit-convert()               \\n\
2227
2228
   Shift<Key>p:       key-unit-pillage()               \\n\
2228
2229
   Shift<Key>r:       key-open-revolution()            \\n\
2229
2230
   Shift<Key>t:       key-open-rates()                 \\n\
2310
2311
   Shift<Key>f:       key-open-find-city()             \\n\
2311
2312
   Shift<Key>l:       key-open-goto-airlift()          \\n\
2312
2313
   Shift<Key>n:       key-unit-nuke()                  \\n\
 
2314
   Shift<Key>o:       key-unit-convert()               \\n\
2313
2315
   Shift<Key>p:       key-unit-pillage()               \\n\
2314
2316
   Shift<Key>r:       key-open-revolution()            \\n\
2315
2317
   Shift<Key>t:       key-open-rates()                 \\n\
2635
2637
"Freeciv*startpagelabel.left:               chainLeft",
2636
2638
"Freeciv*startpagelabel.right:              chainRight",
2637
2639
"Freeciv*startpagelabel.label: _(\"\
2638
 
Name              Ready Leader          Nation          \")",
 
2640
  Name             Ready  Leader           Nation          Team \")",
2639
2641
"Freeciv*startpageviewport.resizable:       true",
2640
2642
"Freeciv*startpageviewport.allowVert:       true",
2641
2643
"Freeciv*startpageviewport.allowHoriz:      false",
2667
2669
"Freeciv*startpagenationcommand.bottom:        chainBottom",
2668
2670
"Freeciv*startpagenationcommand.left:          chainLeft",
2669
2671
"Freeciv*startpagenationcommand.right:         chainLeft",
 
2672
"Freeciv*startpagetakecommand.label:           _(\"Take Player\")",
 
2673
"Freeciv*startpagetakecommand.fromHoriz:       startpagenationcommand",
 
2674
"Freeciv*startpagetakecommand.fromVert:        startpageviewport",
 
2675
"Freeciv*startpagetakecommand.top:             chainBottom",
 
2676
"Freeciv*startpagetakecommand.bottom:          chainBottom",
 
2677
"Freeciv*startpagetakecommand.left:            chainLeft",
 
2678
"Freeciv*startpagetakecommand.right:           chainLeft",
2670
2679
"Freeciv*startpagestartcommand.label:          _(\"Start\")",
2671
 
"Freeciv*startpagestartcommand.fromHoriz:      startpagenationcommand",
 
2680
"Freeciv*startpagestartcommand.fromHoriz:      startpagetakecommand",
2672
2681
"Freeciv*startpagestartcommand.fromVert:       startpageviewport",
2673
2682
"Freeciv*startpagestartcommand.top:            chainBottom",
2674
2683
"Freeciv*startpagestartcommand.bottom:         chainBottom",