aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorgit-marijus <mario@mariovavti.com>2014-12-09 11:55:55 +0100
committergit-marijus <mario@mariovavti.com>2014-12-09 11:55:55 +0100
commit1138e41de2352f30bafc7a9973b9f0e472c7d20f (patch)
treed0195d8d3f30f423b6f2a67d0f8fd61f48c63957
parent81f3b206106b4f46c980a5cb04271752eb415b72 (diff)
parent97d1072f9bc39b47769576e5885c04a5f1bacd9a (diff)
downloadvolse-hubzilla-1138e41de2352f30bafc7a9973b9f0e472c7d20f.tar.gz
volse-hubzilla-1138e41de2352f30bafc7a9973b9f0e472c7d20f.tar.bz2
volse-hubzilla-1138e41de2352f30bafc7a9973b9f0e472c7d20f.zip
Merge pull request #733 from pafcu/rewordoptional
Make it clear that title and categories are optional
-rw-r--r--include/conversation.php4
-rw-r--r--mod/editblock.php4
-rw-r--r--mod/editlayout.php4
-rw-r--r--mod/editpost.php4
-rw-r--r--mod/editwebpage.php4
5 files changed, 10 insertions, 10 deletions
diff --git a/include/conversation.php b/include/conversation.php
index 6b3e278f0..c8336900f 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -1131,10 +1131,10 @@ function status_editor($a,$x,$popup=false) {
'$noloc' => t('Clear browser location'),
'$shortnoloc' => t('clear location'),
'$title' => ((x($x,'title')) ? htmlspecialchars($x['title'], ENT_COMPAT,'UTF-8') : ''),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => t('Title (optional)'),
'$catsenabled' => ((feature_enabled($x['profile_uid'],'categories') && (! $webpage)) ? 'categories' : ''),
'$category' => "",
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$wait' => t('Please wait'),
'$permset' => t('Permission settings'),
'$shortpermset' => t('permissions'),
diff --git a/mod/editblock.php b/mod/editblock.php
index c58a93410..33d4c8b1a 100644
--- a/mod/editblock.php
+++ b/mod/editblock.php
@@ -161,10 +161,10 @@ function editblock_content(&$a) {
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => t('Title (optional)'),
'$pagetitle' => $block_title,
'$category' => '',
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '',
diff --git a/mod/editlayout.php b/mod/editlayout.php
index 94e2e628c..01f439cb2 100644
--- a/mod/editlayout.php
+++ b/mod/editlayout.php
@@ -156,10 +156,10 @@ function editlayout_content(&$a) {
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => t('Title (optional)'),
'$pagetitle' => $layout_title,
'$category' => '',
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '',
diff --git a/mod/editpost.php b/mod/editpost.php
index ed7fcff8a..26e3c7139 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -129,9 +129,9 @@ function editpost_content(&$a) {
'$public' => t('Public post'),
'$jotnets' => $jotnets,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => t('Title (optional)'),
'$category' => $category,
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'$lockstate' => $lockstate,
'$acl' => '',
diff --git a/mod/editwebpage.php b/mod/editwebpage.php
index 2acb3bd84..1b1268914 100644
--- a/mod/editwebpage.php
+++ b/mod/editwebpage.php
@@ -195,9 +195,9 @@ function editwebpage_content(&$a) {
'$mimeselect' => $mimeselect,
'$layoutselect' => $layoutselect,
'$title' => htmlspecialchars($itm[0]['title'],ENT_COMPAT,'UTF-8'),
- '$placeholdertitle' => t('Set title'),
+ '$placeholdertitle' => t('Title (optional)'),
'$category' => '',
- '$placeholdercategory' => t('Categories (comma-separated list)'),
+ '$placeholdercategory' => t('Categories (optional, comma-separated list)'),
'$emtitle' => t('Example: bob@example.com, mary@example.com'),
'lockstate' => (((strlen($itm[0]['allow_cid'])) || (strlen($itm[0]['allow_gid'])) || (strlen($itm[0]['deny_cid'])) || (strlen($itm[0]['deny_gid']))) ? 'lock' : 'unlock'),
'$bang' => '',