Browse Source

rev update - add cancel markup to editor

pull/483/head
friendica 9 years ago
parent
commit
669d2b890e
  1. 2
      boot.php
  2. 1
      include/conversation.php
  3. 1
      mod/editpost.php
  4. 204
      util/messages.po

2
boot.php

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1465' );
define ( 'FRIENDICA_VERSION', '3.0.1467' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1155 );

1
include/conversation.php

@ -1280,6 +1280,7 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) {
'$profile_uid' => $x['profile_uid'],
'$preview' => t('Preview'),
'$sourceapp' => t($a->sourcename),
'$cancel' => t('Cancel')
));

1
mod/editpost.php

@ -133,6 +133,7 @@ function editpost_content(&$a) {
'$preview' => t('Preview'),
'$jotplugins' => $jotplugins,
'$sourceapp' => t($a->sourcename),
'$cancel' => t('Cancel')
));
return $o;

204
util/messages.po

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.0.1465\n"
"Project-Id-Version: 3.0.1467\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-09-13 10:00-0700\n"
"POT-Creation-Date: 2012-09-15 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -176,7 +176,7 @@ msgstr ""
#: ../../view/theme/diabook/theme.php:757
#: ../../view/theme/diabook/config.php:190
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:591 ../../object/Item.php:532
#: ../../include/conversation.php:601 ../../object/Item.php:532
msgid "Submit"
msgstr ""
@ -236,7 +236,7 @@ msgid "link to source"
msgstr ""
#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
#: ../../include/nav.php:52 ../../boot.php:1683
#: ../../include/nav.php:52 ../../boot.php:1689
msgid "Events"
msgstr ""
@ -374,7 +374,7 @@ msgstr ""
msgid "No"
msgstr ""
#: ../../mod/photos.php:46 ../../boot.php:1676
#: ../../mod/photos.php:46 ../../boot.php:1682
msgid "Photo Albums"
msgstr ""
@ -404,8 +404,8 @@ msgstr ""
#: ../../mod/profile_photo.php:204 ../../mod/profile_photo.php:296
#: ../../mod/profile_photo.php:305
#: ../../addon/communityhome/communityhome.php:111
#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:318
#: ../../include/user.php:325 ../../include/user.php:332
#: ../../view/theme/diabook/theme.php:599 ../../include/user.php:324
#: ../../include/user.php:331 ../../include/user.php:338
msgid "Profile Photos"
msgstr ""
@ -577,51 +577,51 @@ msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
#: ../../mod/photos.php:1356 ../../mod/content.php:665
#: ../../include/conversation.php:565 ../../object/Item.php:185
#: ../../include/conversation.php:575 ../../object/Item.php:185
msgid "I like this (toggle)"
msgstr ""
#: ../../mod/photos.php:1357 ../../mod/content.php:666
#: ../../include/conversation.php:566 ../../object/Item.php:186
#: ../../include/conversation.php:576 ../../object/Item.php:186
msgid "I don't like this (toggle)"
msgstr ""
#: ../../mod/photos.php:1358 ../../include/conversation.php:1214
#: ../../mod/photos.php:1358 ../../include/conversation.php:1244
msgid "Share"
msgstr ""
#: ../../mod/photos.php:1359 ../../mod/editpost.php:112
#: ../../mod/content.php:482 ../../mod/content.php:843
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:481 ../../include/conversation.php:659
#: ../../include/conversation.php:891 ../../include/conversation.php:1233
#: ../../mod/message.php:481 ../../include/conversation.php:671
#: ../../include/conversation.php:921 ../../include/conversation.php:1263
#: ../../object/Item.php:237
msgid "Please wait"
msgstr ""
#: ../../mod/photos.php:1375 ../../mod/photos.php:1416
#: ../../mod/photos.php:1448 ../../mod/content.php:688
#: ../../include/conversation.php:588 ../../object/Item.php:529
#: ../../include/conversation.php:598 ../../object/Item.php:529
msgid "This is you"
msgstr ""
#: ../../mod/photos.php:1377 ../../mod/photos.php:1418
#: ../../mod/photos.php:1450 ../../mod/content.php:690
#: ../../include/conversation.php:590 ../../boot.php:574
#: ../../include/conversation.php:600 ../../boot.php:574
#: ../../object/Item.php:531
msgid "Comment"
msgstr ""
#: ../../mod/photos.php:1379 ../../mod/editpost.php:133
#: ../../mod/content.php:700 ../../include/conversation.php:600
#: ../../include/conversation.php:1251 ../../object/Item.php:541
#: ../../mod/content.php:700 ../../include/conversation.php:610
#: ../../include/conversation.php:1281 ../../object/Item.php:541
msgid "Preview"
msgstr ""
#: ../../mod/photos.php:1479 ../../mod/content.php:439
#: ../../mod/content.php:721 ../../mod/settings.php:606
#: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:694
#: ../../include/conversation.php:440 ../../include/conversation.php:847
#: ../../include/conversation.php:440 ../../include/conversation.php:874
#: ../../object/Item.php:116
msgid "Delete"
msgstr ""
@ -688,7 +688,7 @@ msgstr ""
msgid "Edit post"
msgstr ""
#: ../../mod/editpost.php:88 ../../include/conversation.php:1200
#: ../../mod/editpost.php:88 ../../include/conversation.php:1230
msgid "Post to Email"
msgstr ""
@ -700,17 +700,17 @@ msgstr ""
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:478
#: ../../include/conversation.php:1215
#: ../../include/conversation.php:1245
msgid "Upload photo"
msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:1217
#: ../../mod/editpost.php:105 ../../include/conversation.php:1247
msgid "Attach file"
msgstr ""
#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:479
#: ../../include/conversation.php:1219
#: ../../include/conversation.php:1249
msgid "Insert web link"
msgstr ""
@ -726,35 +726,35 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio"
msgstr ""
#: ../../mod/editpost.php:110 ../../include/conversation.php:1225
#: ../../mod/editpost.php:110 ../../include/conversation.php:1255
msgid "Set your location"
msgstr ""
#: ../../mod/editpost.php:111 ../../include/conversation.php:1227
#: ../../mod/editpost.php:111 ../../include/conversation.php:1257
msgid "Clear browser location"
msgstr ""
#: ../../mod/editpost.php:113 ../../include/conversation.php:1234
#: ../../mod/editpost.php:113 ../../include/conversation.php:1264
msgid "Permission settings"
msgstr ""
#: ../../mod/editpost.php:121 ../../include/conversation.php:1243
#: ../../mod/editpost.php:121 ../../include/conversation.php:1273
msgid "CC: email addresses"
msgstr ""
#: ../../mod/editpost.php:122 ../../include/conversation.php:1244
#: ../../mod/editpost.php:122 ../../include/conversation.php:1274
msgid "Public post"
msgstr ""
#: ../../mod/editpost.php:125 ../../include/conversation.php:1230
#: ../../mod/editpost.php:125 ../../include/conversation.php:1260
msgid "Set title"
msgstr ""
#: ../../mod/editpost.php:127 ../../include/conversation.php:1232
#: ../../mod/editpost.php:127 ../../include/conversation.php:1262
msgid "Categories (comma-separated list)"
msgstr ""
#: ../../mod/editpost.php:128 ../../include/conversation.php:1246
#: ../../mod/editpost.php:128 ../../include/conversation.php:1276
msgid "Example: bob@example.com, mary@example.com"
msgstr ""
@ -1296,31 +1296,31 @@ msgid "Group: "
msgstr ""
#: ../../mod/content.php:438 ../../mod/content.php:720
#: ../../include/conversation.php:439 ../../include/conversation.php:846
#: ../../include/conversation.php:439 ../../include/conversation.php:873
#: ../../object/Item.php:115
msgid "Select"
msgstr ""
#: ../../mod/content.php:455 ../../mod/content.php:813
#: ../../mod/content.php:814 ../../include/conversation.php:627
#: ../../include/conversation.php:628 ../../include/conversation.php:863
#: ../../mod/content.php:814 ../../include/conversation.php:639
#: ../../include/conversation.php:640 ../../include/conversation.php:890
#: ../../object/Item.php:206 ../../object/Item.php:207
#, php-format
msgid "View %s's profile @ %s"
msgstr ""
#: ../../mod/content.php:465 ../../mod/content.php:825
#: ../../include/conversation.php:641 ../../include/conversation.php:874
#: ../../include/conversation.php:653 ../../include/conversation.php:904
#: ../../object/Item.php:219
#, php-format
msgid "%s from %s"
msgstr ""
#: ../../mod/content.php:480 ../../include/conversation.php:889
#: ../../mod/content.php:480 ../../include/conversation.php:919
msgid "View in context"
msgstr ""
#: ../../mod/content.php:586 ../../include/conversation.php:668
#: ../../mod/content.php:586 ../../include/conversation.php:680
#: ../../object/Item.php:256
#, php-format
msgid "%d comment"
@ -1330,92 +1330,92 @@ msgstr[1] ""
#: ../../mod/content.php:587 ../../addon/page/page.php:76
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:195 ../../include/conversation.php:669
#: ../../include/contact_widgets.php:195 ../../include/conversation.php:681
#: ../../boot.php:575 ../../object/Item.php:257
msgid "show more"
msgstr ""
#: ../../mod/content.php:665 ../../include/conversation.php:565
#: ../../mod/content.php:665 ../../include/conversation.php:575
#: ../../object/Item.php:185
msgid "like"
msgstr ""
#: ../../mod/content.php:666 ../../include/conversation.php:566
#: ../../mod/content.php:666 ../../include/conversation.php:576
#: ../../object/Item.php:186
msgid "dislike"
msgstr ""
#: ../../mod/content.php:668 ../../include/conversation.php:568
#: ../../mod/content.php:668 ../../include/conversation.php:578
#: ../../object/Item.php:188
msgid "Share this"
msgstr ""
#: ../../mod/content.php:668 ../../include/conversation.php:568
#: ../../mod/content.php:668 ../../include/conversation.php:578
#: ../../object/Item.php:188
msgid "share"
msgstr ""
#: ../../mod/content.php:692 ../../include/conversation.php:592
#: ../../mod/content.php:692 ../../include/conversation.php:602
#: ../../object/Item.php:533
msgid "Bold"
msgstr ""
#: ../../mod/content.php:693 ../../include/conversation.php:593
#: ../../mod/content.php:693 ../../include/conversation.php:603
#: ../../object/Item.php:534
msgid "Italic"
msgstr ""
#: ../../mod/content.php:694 ../../include/conversation.php:594
#: ../../mod/content.php:694 ../../include/conversation.php:604
#: ../../object/Item.php:535
msgid "Underline"
msgstr ""
#: ../../mod/content.php:695 ../../include/conversation.php:595
#: ../../mod/content.php:695 ../../include/conversation.php:605
#: ../../object/Item.php:536
msgid "Quote"
msgstr ""
#: ../../mod/content.php:696 ../../include/conversation.php:596
#: ../../mod/content.php:696 ../../include/conversation.php:606
#: ../../object/Item.php:537
msgid "Code"
msgstr ""
#: ../../mod/content.php:697 ../../include/conversation.php:597
#: ../../mod/content.php:697 ../../include/conversation.php:607
#: ../../object/Item.php:538
msgid "Image"
msgstr ""
#: ../../mod/content.php:698 ../../include/conversation.php:598
#: ../../mod/content.php:698 ../../include/conversation.php:608
#: ../../object/Item.php:539
msgid "Link"
msgstr ""
#: ../../mod/content.php:699 ../../include/conversation.php:599
#: ../../mod/content.php:699 ../../include/conversation.php:609
#: ../../object/Item.php:540
msgid "Video"
msgstr ""
#: ../../mod/content.php:733 ../../include/conversation.php:529
#: ../../mod/content.php:733 ../../include/conversation.php:539
#: ../../object/Item.php:169
msgid "add star"
msgstr ""
#: ../../mod/content.php:734 ../../include/conversation.php:530
#: ../../mod/content.php:734 ../../include/conversation.php:540
#: ../../object/Item.php:170
msgid "remove star"
msgstr ""
#: ../../mod/content.php:735 ../../include/conversation.php:531
#: ../../mod/content.php:735 ../../include/conversation.php:541
#: ../../object/Item.php:171
msgid "toggle star status"
msgstr ""
#: ../../mod/content.php:738 ../../include/conversation.php:534
#: ../../mod/content.php:738 ../../include/conversation.php:544
#: ../../object/Item.php:174
msgid "starred"
msgstr ""
#: ../../mod/content.php:739 ../../include/conversation.php:535
#: ../../mod/content.php:739 ../../include/conversation.php:545
#: ../../object/Item.php:175
msgid "add tag"
msgstr ""
@ -1425,17 +1425,17 @@ msgstr ""
msgid "save to folder"
msgstr ""
#: ../../mod/content.php:815 ../../include/conversation.php:629
#: ../../mod/content.php:815 ../../include/conversation.php:641
#: ../../object/Item.php:208
msgid "to"
msgstr ""
#: ../../mod/content.php:816 ../../include/conversation.php:630
#: ../../mod/content.php:816 ../../include/conversation.php:642
#: ../../object/Item.php:209
msgid "Wall-to-Wall"
msgstr ""
#: ../../mod/content.php:817 ../../include/conversation.php:631
#: ../../mod/content.php:817 ../../include/conversation.php:643
#: ../../object/Item.php:210
msgid "via Wall-To-Wall:"
msgstr ""
@ -2642,7 +2642,7 @@ msgstr ""
msgid "Invalid contact."
msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1690
#: ../../mod/notes.php:44 ../../boot.php:1696
msgid "Personal Notes"
msgstr ""
@ -2686,7 +2686,7 @@ msgstr ""
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:1151 ../../include/conversation.php:1168
#: ../../include/conversation.php:1181 ../../include/conversation.php:1198
msgid "Please enter a link URL:"
msgstr ""
@ -2769,7 +2769,7 @@ msgstr ""
#: ../../mod/newmember.php:32 ../../mod/profperm.php:103
#: ../../view/theme/diabook/theme.php:128 ../../include/profile_advanced.php:7
#: ../../include/profile_advanced.php:84 ../../include/nav.php:50
#: ../../boot.php:1666
#: ../../boot.php:1672
msgid "Profile"
msgstr ""
@ -3121,7 +3121,7 @@ msgid "Access denied."
msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
#: ../../include/nav.php:51 ../../boot.php:1673
#: ../../include/nav.php:51 ../../boot.php:1679
msgid "Photos"
msgstr ""
@ -3635,13 +3635,13 @@ msgid "Allow infinite level threading for items on this site."
msgstr ""
#: ../../mod/admin.php:470
msgid "No default permissions for new users"
msgid "Private posts by default for new users"
msgstr ""
#: ../../mod/admin.php:470
msgid ""
"New users will have no private permissions set for their posts by default, "
"making their posts public until they change it."
"Set default post permissions for all new members to the default privacy "
"group rather than public."
msgstr ""
#: ../../mod/admin.php:472
@ -4407,8 +4407,8 @@ msgstr ""
msgid "Edit visibility"
msgstr ""
#: ../../mod/filer.php:29 ../../include/conversation.php:1155
#: ../../include/conversation.php:1172
#: ../../mod/filer.php:29 ../../include/conversation.php:1185
#: ../../include/conversation.php:1202
msgid "Save to Folder:"
msgstr ""
@ -7480,7 +7480,7 @@ msgid "Sex Addict"
msgstr ""
#: ../../include/profile_selectors.php:42 ../../include/user.php:278
#: ../../include/user.php:283
#: ../../include/user.php:282
msgid "Friends"
msgstr ""
@ -7902,7 +7902,7 @@ msgstr ""
msgid "End this session"
msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1659
#: ../../include/nav.php:49 ../../boot.php:1665
msgid "Status"
msgstr ""
@ -8513,34 +8513,34 @@ msgstr ""
msgid "stopped following"
msgstr ""
#: ../../include/Contact.php:220 ../../include/conversation.php:1052
#: ../../include/Contact.php:220 ../../include/conversation.php:1082
msgid "Poke"
msgstr ""
#: ../../include/Contact.php:221 ../../include/conversation.php:1046
#: ../../include/Contact.php:221 ../../include/conversation.php:1076
msgid "View Status"
msgstr ""
#: ../../include/Contact.php:222 ../../include/conversation.php:1047
#: ../../include/Contact.php:222 ../../include/conversation.php:1077
msgid "View Profile"
msgstr ""
#: ../../include/Contact.php:223 ../../include/conversation.php:1048
#: ../../include/Contact.php:223 ../../include/conversation.php:1078
msgid "View Photos"
msgstr ""
#: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:1049
#: ../../include/conversation.php:1079
msgid "Network Posts"
msgstr ""
#: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:1050
#: ../../include/conversation.php:1080
msgid "Edit Contact"
msgstr ""
#: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:1051
#: ../../include/conversation.php:1081
msgid "Send PM"
msgstr ""
@ -8558,106 +8558,106 @@ msgstr ""
msgid "%1$s marked %2$s's %3$s as favorite"
msgstr ""
#: ../../include/conversation.php:952
#: ../../include/conversation.php:982
msgid "Delete Selected Items"
msgstr ""
#: ../../include/conversation.php:1110
#: ../../include/conversation.php:1140
#, php-format
msgid "%s likes this."
msgstr ""
#: ../../include/conversation.php:1110
#: ../../include/conversation.php:1140
#, php-format
msgid "%s doesn't like this."
msgstr ""
#: ../../include/conversation.php:1114
#: ../../include/conversation.php:1144
#, php-format
msgid "<span %1$s>%2$d people</span> like this."
msgstr ""
#: ../../include/conversation.php:1116
#: ../../include/conversation.php:1146
#, php-format
msgid "<span %1$s>%2$d people</span> don't like this."
msgstr ""
#: ../../include/conversation.php:1122
#: ../../include/conversation.php:1152
msgid "and"
msgstr ""
#: ../../include/conversation.php:1125
#: ../../include/conversation.php:1155
#, php-format
msgid ", and %d other people"
msgstr ""
#: ../../include/conversation.php:1126
#: ../../include/conversation.php:1156
#, php-format
msgid "%s like this."
msgstr ""
#: ../../include/conversation.php:1126
#: ../../include/conversation.php:1156
#, php-format
msgid "%s don't like this."
msgstr ""
#: ../../include/conversation.php:1150 ../../include/conversation.php:1167
#: ../../include/conversation.php:1180 ../../include/conversation.php:1197
msgid "Visible to <strong>everybody</strong>"
msgstr ""
#: ../../include/conversation.php:1152 ../../include/conversation.php:1169
#: ../../include/conversation.php:1182 ../../include/conversation.php:1199
msgid "Please enter a video link/URL:"
msgstr ""
#: ../../include/conversation.php:1153 ../../include/conversation.php:1170
#: ../../include/conversation.php:1183 ../../include/conversation.php:1200
msgid "Please enter an audio link/URL:"
msgstr ""
#: ../../include/conversation.php:1154 ../../include/conversation.php:1171
#: ../../include/conversation.php:1184 ../../include/conversation.php:1201
msgid "Tag term:"
msgstr ""
#: ../../include/conversation.php:1156 ../../include/conversation.php:1173
#: ../../include/conversation.php:1186 ../../include/conversation.php:1203
msgid "Where are you right now?"
msgstr ""
#: ../../include/conversation.php:1216
#: ../../include/conversation.php:1246
msgid "upload photo"
msgstr ""
#: ../../include/conversation.php:1218
#: ../../include/conversation.php:1248
msgid "attach file"
msgstr ""
#: ../../include/conversation.php:1220
#: ../../include/conversation.php:1250
msgid "web link"
msgstr ""
#: ../../include/conversation.php:1221
#: ../../include/conversation.php:1251
msgid "Insert video link"
msgstr ""
#: ../../include/conversation.php:1222
#: ../../include/conversation.php:1252
msgid "video link"
msgstr ""
#: ../../include/conversation.php:1223
#: ../../include/conversation.php:1253
msgid "Insert audio link"
msgstr ""
#: ../../include/conversation.php:1224
#: ../../include/conversation.php:1254
msgid "audio link"
msgstr ""
#: ../../include/conversation.php:1226
#: ../../include/conversation.php:1256
msgid "set location"
msgstr ""
#: ../../include/conversation.php:1228
#: ../../include/conversation.php:1258
msgid "clear location"
msgstr ""
#: ../../include/conversation.php:1235
#: ../../include/conversation.php:1265
msgid "permissions"
msgstr ""
@ -8755,18 +8755,18 @@ msgstr ""
msgid "Events this week:"
msgstr ""
#: ../../boot.php:1662
#: ../../boot.php:1668
msgid "Status Messages and Posts"
msgstr ""
#: ../../boot.php:1669
#: ../../boot.php:1675
msgid "Profile Details"
msgstr ""
#: ../../boot.php:1686
#: ../../boot.php:1692
msgid "Events and Calendar"
msgstr ""
#: ../../boot.php:1693
#: ../../boot.php:1699
msgid "Only You Can See This"
msgstr ""
Loading…
Cancel
Save