Skip to content

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also .

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 6 commits
  • 37 files changed
  • 0 commit comments
  • 1 contributor
Showing with 13,594 additions and 13,943 deletions.
  1. +4 −0 data/base/images/intfac.img
  2. BIN data/base/images/intfac0.png
  3. +3 −0 icons/warzone2100.desktop
  4. +1 −0 po/POTFILES.in
  5. +444 −444 po/ca_ES.po
  6. +457 −456 po/cs.po
  7. +1 −1 po/custom/mac-infoplist.txt
  8. +456 −456 po/da.po
  9. +445 −444 po/de.po
  10. +456 −456 po/en_GB.po
  11. +445 −444 po/es.po
  12. +456 −456 po/et_EE.po
  13. +444 −454 po/fi.po
  14. +456 −456 po/fr.po
  15. +446 −456 po/fy.po
  16. +445 −454 po/ga.po
  17. +456 −456 po/hr.po
  18. +452 −452 po/hu.po
  19. +445 −444 po/it.po
  20. +455 −456 po/ko.po
  21. +400 −442 po/la.po
  22. +445 −454 po/lt.po
  23. +446 −456 po/nb.po
  24. +456 −456 po/nl.po
  25. +531 −790 po/pl.po
  26. +456 −456 po/pt.po
  27. +445 −444 po/pt_BR.po
  28. +455 −454 po/ro.po
  29. +453 −452 po/ru.po
  30. +457 −456 po/sk.po
  31. +458 −456 po/sl.po
  32. +448 −448 po/tr.po
  33. +456 −456 po/uk_UA.po
  34. +453 −454 po/zh_CN.po
  35. +455 −456 po/zh_TW.po
  36. +8 −6 src/design.cpp
  37. +5 −22 src/intfac.h
View
4 data/base/images/intfac.img
@@ -539,3 +539,7 @@
2,208,26,14,12,0,0,"IMAGE ALLY RESEARCH TC"
2,207,0,25,14,0,0,"IMAGE GENERIC TANK"
2,183,14,25,14,0,0,"IMAGE GENERIC TANK TC"
+0,148,0,45,24,0,0,"IMAGE DES SAVE"
+0,193,0,45,24,0,0,"IMAGE DES SAVEH"
+0,148,24,45,24,0,0,"IMAGE DES DELETE"
+0,193,24,45,24,0,0,"IMAGE DES DELETEH"
View
BIN data/base/images/intfac0.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
View
3 icons/warzone2100.desktop
@@ -24,3 +24,6 @@ GenericName[tr] = Strateji Oyunu
Comment[it] = Strategia in tempo reale postnucleare
Comment[es] = Estrategia a tiempo real postnuclear
Comment[tr] = Nükleer sonrası gerçek zamanlı strateji
+Name[pl] = Warzone 2100
+GenericName[pl] = Gra strategiczna
+Comment[pl] = Post nuklearna strategia czasu rzeczywistego
View
1 po/POTFILES.in
@@ -312,6 +312,7 @@ src/selection.cpp
src/seqdisp.cpp
src/stats.cpp
src/structure.cpp
+src/template.cpp
src/terrain.cpp
src/text.cpp
src/texture.cpp
View
888 po/ca_ES.po
444 additions, 444 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
913 po/cs.po
457 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
2 po/custom/mac-infoplist.txt
@@ -1,4 +1,4 @@
-_("Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2010 The Warzone 2100 Project")
+_("Copyright © 1999-2004 Eidos Interactive.\nCopyright © 2005-2011 The Warzone 2100 Project")
_("Warzone 2100")
_("Warzone 2100 Map / Mod File")
_("Warzone 2100 Campaign Mod File")
View
912 po/da.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
889 po/de.po
445 additions, 444 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/en_GB.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
889 po/es.po
445 additions, 444 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/et_EE.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
898 po/fi.po
444 additions, 454 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/fr.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
902 po/fy.po
446 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
899 po/ga.po
445 additions, 454 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/hr.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
904 po/hu.po
452 additions, 452 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
889 po/it.po
445 additions, 444 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
911 po/ko.po
455 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
842 po/la.po
400 additions, 442 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
899 po/lt.po
445 additions, 454 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
902 po/nb.po
446 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/nl.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
1,321 po/pl.po
531 additions, 790 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/pt.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
889 po/pt_BR.po
445 additions, 444 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
909 po/ro.po
455 additions, 454 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
905 po/ru.po
453 additions, 452 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
913 po/sk.po
457 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
914 po/sl.po
458 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
896 po/tr.po
448 additions, 448 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
912 po/uk_UA.po
456 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
907 po/zh_CN.po
453 additions, 454 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
911 po/zh_TW.po
455 additions, 456 deletions not shown because the diff is too large. Please use a local Git client to view these changes.
View
14 src/design.cpp
@@ -624,14 +624,14 @@ static bool _intAddDesign( bool bShowCentreScreen )
sButInit.formID = IDDES_PARTFORM;
sButInit.id = IDDES_STOREBUTTON;
sButInit.style = WBUT_PLAIN;
- sButInit.width = iV_GetImageWidth(IntImages, IMAGE_DES_BIN);
- sButInit.height = iV_GetImageHeight(IntImages, IMAGE_DES_BIN);
+ sButInit.width = iV_GetImageWidth(IntImages, IMAGE_DES_SAVE);
+ sButInit.height = iV_GetImageHeight(IntImages, IMAGE_DES_SAVE);
sButInit.x = DES_PARTSEPARATIONX;
sButInit.y = DES_PARTFORMHEIGHT - 2*sButInit.height - 2*DES_PARTSEPARATIONY;
- sButInit.pTip = _("Store Design");
+ sButInit.pTip = _("Store Template");
sButInit.FontID = font_regular;
sButInit.pDisplay = intDisplayButtonHilight;
- sButInit.UserData = PACKDWORD_TRI(0, IMAGE_DES_BINH, IMAGE_DES_BIN);
+ sButInit.UserData = PACKDWORD_TRI(0, IMAGE_DES_SAVEH, IMAGE_DES_SAVE);
if (!widgAddButton(psWScreen, &sButInit))
{
@@ -4689,11 +4689,13 @@ void updateStoreButton(bool isStored)
if (isStored)
{
- imageset = PACKDWORD_TRI(0, IMAGE_DES_TURRETH, IMAGE_DES_TURRET);
+ imageset = PACKDWORD_TRI(0, IMAGE_DES_DELETEH, IMAGE_DES_DELETE);
+ widgSetTipText(widgGetFromID(psWScreen, IDDES_STOREBUTTON), _("Delete Template"));
}
else
{
- imageset = PACKDWORD_TRI(0, IMAGE_DES_BINH, IMAGE_DES_BIN);
+ imageset = PACKDWORD_TRI(0, IMAGE_DES_SAVEH, IMAGE_DES_SAVE);
+ widgSetTipText(widgGetFromID(psWScreen, IDDES_STOREBUTTON), _("Store Template"));
}
widgSetUserData2(psWScreen, IDDES_STOREBUTTON, imageset);
View
27 src/intfac.h
@@ -1,25 +1,4 @@
-/*
- This file is part of Warzone 2100.
- Copyright (C) 1999-2004 Eidos Interactive
- Copyright (C) 2005-2011 Warzone 2100 Project
-
- Warzone 2100 is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 2 of the License, or
- (at your option) any later version.
-
- Warzone 2100 is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with Warzone 2100; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-/** @file
- * Image ID definitions
- */
+// THIS IS AN AUTOGENERATED HEADER! DO NOT EDIT (since your changes would be lost, anyway)!
#ifndef __INCLUDED_SRC_INTFAC_H__
#define __INCLUDED_SRC_INTFAC_H__
@@ -567,6 +546,10 @@ enum
IMAGE_ALLY_RESEARCH_TC,
IMAGE_GENERIC_TANK,
IMAGE_GENERIC_TANK_TC,
+ IMAGE_DES_SAVE,
+ IMAGE_DES_SAVEH,
+ IMAGE_DES_DELETE,
+ IMAGE_DES_DELETEH,
};
#endif //__INCLUDED_SRC_INTFAC_H__

No commit comments for this range

Something went wrong with that request. Please try again.