Commit Graph

4733 Commits

Author SHA1 Message Date
Tim Bentley
5e38d34997 Fix issues with other merges 2010-09-22 05:57:50 +01:00
rimach
ee33309838 Fix translation files
bzr-revno: 1049
2010-09-22 05:45:27 +01:00
Jonathan Corwin
050d1478c9 Attempt to speed up video restart when looping. Make sure outlined fonts don't vanish off left hand side 2010-09-21 23:22:05 +01:00
Raoul Snyman
b732ddf76b Update strings. 2010-09-21 22:10:26 +02:00
Raoul Snyman
18d99a48ed HEAD 2010-09-21 21:56:39 +02:00
Raoul Snyman
51e109cfc6 HEAD 2010-09-21 21:55:40 +02:00
rimach
395fe85d42 update 2010-09-21 21:53:46 +02:00
rimach
5b009a9ee4 update *.ts files 2010-09-21 21:34:12 +02:00
rimach
32544d1556 Head 2010-09-21 21:22:49 +02:00
rimach
6b5deff398 update translation_utils script, that generated qm files will be copied to the related folder 2010-09-21 21:22:34 +02:00
Tim Bentley
e790f9aedc Move display fixes 2010-09-21 20:08:23 +01:00
Tim Bentley
3e0a3f799b Fix bug 642754 in service manager 2010-09-21 20:05:45 +01:00
Andreas Preikschat
2a4e64c9db fix for Bug #643783 2010-09-21 20:44:48 +02:00
Raoul Snyman
81c4468f4d Fixed bug #644106
bzr-revno: 1048
2010-09-21 20:29:43 +02:00
Raoul Snyman
c235b793b0 Fix bug #644106
Fix a related bug in the song importer.
2010-09-21 20:12:46 +02:00
Andreas Preikschat
24fcd11ab0 head 2010-09-21 20:11:43 +02:00
Tim Bentley
1c58fcda9f Remove print statement 2010-09-21 18:42:16 +01:00
Tim Bentley
8e94d87e65 Put the display image back after it was lost 2010-09-21 18:35:26 +01:00
Tim Bentley
79881d9023 Update plugin version numbers 2010-09-21 18:30:32 +01:00
Tim Bentley
d50ffbafa3 Fix review comments 2010-09-21 18:24:01 +01:00
Tim Bentley
b1d312626a Head1047 2010-09-21 17:47:54 +01:00
Jeffrey Smith
d5d4e5ce93 Added a song importer for EasyWorship
bzr-revno: 1047
2010-09-21 18:08:15 +02:00
Andreas Preikschat
a22dec796e typing error 2010-09-21 07:57:23 +02:00
Jeffrey S. Smith
49e6a4589c Get rid of extra blank lines and handle \{ \} \ in RTF 2010-09-20 15:58:55 -05:00
Andreas Preikschat
8b6e90ab44 tweak 2010-09-20 20:55:14 +02:00
Andreas Preikschat
137fb7417e removed code and added a dialog 2010-09-20 20:38:18 +02:00
Tim Bentley
419008d4b7 Head 2010-09-20 19:36:56 +01:00
Jeffrey S. Smith
d4a1b7f796 Added a song importer for EasyWorship 2010-09-20 13:22:57 -05:00
Jonathan Corwin
906f33026a Rendering speedups/fixes
bzr-revno: 1046
2010-09-20 19:11:00 +01:00
Raoul Snyman
c2d0204862 Added a method to update the translation files.
bzr-revno: 1045
2010-09-20 20:02:11 +02:00
Tim Bentley
56297a1cce fixes for 641644
Fixes: https://launchpad.net/bugs/641644
2010-09-20 19:01:32 +01:00
Tim Bentley
5675eba314 Fix local variable issues 2010-09-20 17:43:36 +01:00
Tim Bentley
fe6a3af42c Explicit error type 2010-09-20 17:33:38 +01:00
Tim Bentley
293443ba61 Fixed but untested
Fixes: https://launchpad.net/bugs/642778
2010-09-20 06:06:18 +01:00
Tim Bentley
b73a921dbc Fix bug if no lanuagage files 2010-09-20 05:59:51 +01:00
Tim Bentley
551bf3c41f r1044 2010-09-20 05:39:46 +01:00
Jonathan Corwin
827eb93c67 r1044 2010-09-19 22:07:26 +01:00
Jonathan Corwin
ad51cb8040 Remove top/left border on maindisplay. QGraphicsWebView only appeared in Qt4.6 2010-09-19 21:59:00 +01:00
Raoul Snyman
4949bed443 Add a method to update the translation files.
Merge from HEAD.
2010-09-19 19:31:59 +02:00
Andreas Preikschat
17b4335ee4 do not delete results when changing from keep to clear 2010-09-19 18:51:52 +02:00
Andreas Preikschat
d7846a752c head 2010-09-19 17:48:35 +02:00
rimach
23099261bd Head 2010-09-19 10:47:00 +02:00
rimach
e42dbc9504 Head 2010-09-19 10:22:22 +02:00
Andreas Preikschat
bd5f82096f head + resolved conflicts 2010-09-19 07:59:38 +02:00
Christian Richter
9539e0fb22 Change OpenOffice to use pipes not sockets to resolve slow networking issue. Fix option parsing unicode problem for python 2.5
bzr-revno: 1044
2010-09-18 23:18:32 +01:00
Andreas Preikschat
02b46f051c changed combobox behaviour 2010-09-18 23:29:41 +02:00
Raoul Snyman
3ff6d4da16 Fix for bug #640697
bzr-revno: 1043
2010-09-18 21:32:34 +02:00
Andreas Preikschat
4b2a764b91 Fixed bug #641734
bzr-revno: 1042
2010-09-18 21:29:26 +02:00
Jonathan Corwin
c2fcd674da String fixes
bzr-revno: 1041
2010-09-18 21:16:13 +02:00
rimach
86bed937f5 Remove unused lines 2010-09-18 20:56:57 +02:00