From b76911e6689b9829da5d3257db07d270d8a582b5 Mon Sep 17 00:00:00 2001 From: psc Date: Mon, 25 May 2009 14:13:55 +0000 Subject: [PATCH] Make usage of apostrophes in "Number of listed %s" strings consistent with the rest of the interface. This fixes problems with truncated strings ("Number of listed") as well as it is enhancing consistence. (Trac #2635) git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6-lhm@13665 594d385d-05f5-0310-b6e9-bd551577e9d8 --- .../fai/admin/fai/class_divListFai.inc | 20 +++++++++---------- .../fai/locale/de/LC_MESSAGES/messages.po | 4 ++-- trunk/gosa-plugins/fai/locale/messages.po | 2 +- .../admin/systems/class_divListSystem.inc | 18 ++++++++--------- .../systems/locale/de/LC_MESSAGES/messages.po | 4 ++-- trunk/gosa-plugins/systems/locale/messages.po | 2 +- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/trunk/gosa-plugins/fai/admin/fai/class_divListFai.inc b/trunk/gosa-plugins/fai/admin/fai/class_divListFai.inc index 620aaa745..183aa5f00 100644 --- a/trunk/gosa-plugins/fai/admin/fai/class_divListFai.inc +++ b/trunk/gosa-plugins/fai/admin/fai/class_divListFai.inc @@ -319,16 +319,16 @@ class divListFai extends MultiSelectWindow $num_deps = count($this->Added_Departments); } - $profile_str = sprintf(_("Number of listed '%s'"),_("profiles")); - $partition_str = sprintf(_("Number of listed '%s'"),_("partitions")); - $script_str = sprintf(_("Number of listed '%s'"),_("scripts")); - $hook_str = sprintf(_("Number of listed '%s'"),_("hooks")); - $variable_str = sprintf(_("Number of listed '%s'"),_("variables")); - $template_str = sprintf(_("Number of listed '%s'"),_("templates")); - $package_str = sprintf(_("Number of listed '%s'"),_("packages")); - $dep_str = sprintf(_("Number of listed '%s'"),_("departments")); - $opsi_netboot = sprintf(_("Number of listed '%s'"),_("netboot products")); - $opsi_local = sprintf(_("Number of listed '%s'"),_("localboot products")); + $profile_str = sprintf(_("Number of listed %s"),_("profiles")); + $partition_str = sprintf(_("Number of listed %s"),_("partitions")); + $script_str = sprintf(_("Number of listed %s"),_("scripts")); + $hook_str = sprintf(_("Number of listed %s"),_("hooks")); + $variable_str = sprintf(_("Number of listed %s"),_("variables")); + $template_str = sprintf(_("Number of listed %s"),_("templates")); + $package_str = sprintf(_("Number of listed %s"),_("packages")); + $dep_str = sprintf(_("Number of listed %s"),_("departments")); + $opsi_netboot = sprintf(_("Number of listed %s"),_("netboot products")); + $opsi_local = sprintf(_("Number of listed %s"),_("localboot products")); $str = "\"".$profile_str."\" ".$cnts['FAIprofile']."    "; diff --git a/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po b/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po index e9335822b..2c66e5b3f 100644 --- a/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po +++ b/trunk/gosa-plugins/fai/locale/de/LC_MESSAGES/messages.po @@ -1280,8 +1280,8 @@ msgstr "PK" #: admin/fai/class_divListFai.inc:319 admin/fai/class_divListFai.inc:320 #: admin/fai/class_divListFai.inc:321 admin/fai/class_divListFai.inc:322 #, php-format -msgid "Number of listed '%s'" -msgstr "Anzahl der angezeigten '%s'" +msgid "Number of listed %s" +msgstr "Anzahl der angezeigten %s" #: admin/fai/class_divListFai.inc:313 msgid "profiles" diff --git a/trunk/gosa-plugins/fai/locale/messages.po b/trunk/gosa-plugins/fai/locale/messages.po index 2db1e2700..1fb55eab1 100644 --- a/trunk/gosa-plugins/fai/locale/messages.po +++ b/trunk/gosa-plugins/fai/locale/messages.po @@ -1219,7 +1219,7 @@ msgstr "" #: admin/fai/class_divListFai.inc:319 admin/fai/class_divListFai.inc:320 #: admin/fai/class_divListFai.inc:321 admin/fai/class_divListFai.inc:322 #, php-format -msgid "Number of listed '%s'" +msgid "Number of listed %s" msgstr "" #: admin/fai/class_divListFai.inc:313 diff --git a/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc b/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc index 88cd4f511..c1e8a305b 100644 --- a/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc +++ b/trunk/gosa-plugins/systems/admin/systems/class_divListSystem.inc @@ -420,15 +420,15 @@ class divListSystem extends MultiSelectWindow $num_deps = count($this->Added_Departments); } - $num_ser_str = sprintf(_("Number of listed '%s'"),_("servers")); - $num_ws_str = sprintf(_("Number of listed '%s'"),_("workstations")); - $num_ter_str = sprintf(_("Number of listed '%s'"),_("terminals")); - $num_pho_str = sprintf(_("Number of listed '%s'"),_("phones")); - $num_prt_str = sprintf(_("Number of listed '%s'"),_("printers")); - $num_com_str = sprintf(_("Number of listed '%s'"),_("network components")); - $num_new_str = sprintf(_("Number of listed '%s'"),_("new devices")); - $num_wws_str = sprintf(_("Number of listed '%s'"),_("windows workstations")); - $num_dep_str = sprintf(_("Number of listed '%s'"),_("departments")); + $num_ser_str = sprintf(_("Number of listed %s"),_("servers")); + $num_ws_str = sprintf(_("Number of listed %s"),_("workstations")); + $num_ter_str = sprintf(_("Number of listed %s"),_("terminals")); + $num_pho_str = sprintf(_("Number of listed %s"),_("phones")); + $num_prt_str = sprintf(_("Number of listed %s"),_("printers")); + $num_com_str = sprintf(_("Number of listed %s"),_("network components")); + $num_new_str = sprintf(_("Number of listed %s"),_("new devices")); + $num_wws_str = sprintf(_("Number of listed %s"),_("windows workstations")); + $num_dep_str = sprintf(_("Number of listed %s"),_("departments")); $str = "".$num_ser_str." ".$cnts['server']."    "; diff --git a/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po b/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po index 801593410..eb1a60566 100644 --- a/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po +++ b/trunk/gosa-plugins/systems/locale/de/LC_MESSAGES/messages.po @@ -497,8 +497,8 @@ msgstr "Von %s geerbt" #: admin/systems/class_divListSystem.inc:430 #: admin/systems/class_divListSystem.inc:431 #, php-format -msgid "Number of listed '%s'" -msgstr "Anzahl der angezeigten '%s'" +msgid "Number of listed %s" +msgstr "Anzahl der angezeigten %s" #: admin/systems/class_divListSystem.inc:427 msgid "printers" diff --git a/trunk/gosa-plugins/systems/locale/messages.po b/trunk/gosa-plugins/systems/locale/messages.po index 2be8a4352..92e6f14a2 100644 --- a/trunk/gosa-plugins/systems/locale/messages.po +++ b/trunk/gosa-plugins/systems/locale/messages.po @@ -477,7 +477,7 @@ msgstr "" #: admin/systems/class_divListSystem.inc:430 #: admin/systems/class_divListSystem.inc:431 #, php-format -msgid "Number of listed '%s'" +msgid "Number of listed %s" msgstr "" #: admin/systems/class_divListSystem.inc:427 -- 2.30.2