[Scummvm-cvs-logs] scummvm master -> 01dea8bd6794c28ca43dce880d794adf992397cf

lordhoto lordhoto at gmail.com
Fri Sep 13 00:39:04 CEST 2013


This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
378387c903 I18N: Move specification of engine specific files to enginedir/POTFILES.
01dea8bd67 Merge pull request #378 from lordhoto/pluggable-engines-translations


Commit: 378387c903d72d902359a3923cef2c64b12a824f
    https://github.com/scummvm/scummvm/commit/378387c903d72d902359a3923cef2c64b12a824f
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2013-08-12T08:54:31-07:00

Commit Message:
I18N: Move specification of engine specific files to enginedir/POTFILES.

This allows to keep the engines to specfiy the files for translation close to
the engine sources itself.

Thanks to criezy for his suggestion on this approach.

Changed paths:
  A engines/agi/POTFILES
  A engines/agos/POTFILES
  A engines/cruise/POTFILES
  A engines/drascula/POTFILES
  A engines/dreamweb/POTFILES
  A engines/gob/POTFILES
  A engines/groovie/POTFILES
  A engines/kyra/POTFILES
  A engines/mohawk/POTFILES
  A engines/neverhood/POTFILES
  A engines/parallaction/POTFILES
  A engines/pegasus/POTFILES
  A engines/queen/POTFILES
  A engines/sci/POTFILES
  A engines/scumm/POTFILES
  A engines/sky/POTFILES
  A engines/sword1/POTFILES
  A engines/sword2/POTFILES
  A engines/teenagent/POTFILES
  A engines/tinsel/POTFILES
  A engines/toltecs/POTFILES
    po/POTFILES
    po/module.mk



diff --git a/engines/agi/POTFILES b/engines/agi/POTFILES
new file mode 100644
index 0000000..414bf22
--- /dev/null
+++ b/engines/agi/POTFILES
@@ -0,0 +1,2 @@
+engines/agi/detection.cpp
+engines/agi/saveload.cpp
diff --git a/engines/agos/POTFILES b/engines/agos/POTFILES
new file mode 100644
index 0000000..7045ed9
--- /dev/null
+++ b/engines/agos/POTFILES
@@ -0,0 +1,2 @@
+engines/agos/saveload.cpp
+engines/agos/animation.cpp
diff --git a/engines/cruise/POTFILES b/engines/cruise/POTFILES
new file mode 100644
index 0000000..e3b25bd
--- /dev/null
+++ b/engines/cruise/POTFILES
@@ -0,0 +1 @@
+engines/cruise/menu.cpp
diff --git a/engines/drascula/POTFILES b/engines/drascula/POTFILES
new file mode 100644
index 0000000..ea79f9e
--- /dev/null
+++ b/engines/drascula/POTFILES
@@ -0,0 +1,2 @@
+engines/drascula/detection.cpp
+engines/drascula/saveload.cpp
diff --git a/engines/dreamweb/POTFILES b/engines/dreamweb/POTFILES
new file mode 100644
index 0000000..d05d239
--- /dev/null
+++ b/engines/dreamweb/POTFILES
@@ -0,0 +1 @@
+engines/dreamweb/detection.cpp
diff --git a/engines/gob/POTFILES b/engines/gob/POTFILES
new file mode 100644
index 0000000..9a51246
--- /dev/null
+++ b/engines/gob/POTFILES
@@ -0,0 +1,3 @@
+engines/gob/inter_playtoons.cpp
+engines/gob/inter_v2.cpp
+engines/gob/inter_v5.cpp
diff --git a/engines/groovie/POTFILES b/engines/groovie/POTFILES
new file mode 100644
index 0000000..0bf4528
--- /dev/null
+++ b/engines/groovie/POTFILES
@@ -0,0 +1,2 @@
+engines/groovie/detection.cpp
+engines/groovie/script.cpp
diff --git a/engines/kyra/POTFILES b/engines/kyra/POTFILES
new file mode 100644
index 0000000..16888e2
--- /dev/null
+++ b/engines/kyra/POTFILES
@@ -0,0 +1,3 @@
+engines/kyra/detection.cpp
+engines/kyra/lol.cpp
+engines/kyra/sound_midi.cpp
diff --git a/engines/mohawk/POTFILES b/engines/mohawk/POTFILES
new file mode 100644
index 0000000..54d9dca
--- /dev/null
+++ b/engines/mohawk/POTFILES
@@ -0,0 +1,3 @@
+engines/mohawk/dialogs.cpp
+engines/mohawk/myst.cpp
+engines/mohawk/riven.cpp
diff --git a/engines/neverhood/POTFILES b/engines/neverhood/POTFILES
new file mode 100644
index 0000000..36628cf
--- /dev/null
+++ b/engines/neverhood/POTFILES
@@ -0,0 +1,2 @@
+engines/neverhood/detection.cpp
+engines/neverhood/menumodule.cpp
diff --git a/engines/parallaction/POTFILES b/engines/parallaction/POTFILES
new file mode 100644
index 0000000..f3b1c45
--- /dev/null
+++ b/engines/parallaction/POTFILES
@@ -0,0 +1 @@
+engines/parallaction/saveload.cpp
diff --git a/engines/pegasus/POTFILES b/engines/pegasus/POTFILES
new file mode 100644
index 0000000..c06cb07
--- /dev/null
+++ b/engines/pegasus/POTFILES
@@ -0,0 +1 @@
+engines/pegasus/pegasus.cpp
diff --git a/engines/queen/POTFILES b/engines/queen/POTFILES
new file mode 100644
index 0000000..1baf9c2
--- /dev/null
+++ b/engines/queen/POTFILES
@@ -0,0 +1 @@
+engines/queen/queen.cpp
diff --git a/engines/sci/POTFILES b/engines/sci/POTFILES
new file mode 100644
index 0000000..f076c29
--- /dev/null
+++ b/engines/sci/POTFILES
@@ -0,0 +1,2 @@
+engines/sci/detection.cpp
+engines/sci/engine/kfile.cpp
diff --git a/engines/scumm/POTFILES b/engines/scumm/POTFILES
new file mode 100644
index 0000000..6034320
--- /dev/null
+++ b/engines/scumm/POTFILES
@@ -0,0 +1,3 @@
+engines/scumm/dialogs.cpp
+engines/scumm/help.cpp
+engines/scumm/scumm.cpp
diff --git a/engines/sky/POTFILES b/engines/sky/POTFILES
new file mode 100644
index 0000000..6c39f82
--- /dev/null
+++ b/engines/sky/POTFILES
@@ -0,0 +1,2 @@
+engines/sky/compact.cpp
+engines/sky/detection.cpp
diff --git a/engines/sword1/POTFILES b/engines/sword1/POTFILES
new file mode 100644
index 0000000..849bef9
--- /dev/null
+++ b/engines/sword1/POTFILES
@@ -0,0 +1,4 @@
+engines/sword1/animation.cpp
+engines/sword1/control.cpp
+engines/sword1/logic.cpp
+engines/sword1/sword1.cpp
diff --git a/engines/sword2/POTFILES b/engines/sword2/POTFILES
new file mode 100644
index 0000000..94ad720
--- /dev/null
+++ b/engines/sword2/POTFILES
@@ -0,0 +1,2 @@
+engines/sword2/animation.cpp
+engines/sword2/sword2.cpp
diff --git a/engines/teenagent/POTFILES b/engines/teenagent/POTFILES
new file mode 100644
index 0000000..b8b8328
--- /dev/null
+++ b/engines/teenagent/POTFILES
@@ -0,0 +1 @@
+engines/teenagent/resources.cpp
diff --git a/engines/tinsel/POTFILES b/engines/tinsel/POTFILES
new file mode 100644
index 0000000..714da37
--- /dev/null
+++ b/engines/tinsel/POTFILES
@@ -0,0 +1 @@
+engines/tinsel/saveload.cpp
diff --git a/engines/toltecs/POTFILES b/engines/toltecs/POTFILES
new file mode 100644
index 0000000..81adbb8
--- /dev/null
+++ b/engines/toltecs/POTFILES
@@ -0,0 +1,2 @@
+engines/toltecs/detection.cpp
+engines/toltecs/menu.cpp
diff --git a/po/POTFILES b/po/POTFILES
index 869323b..a33c8e3 100644
--- a/po/POTFILES
+++ b/po/POTFILES
@@ -24,47 +24,6 @@ common/util.cpp
 engines/advancedDetector.cpp
 engines/dialogs.cpp
 engines/engine.cpp
-engines/agi/detection.cpp
-engines/agi/saveload.cpp
-engines/drascula/detection.cpp
-engines/drascula/saveload.cpp
-engines/dreamweb/detection.cpp
-engines/sci/detection.cpp
-engines/scumm/dialogs.cpp
-engines/scumm/help.cpp
-engines/scumm/scumm.cpp
-engines/mohawk/dialogs.cpp
-engines/mohawk/myst.cpp
-engines/mohawk/riven.cpp
-engines/cruise/menu.cpp
-engines/sci/engine/kfile.cpp
-engines/agos/saveload.cpp
-engines/agos/animation.cpp
-engines/gob/inter_playtoons.cpp
-engines/gob/inter_v2.cpp
-engines/gob/inter_v5.cpp
-engines/groovie/detection.cpp
-engines/groovie/script.cpp
-engines/kyra/detection.cpp
-engines/kyra/lol.cpp
-engines/kyra/sound_midi.cpp
-engines/neverhood/detection.cpp
-engines/neverhood/menumodule.cpp
-engines/queen/queen.cpp
-engines/sky/compact.cpp
-engines/sky/detection.cpp
-engines/sword1/animation.cpp
-engines/sword1/control.cpp
-engines/sword1/logic.cpp
-engines/sword1/sword1.cpp
-engines/sword2/animation.cpp
-engines/sword2/sword2.cpp
-engines/teenagent/resources.cpp
-engines/tinsel/saveload.cpp
-engines/toltecs/detection.cpp
-engines/toltecs/menu.cpp
-engines/parallaction/saveload.cpp
-engines/pegasus/pegasus.cpp
 
 audio/fmopl.cpp
 audio/mididrv.cpp
diff --git a/po/module.mk b/po/module.mk
index a929565..88bf7d5 100644
--- a/po/module.mk
+++ b/po/module.mk
@@ -2,8 +2,10 @@ POTFILE := $(srcdir)/po/scummvm.pot
 POFILES := $(wildcard $(srcdir)/po/*.po)
 CPFILES := $(wildcard $(srcdir)/po/*.cp)
 
+ENGINE_INPUT_POTFILES := $(wildcard $(srcdir)/engines/*/POTFILES)
 updatepot:
-	xgettext -f $(srcdir)/po/POTFILES -D $(srcdir) -d scummvm --c++ -k_ -k_s -k_c:1,2c -k_sc:1,2c --add-comments=I18N\
+	cat $(srcdir)/po/POTFILES $(ENGINE_INPUT_POTFILES) | \
+	xgettext -f - -D $(srcdir) -d scummvm --c++ -k_ -k_s -k_c:1,2c -k_sc:1,2c --add-comments=I18N\
 		-kDECLARE_TRANSLATION_ADDITIONAL_CONTEXT:1,2c -o $(POTFILE) \
 		--copyright-holder="ScummVM Team" --package-name=ScummVM \
 		--package-version=$(VERSION) --msgid-bugs-address=scummvm-devel at lists.sf.net -o $(POTFILE)_


Commit: 01dea8bd6794c28ca43dce880d794adf992397cf
    https://github.com/scummvm/scummvm/commit/01dea8bd6794c28ca43dce880d794adf992397cf
Author: Johannes Schickel (lordhoto at gmail.com)
Date: 2013-09-12T15:38:13-07:00

Commit Message:
Merge pull request #378 from lordhoto/pluggable-engines-translations

RFC: Pluggable Engines: I18N: Move specification of engine specific files to enginedir/POTFILES

Changed paths:
  A engines/agi/POTFILES
  A engines/agos/POTFILES
  A engines/cruise/POTFILES
  A engines/drascula/POTFILES
  A engines/dreamweb/POTFILES
  A engines/gob/POTFILES
  A engines/groovie/POTFILES
  A engines/kyra/POTFILES
  A engines/mohawk/POTFILES
  A engines/neverhood/POTFILES
  A engines/parallaction/POTFILES
  A engines/pegasus/POTFILES
  A engines/queen/POTFILES
  A engines/sci/POTFILES
  A engines/scumm/POTFILES
  A engines/sky/POTFILES
  A engines/sword1/POTFILES
  A engines/sword2/POTFILES
  A engines/teenagent/POTFILES
  A engines/tinsel/POTFILES
  A engines/toltecs/POTFILES
    po/POTFILES
    po/module.mk









More information about the Scummvm-git-logs mailing list