all repos — mgba @ eec37230a17b91fd49b8ab3269c596ca025a8c35

mGBA Game Boy Advance Emulator

Qt: Fix merge
Vicki Pfau vi@endrift.com
Thu, 06 Jul 2017 18:06:58 -0700
commit

eec37230a17b91fd49b8ab3269c596ca025a8c35

parent

09cff0779efca51eb5821481b3e199c9e628f51d

1 files changed, 1 insertions(+), 0 deletions(-)

jump to
M src/platform/qt/ts/medusa-emu-de.ts → src/platform/qt/ts/medusa-emu-de.ts 
@@ -2962,6 +2962,7 @@ <location filename="../Window.cpp" line="329"/>
         <source>Game Boy Advance ROMs (%1)</source>
         <translation>Game Boy Advance-ROMs (%1)</translation>
     </message>
+    <message>
         <location filename="../Window.cpp" line="385"/>
         <source>DS ROMs (%1)</source>
         <translation>DS-ROMs (%1)</translation>