add optional context to translations

4 files changed, 120 insertions, 106 deletions

diff --git a/boot.php b/boot.php
index 2eb55caac..71392e673 100755
--- a/boot.php
+++ b/boot.php
@@ -53,7 +53,6 @@ define ( 'EOL',                    '<br />' . "\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
 
-
 define ( 'DIRECTORY_MODE_NORMAL',      0x0000);  // This is technically DIRECTORY_MODE_TERTIARY, but it's the default, hence 0x0000
 define ( 'DIRECTORY_MODE_PRIMARY',     0x0001);
 define ( 'DIRECTORY_MODE_SECONDARY',   0x0002);
diff --git a/include/language.php b/include/language.php
index b43f5aacc..f4c7d1524 100644
--- a/include/language.php
+++ b/include/language.php
@@ -145,10 +145,12 @@ function load_translation_table($lang, $install = false) {
 /**
  * @brief translate string if translation exists.
  *
- * @param s string that should get translated
+ * @param $s string that should get translated
+ * @param $ctx optional context to appear in po file
  * @return translated string if exsists, otherwise s
+ *
  */
-function t($s) {
+function t($s,$ctx = '') {
 	global $a;
 
 	if(x($a->strings,$s)) {
diff --git a/util/messages.po b/util/messages.po
index c92f0e5f9..3b5fd6dc2 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2014-05-16.677\n"
+"Project-Id-Version: 2014-05-20.681\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-05-16 00:02-0700\n"
+"POT-Creation-Date: 2014-05-20 20:21-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"
@@ -33,30 +33,57 @@ msgstr ""
 msgid "Matrix"
 msgstr ""
 
-#: ../../include/apps.php:107 ../../include/nav.php:161
+#: ../../include/apps.php:108 ../../include/nav.php:161
 msgid "Channel Home"
 msgstr ""
 
-#: ../../include/apps.php:107 ../../include/identity.php:942
+#: ../../include/apps.php:109 ../../include/identity.php:942
 #: ../../include/identity.php:1031 ../../mod/profperm.php:112
 msgid "Profile"
 msgstr ""
 
-#: ../../include/apps.php:108 ../../include/conversation.php:1501
+#: ../../include/apps.php:110 ../../include/conversation.php:1501
 #: ../../include/nav.php:84 ../../mod/fbrowser.php:25
 msgid "Photos"
 msgstr ""
 
-#: ../../include/apps.php:108 ../../include/conversation.php:1532
+#: ../../include/apps.php:111 ../../include/conversation.php:1532
 #: ../../include/nav.php:87 ../../include/nav.php:180 ../../mod/events.php:366
 msgid "Events"
 msgstr ""
 
-#: ../../include/apps.php:108 ../../include/nav.php:147
+#: ../../include/apps.php:112 ../../include/nav.php:147
 #: ../../mod/directory.php:210
 msgid "Directory"
 msgstr ""
 
+#: ../../include/apps.php:113 ../../include/nav.php:139 ../../mod/help.php:60
+#: ../../mod/help.php:65
+msgid "Help"
+msgstr ""
+
+#: ../../include/apps.php:146 ../../mod/settings.php:79
+#: ../../mod/settings.php:541
+msgid "Update"
+msgstr ""
+
+#: ../../include/apps.php:146
+msgid "Install"
+msgstr ""
+
+#: ../../include/apps.php:151 ../../include/ItemObject.php:108
+#: ../../include/conversation.php:632 ../../mod/admin.php:757
+#: ../../mod/admin.php:886 ../../mod/connedit.php:398
+#: ../../mod/settings.php:578 ../../mod/filestorage.php:175
+#: ../../mod/group.php:176 ../../mod/thing.php:236 ../../mod/photos.php:1043
+msgid "Delete"
+msgstr ""
+
+#: ../../include/apps.php:213 ../../include/apps.php:255
+#: ../../mod/connedit.php:434
+msgid "Unknown"
+msgstr ""
+
 #: ../../include/oembed.php:171
 msgid "Embedded content"
 msgstr ""
@@ -109,7 +136,7 @@ msgstr ""
 msgid "View"
 msgstr ""
 
-#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:570
+#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:588
 #: ../../include/conversation.php:1088 ../../mod/editblock.php:141
 #: ../../mod/editlayout.php:135 ../../mod/editpost.php:140
 #: ../../mod/editwebpage.php:175 ../../mod/webpages.php:123
@@ -356,7 +383,7 @@ msgstr ""
 msgid "Permissions"
 msgstr ""
 
-#: ../../include/acl_selectors.php:247
+#: ../../include/acl_selectors.php:247 ../../include/ItemObject.php:285
 msgid "Close"
 msgstr ""
 
@@ -475,34 +502,34 @@ msgstr ""
 msgid "Location:"
 msgstr ""
 
-#: ../../include/bbcode.php:128 ../../include/bbcode.php:633
-#: ../../include/bbcode.php:636 ../../include/bbcode.php:641
-#: ../../include/bbcode.php:644 ../../include/bbcode.php:647
-#: ../../include/bbcode.php:650 ../../include/bbcode.php:655
-#: ../../include/bbcode.php:658 ../../include/bbcode.php:663
-#: ../../include/bbcode.php:666 ../../include/bbcode.php:669
-#: ../../include/bbcode.php:672
+#: ../../include/bbcode.php:128 ../../include/bbcode.php:642
+#: ../../include/bbcode.php:645 ../../include/bbcode.php:650
+#: ../../include/bbcode.php:653 ../../include/bbcode.php:656
+#: ../../include/bbcode.php:659 ../../include/bbcode.php:664
+#: ../../include/bbcode.php:667 ../../include/bbcode.php:672
+#: ../../include/bbcode.php:675 ../../include/bbcode.php:678
+#: ../../include/bbcode.php:681
 msgid "Image/photo"
 msgstr ""
 
-#: ../../include/bbcode.php:163 ../../include/bbcode.php:683
+#: ../../include/bbcode.php:163 ../../include/bbcode.php:692
 msgid "Encrypted content"
 msgstr ""
 
-#: ../../include/bbcode.php:170
+#: ../../include/bbcode.php:179
 msgid "QR code"
 msgstr ""
 
-#: ../../include/bbcode.php:219
+#: ../../include/bbcode.php:228
 #, php-format
 msgid "%1$s wrote the following %2$s %3$s"
 msgstr ""
 
-#: ../../include/bbcode.php:221
+#: ../../include/bbcode.php:230
 msgid "post"
 msgstr ""
 
-#: ../../include/bbcode.php:601 ../../include/bbcode.php:621
+#: ../../include/bbcode.php:610 ../../include/bbcode.php:630
 msgid "$1 wrote:"
 msgstr ""
 
@@ -511,13 +538,6 @@ msgstr ""
 msgid "Private Message"
 msgstr ""
 
-#: ../../include/ItemObject.php:108 ../../include/conversation.php:632
-#: ../../mod/admin.php:757 ../../mod/admin.php:886 ../../mod/connedit.php:398
-#: ../../mod/settings.php:578 ../../mod/filestorage.php:175
-#: ../../mod/group.php:176 ../../mod/thing.php:236 ../../mod/photos.php:1043
-msgid "Delete"
-msgstr ""
-
 #: ../../include/ItemObject.php:114 ../../include/conversation.php:631
 msgid "Select"
 msgstr ""
@@ -526,111 +546,117 @@ msgstr ""
 msgid "save to folder"
 msgstr ""
 
-#: ../../include/ItemObject.php:128
+#: ../../include/ItemObject.php:130 ../../include/ItemObject.php:142
+msgid "View all"
+msgstr ""
+
+#: ../../include/ItemObject.php:134
 msgid "Like"
 msgstr ""
 
-#: ../../include/ItemObject.php:128 ../../mod/profiles.php:302
+#: ../../include/ItemObject.php:134 ../../include/ItemObject.php:279
+#: ../../mod/profiles.php:302
 msgid "Likes"
 msgstr ""
 
-#: ../../include/ItemObject.php:132
+#: ../../include/ItemObject.php:139
 msgid "Dislike"
 msgstr ""
 
-#: ../../include/ItemObject.php:132 ../../mod/profiles.php:306
+#: ../../include/ItemObject.php:139 ../../include/ItemObject.php:280
+#: ../../mod/profiles.php:306
 msgid "Dislikes"
 msgstr ""
 
-#: ../../include/ItemObject.php:154
+#: ../../include/ItemObject.php:167
 msgid "add star"
 msgstr ""
 
-#: ../../include/ItemObject.php:155
+#: ../../include/ItemObject.php:168
 msgid "remove star"
 msgstr ""
 
-#: ../../include/ItemObject.php:156
+#: ../../include/ItemObject.php:169
 msgid "toggle star status"
 msgstr ""
 
-#: ../../include/ItemObject.php:160
+#: ../../include/ItemObject.php:173
 msgid "starred"
 msgstr ""
 
-#: ../../include/ItemObject.php:169 ../../include/conversation.php:646
+#: ../../include/ItemObject.php:182 ../../include/conversation.php:646
 msgid "Message is verified"
 msgstr ""
 
-#: ../../include/ItemObject.php:177
+#: ../../include/ItemObject.php:190
 msgid "add tag"
 msgstr ""
 
-#: ../../include/ItemObject.php:192 ../../mod/photos.php:971
+#: ../../include/ItemObject.php:205 ../../mod/photos.php:971
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../include/ItemObject.php:192 ../../include/taxonomy.php:254
+#: ../../include/ItemObject.php:205 ../../include/taxonomy.php:254
 msgid "like"
 msgstr ""
 
-#: ../../include/ItemObject.php:193 ../../mod/photos.php:972
+#: ../../include/ItemObject.php:206 ../../mod/photos.php:972
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../include/ItemObject.php:193 ../../include/taxonomy.php:255
+#: ../../include/ItemObject.php:206 ../../include/taxonomy.php:255
 msgid "dislike"
 msgstr ""
 
-#: ../../include/ItemObject.php:195
+#: ../../include/ItemObject.php:208
 msgid "Share this"
 msgstr ""
 
-#: ../../include/ItemObject.php:195
+#: ../../include/ItemObject.php:208
 msgid "share"
 msgstr ""
 
-#: ../../include/ItemObject.php:219 ../../include/ItemObject.php:220
+#: ../../include/ItemObject.php:232 ../../include/ItemObject.php:233
 #, php-format
 msgid "View %s's profile - %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:221
+#: ../../include/ItemObject.php:234
 msgid "to"
 msgstr ""
 
-#: ../../include/ItemObject.php:222
+#: ../../include/ItemObject.php:235
 msgid "via"
 msgstr ""
 
-#: ../../include/ItemObject.php:223
+#: ../../include/ItemObject.php:236
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../include/ItemObject.php:224
+#: ../../include/ItemObject.php:237
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../include/ItemObject.php:234 ../../include/conversation.php:690
+#: ../../include/ItemObject.php:247 ../../include/conversation.php:690
 #, php-format
 msgid " from %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:237 ../../include/conversation.php:693
+#: ../../include/ItemObject.php:250 ../../include/conversation.php:693
 #, php-format
 msgid "last edited: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:238 ../../include/conversation.php:694
+#: ../../include/ItemObject.php:251 ../../include/conversation.php:694
 #, php-format
 msgid "Expires: %s"
 msgstr ""
 
-#: ../../include/ItemObject.php:258
+#: ../../include/ItemObject.php:271
 msgid "Bookmark Links"
 msgstr ""
 
-#: ../../include/ItemObject.php:272 ../../include/conversation.php:711
+#: ../../include/ItemObject.php:290 ../../include/conversation.php:711
 #: ../../include/conversation.php:1127 ../../mod/editblock.php:120
 #: ../../mod/editlayout.php:115 ../../mod/editpost.php:121
 #: ../../mod/editwebpage.php:152 ../../mod/mail.php:222 ../../mod/mail.php:336
@@ -638,29 +664,29 @@ msgstr ""
 msgid "Please wait"
 msgstr ""
 
-#: ../../include/ItemObject.php:293
+#: ../../include/ItemObject.php:311
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../include/ItemObject.php:294 ../../include/contact_widgets.php:130
+#: ../../include/ItemObject.php:312 ../../include/contact_widgets.php:130
 #: ../../include/js_strings.php:7
 msgid "show more"
 msgstr ""
 
-#: ../../include/ItemObject.php:558 ../../mod/photos.php:990
+#: ../../include/ItemObject.php:576 ../../mod/photos.php:990
 #: ../../mod/photos.php:1077
 msgid "This is you"
 msgstr ""
 
-#: ../../include/ItemObject.php:560 ../../include/js_strings.php:6
+#: ../../include/ItemObject.php:578 ../../include/js_strings.php:6
 #: ../../mod/photos.php:992 ../../mod/photos.php:1079
 msgid "Comment"
 msgstr ""
 
-#: ../../include/ItemObject.php:561 ../../mod/mood.php:142
+#: ../../include/ItemObject.php:579 ../../mod/mood.php:142
 #: ../../mod/admin.php:441 ../../mod/admin.php:750 ../../mod/admin.php:884
 #: ../../mod/admin.php:1017 ../../mod/admin.php:1216 ../../mod/admin.php:1303
 #: ../../mod/poke.php:166 ../../mod/profiles.php:506 ../../mod/chat.php:177
@@ -682,39 +708,39 @@ msgstr ""
 msgid "Submit"
 msgstr ""
 
-#: ../../include/ItemObject.php:562
+#: ../../include/ItemObject.php:580
 msgid "Bold"
 msgstr ""
 
-#: ../../include/ItemObject.php:563
+#: ../../include/ItemObject.php:581
 msgid "Italic"
 msgstr ""
 
-#: ../../include/ItemObject.php:564
+#: ../../include/ItemObject.php:582
 msgid "Underline"
 msgstr ""
 
-#: ../../include/ItemObject.php:565
+#: ../../include/ItemObject.php:583
 msgid "Quote"
 msgstr ""
 
-#: ../../include/ItemObject.php:566
+#: ../../include/ItemObject.php:584
 msgid "Code"
 msgstr ""
 
-#: ../../include/ItemObject.php:567
+#: ../../include/ItemObject.php:585
 msgid "Image"
 msgstr ""
 
-#: ../../include/ItemObject.php:568
+#: ../../include/ItemObject.php:586
 msgid "Link"
 msgstr ""
 
-#: ../../include/ItemObject.php:569
+#: ../../include/ItemObject.php:587
 msgid "Video"
 msgstr ""
 
-#: ../../include/ItemObject.php:573 ../../include/conversation.php:1153
+#: ../../include/ItemObject.php:591 ../../include/conversation.php:1153
 #: ../../mod/editpost.php:148 ../../mod/mail.php:228 ../../mod/mail.php:341
 msgid "Encrypt text"
 msgstr ""
@@ -842,7 +868,7 @@ msgid "RSS/Atom"
 msgstr ""
 
 #: ../../include/contact_selectors.php:77 ../../mod/admin.php:753
-#: ../../mod/admin.php:762 ../../boot.php:1454
+#: ../../mod/admin.php:762 ../../boot.php:1453
 msgid "Email"
 msgstr ""
 
@@ -1623,9 +1649,8 @@ msgstr ""
 msgid "Posts that mention or involve you"
 msgstr ""
 
-#: ../../include/conversation.php:1424 ../../include/widgets.php:83
-#: ../../mod/connections.php:211 ../../mod/connections.php:224
-#: ../../mod/menu.php:61
+#: ../../include/conversation.php:1424 ../../mod/connections.php:211
+#: ../../mod/connections.php:224 ../../mod/menu.php:61
 msgid "New"
 msgstr ""
 
@@ -2683,7 +2708,7 @@ msgstr ""
 msgid "Stored post could not be verified."
 msgstr ""
 
-#: ../../include/nav.php:77 ../../include/nav.php:96 ../../boot.php:1451
+#: ../../include/nav.php:77 ../../include/nav.php:96 ../../boot.php:1450
 msgid "Logout"
 msgstr ""
 
@@ -2739,7 +2764,7 @@ msgstr ""
 msgid "Your webpages"
 msgstr ""
 
-#: ../../include/nav.php:94 ../../boot.php:1452
+#: ../../include/nav.php:94 ../../boot.php:1451
 msgid "Login"
 msgstr ""
 
@@ -2760,7 +2785,7 @@ msgstr ""
 msgid "Home Page"
 msgstr ""
 
-#: ../../include/nav.php:134 ../../mod/register.php:206 ../../boot.php:1428
+#: ../../include/nav.php:134 ../../mod/register.php:206 ../../boot.php:1427
 msgid "Register"
 msgstr ""
 
@@ -2768,15 +2793,11 @@ msgstr ""
 msgid "Create an account"
 msgstr ""
 
-#: ../../include/nav.php:139 ../../mod/help.php:60 ../../mod/help.php:65
-msgid "Help"
-msgstr ""
-
 #: ../../include/nav.php:139
 msgid "Help and documentation"
 msgstr ""
 
-#: ../../include/nav.php:142 ../../mod/apps.php:17
+#: ../../include/nav.php:142 ../../mod/apps.php:17 ../../mod/apps.php:35
 msgid "Apps"
 msgstr ""
 
@@ -3181,10 +3202,6 @@ msgstr ""
 msgid "System"
 msgstr ""
 
-#: ../../include/widgets.php:82
-msgid "Featured"
-msgstr ""
-
 #: ../../include/widgets.php:129 ../../mod/suggest.php:53
 msgid "Ignore/Hide"
 msgstr ""
@@ -5053,10 +5070,6 @@ msgstr ""
 msgid "Delete this connection"
 msgstr ""
 
-#: ../../mod/connedit.php:434
-msgid "Unknown"
-msgstr ""
-
 #: ../../mod/connedit.php:444 ../../mod/connedit.php:473
 msgid "Approve this connection"
 msgstr ""
@@ -5332,10 +5345,6 @@ msgstr ""
 msgid "Key and Secret are required"
 msgstr ""
 
-#: ../../mod/settings.php:79 ../../mod/settings.php:541
-msgid "Update"
-msgstr ""
-
 #: ../../mod/settings.php:195
 msgid "Passwords do not match. Password unchanged."
 msgstr ""
@@ -6853,7 +6862,7 @@ msgid ""
 "Password reset failed."
 msgstr ""
 
-#: ../../mod/lostpass.php:85 ../../boot.php:1462
+#: ../../mod/lostpass.php:85 ../../boot.php:1461
 msgid "Password Reset"
 msgstr ""
 
@@ -7325,6 +7334,10 @@ msgstr ""
 msgid "OpenID protocol error. No ID returned."
 msgstr ""
 
+#: ../../mod/appman.php:13
+msgid "Malformed app."
+msgstr ""
+
 #: ../../view/theme/apw/php/config.php:202
 #: ../../view/theme/apw/php/config.php:236
 msgid "Schema Default"
@@ -7606,41 +7619,41 @@ msgstr ""
 msgid "Are you a clean desk or a messy desk person?"
 msgstr ""
 
-#: ../../boot.php:1260
+#: ../../boot.php:1259
 #, php-format
 msgid "Update %s failed. See error logs."
 msgstr ""
 
-#: ../../boot.php:1263
+#: ../../boot.php:1262
 #, php-format
 msgid "Update Error at %s"
 msgstr ""
 
-#: ../../boot.php:1427
+#: ../../boot.php:1426
 msgid ""
 "Create an account to access services and applications within the Red Matrix"
 msgstr ""
 
-#: ../../boot.php:1455
+#: ../../boot.php:1454
 msgid "Password"
 msgstr ""
 
-#: ../../boot.php:1456
+#: ../../boot.php:1455
 msgid "Remember me"
 msgstr ""
 
-#: ../../boot.php:1461
+#: ../../boot.php:1460
 msgid "Forgot your password?"
 msgstr ""
 
-#: ../../boot.php:1526
+#: ../../boot.php:1525
 msgid "permission denied"
 msgstr ""
 
-#: ../../boot.php:1527
+#: ../../boot.php:1526
 msgid "Got Zot?"
 msgstr ""
 
-#: ../../boot.php:1957
+#: ../../boot.php:1956
 msgid "toggle mobile"
 msgstr ""
diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh
index 3be355c44..6fef46f67 100755
--- a/util/run_xgettext.sh
+++ b/util/run_xgettext.sh
@@ -44,7 +44,7 @@ OPTS=
 #	fi
 #fi
 
-KEYWORDS="-k -kt -ktt:1,2"
+KEYWORDS="-k -kt:1 -kt:1,2c,2t -ktt:1,2"
 
 echo "extract strings to $OUTFILE.."