summaryrefslogtreecommitdiffstats
path: root/kdeprint
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-12-11 20:21:27 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2009-12-11 20:21:27 +0000
commit10e41144596fc9ced40fc349d9ecd099b1c2ea19 (patch)
tree88ab04e475ff5a4cd889cb082f5760b6e0bf5e4e /kdeprint
parent4aed2c8219774f5d797760606b8489a92ddc5163 (diff)
downloadtdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.tar.gz
tdebase-10e41144596fc9ced40fc349d9ecd099b1c2ea19.zip
Initial import of Trinity 3.5.11 to kdebase
Extends krandrtray, adds iccconfig kcontrol module, adds run dialog autocomplete and lots of bugfixes Will need to check for commit warnings and repair as encountered Also needs full compile test git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdebase@1061475 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kdeprint')
-rw-r--r--kdeprint/descriptions/Makefile.am2
-rw-r--r--kdeprint/kdeprintfax/defcmds.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/kdeprint/descriptions/Makefile.am b/kdeprint/descriptions/Makefile.am
index b8b0bd95a..66b8205e6 100644
--- a/kdeprint/descriptions/Makefile.am
+++ b/kdeprint/descriptions/Makefile.am
@@ -18,7 +18,7 @@ printers.cpp: sortthem
./sortthem < printers.cpp | perl -n -e "print \"// xgettext: no-c-format\n\".\$$_;" > printers.new && mv printers.new $(srcdir)/printers.cpp
messages:
- $(XGETTEXT) printers.cpp -o $(podir)/../kdelibs/ppdtranslations.pot
+ $(XGETTEXT) printers.cpp -o $(podir)/ppdtranslations.pot
.PHONY: printers.cpp
diff --git a/kdeprint/kdeprintfax/defcmds.h b/kdeprint/kdeprintfax/defcmds.h
index 6502250d3..cf9131e86 100644
--- a/kdeprint/kdeprintfax/defcmds.h
+++ b/kdeprint/kdeprintfax/defcmds.h
@@ -23,7 +23,7 @@
#include <qstring.h>
-#define efax_default_cmd "%exe_fax %user_{NAME=\"@@\"} %dev_{DEV=@@} PAGE=%page %from_{FROM=@@} %res_{?\?-l} send %number %files"
+#define efax_default_cmd "%exe_fax %user_{NAME=\"@@\"} %dev_{DEV=@@} PAGE=%page %from_{FROM=\"@@\"} %res_{?\?-l} send %number %files"
#define hylafax_default_cmd "%exe_sendfax %cover_{?\?-n} %server_h %res_{-m?\?-l} %subject_r %time_a %enterprise_x %comment_c %email_f %from_W %page_s -d %name_{@@@}%number %files"
#define mgetty_default_cmd "%exe_faxspool %user_F %email_f %name_D %time_t %number %files %res_{?\?-n} %cover_{?\?-C -}"