Merge changes from CUPS 1.5svn-r9313.

git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@2683 a1ca3aef-8c08-0410-bb20-df032aa958be

5 files changed, 5 insertions, 5 deletions

diff --git a/templates/de/add-class.tmpl b/templates/de/add-class.tmpl
index 264a019bf..2753bb919 100644
--- a/templates/de/add-class.tmpl
+++ b/templates/de/add-class.tmpl
@@ -1,6 +1,6 @@
 <DIV CLASS="indent">
 
-<H2 CLASS="title">>Klasse hinzuf&uuml;gen</H2>
+<H2 CLASS="title">Klasse hinzuf&uuml;gen</H2>
 
 <FORM METHOD="POST" ACTION="/admin">
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
diff --git a/templates/de/add-rss-subscription.tmpl b/templates/de/add-rss-subscription.tmpl
index cef109ca9..86b08b2f6 100644
--- a/templates/de/add-rss-subscription.tmpl
+++ b/templates/de/add-rss-subscription.tmpl
@@ -2,7 +2,7 @@
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="add-rss-subscription">
 
-<H2 CLASS="title">>RSS Subskription hinzuf&uuml;gen</H2>
+<H2 CLASS="title">RSS Subskription hinzuf&uuml;gen</H2>
 
 <TABLE SUMMARY="Forumlar zum Hinzufügen einer RSS Subskription">
 <TR>
diff --git a/templates/de/search.tmpl b/templates/de/search.tmpl
index fd1d5d954..a462ae0b0 100644
--- a/templates/de/search.tmpl
+++ b/templates/de/search.tmpl
@@ -1,4 +1,4 @@
-<FORM ACTION="{THIS_URL}" METHOD="GET">
+<FORM ACTION="/{SECTION}/{?SEARCH_DEST}" METHOD="GET">
 {WHICH_JOBS?<INPUT TYPE="HIDDEN" NAME="WHICH_JOBS" VALUE="{WHICH_JOBS}">:}
 {ORDER?<INPUT TYPE="HIDDEN" NAME="ORDER" VALUE="{ORDER}">:}
 
diff --git a/templates/ja/option-pickone.tmpl b/templates/ja/option-pickone.tmpl
index e927e7ca8..58b267a9c 100644
--- a/templates/ja/option-pickone.tmpl
+++ b/templates/ja/option-pickone.tmpl
@@ -6,7 +6,7 @@
 {iscustom=1?<TABLE NAME="paramtable" id="{keyword}-params">{[params]
 <TR><TH CLASS="sublabel">{paramtext}:</TH>
 <TD>{params=Units?<SELECT NAME="{keyword}.{params}">
-<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>ポイント/OPTION>
+<OPTION VALUE="pt"{paramvalue=pt? SELECTED:}>ポイント</OPTION>
 <OPTION VALUE="mm"{paramvalue=mm? SELECTED:}>ミリメートル</OPTION>
 <OPTION VALUE="cm"{paramvalue=cm? SELECTED:}>センチメートル</OPTION>
 <OPTION VALUE="in"{paramvalue=in? SELECTED:}>インチ</OPTION>
diff --git a/templates/pl/set-printer-options-header.tmpl b/templates/pl/set-printer-options-header.tmpl
index d128d7d50..58e5b85d1 100644
--- a/templates/pl/set-printer-options-header.tmpl
+++ b/templates/pl/set-printer-options-header.tmpl
@@ -6,7 +6,7 @@
 <INPUT TYPE="HIDDEN" NAME="org.cups.sid" VALUE="{$org.cups.sid}">
 <INPUT TYPE="HIDDEN" NAME="PRINTER_NAME" VALUE="{printer_name}">
 <INPUT TYPE="HIDDEN" NAME="OP" VALUE="{op}">
-{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Zakolejkuj drukarkę do domyślnych opcji">:}
+{HAVE_AUTOCONFIGURE?<INPUT TYPE="SUBMIT" NAME="AUTOCONFIGURE" VALUE="Pobierz domyślne ustawienia drukarki">:}
 
 <SCRIPT TYPE="text/javascript"><!--
 function update_paramtable(option)