Merge pull request #2903 from tobiasd/20161110-messagespo

regenerated master messages.po file

util/messages.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2016-11-06 16:00+0100\n"
+"POT-Creation-Date: 2016-11-10 15:43+0100\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"
@@ -51,8 +51,8 @@ msgstr ""
 msgid "Enter name or interest"
 msgstr ""
 
-#: include/contact_widgets.php:32 include/Contact.php:325
+#: include/contact_widgets.php:32 include/conversation.php:981
-#: include/conversation.php:981 mod/follow.php:103 mod/allfriends.php:66
+#: include/Contact.php:347 mod/follow.php:103 mod/allfriends.php:66
 #: mod/contacts.php:602 mod/dirfind.php:204 mod/match.php:72
 #: mod/suggest.php:83
 msgid "Connect/Follow"
@@ -1146,57 +1146,6 @@ msgstr ""
 msgid "noreply"
 msgstr ""
 
-#: include/Contact.php:119
-msgid "stopped following"
-msgstr ""
-
-#: include/Contact.php:311 include/Contact.php:324 include/Contact.php:369
-#: include/conversation.php:968 include/conversation.php:984
-#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
-#: mod/match.php:71 mod/suggest.php:82
-msgid "View Profile"
-msgstr ""
-
-#: include/Contact.php:368 include/conversation.php:967
-msgid "View Status"
-msgstr ""
-
-#: include/Contact.php:370 include/conversation.php:969
-msgid "View Photos"
-msgstr ""
-
-#: include/Contact.php:371 include/conversation.php:970
-msgid "Network Posts"
-msgstr ""
-
-#: include/Contact.php:372 include/conversation.php:971
-msgid "View Contact"
-msgstr ""
-
-#: include/Contact.php:373
-msgid "Drop Contact"
-msgstr ""
-
-#: include/Contact.php:374 include/conversation.php:972
-msgid "Send PM"
-msgstr ""
-
-#: include/Contact.php:375 include/conversation.php:976
-msgid "Poke"
-msgstr ""
-
-#: include/Contact.php:748
-msgid "Organisation"
-msgstr ""
-
-#: include/Contact.php:751
-msgid "News"
-msgstr ""
-
-#: include/Contact.php:754
-msgid "Forum"
-msgstr ""
-
 #: include/api.php:1019
 #, php-format
 msgid "Daily posting limit of %d posts reached. The post was rejected."
@@ -1353,6 +1302,37 @@ msgstr ""
 msgid "Follow Thread"
 msgstr ""
 
+#: include/conversation.php:967 include/Contact.php:390
+msgid "View Status"
+msgstr ""
+
+#: include/conversation.php:968 include/conversation.php:984
+#: include/Contact.php:333 include/Contact.php:346 include/Contact.php:391
+#: mod/allfriends.php:65 mod/directory.php:155 mod/dirfind.php:203
+#: mod/match.php:71 mod/suggest.php:82
+msgid "View Profile"
+msgstr ""
+
+#: include/conversation.php:969 include/Contact.php:392
+msgid "View Photos"
+msgstr ""
+
+#: include/conversation.php:970 include/Contact.php:393
+msgid "Network Posts"
+msgstr ""
+
+#: include/conversation.php:971 include/Contact.php:394
+msgid "View Contact"
+msgstr ""
+
+#: include/conversation.php:972 include/Contact.php:396
+msgid "Send PM"
+msgstr ""
+
+#: include/conversation.php:976 include/Contact.php:397
+msgid "Poke"
+msgstr ""
+
 #: include/conversation.php:1094
 #, php-format
 msgid "%s likes this."
@@ -1564,8 +1544,8 @@ msgstr ""
 #: mod/fbrowser.php:136 mod/tagrm.php:11 mod/tagrm.php:94 mod/follow.php:121
 #: mod/editpost.php:148 mod/message.php:220 mod/dfrn_request.php:875
 #: mod/contacts.php:445 mod/photos.php:235 mod/photos.php:322
-#: mod/settings.php:677 mod/settings.php:703 mod/suggest.php:32
+#: mod/suggest.php:32 mod/videos.php:128 mod/settings.php:677
-#: mod/videos.php:128
+#: mod/settings.php:703
 msgid "Cancel"
 msgstr ""
 
@@ -2554,11 +2534,11 @@ msgstr ""
 #: include/items.php:1914 mod/follow.php:110 mod/api.php:105
 #: mod/message.php:217 mod/dfrn_request.php:861 mod/profiles.php:648
 #: mod/profiles.php:651 mod/profiles.php:677 mod/contacts.php:442
-#: mod/register.php:238 mod/settings.php:1158 mod/settings.php:1164
+#: mod/register.php:238 mod/suggest.php:29 mod/settings.php:1158
-#: mod/settings.php:1172 mod/settings.php:1176 mod/settings.php:1181
+#: mod/settings.php:1164 mod/settings.php:1172 mod/settings.php:1176
-#: mod/settings.php:1187 mod/settings.php:1193 mod/settings.php:1199
+#: mod/settings.php:1181 mod/settings.php:1187 mod/settings.php:1193
-#: mod/settings.php:1225 mod/settings.php:1226 mod/settings.php:1227
+#: mod/settings.php:1199 mod/settings.php:1225 mod/settings.php:1226
-#: mod/settings.php:1228 mod/settings.php:1229 mod/suggest.php:29
+#: mod/settings.php:1227 mod/settings.php:1228 mod/settings.php:1229
 msgid "Yes"
 msgstr ""
 
@@ -2579,8 +2559,8 @@ msgstr ""
 #: mod/contacts.php:350 mod/dirfind.php:11 mod/display.php:475
 #: mod/events.php:190 mod/item.php:198 mod/item.php:210 mod/network.php:4
 #: mod/photos.php:159 mod/photos.php:1072 mod/register.php:42
-#: mod/settings.php:22 mod/settings.php:128 mod/settings.php:663
+#: mod/suggest.php:58 mod/viewcontacts.php:45 mod/settings.php:22
-#: mod/suggest.php:58 mod/viewcontacts.php:45 index.php:397
+#: mod/settings.php:128 mod/settings.php:663 index.php:397
 msgid "Permission denied."
 msgstr ""
 
@@ -3075,6 +3055,26 @@ msgstr ""
 msgid "Item filed"
 msgstr ""
 
+#: include/Contact.php:119
+msgid "stopped following"
+msgstr ""
+
+#: include/Contact.php:395
+msgid "Drop Contact"
+msgstr ""
+
+#: include/Contact.php:770
+msgid "Organisation"
+msgstr ""
+
+#: include/Contact.php:773
+msgid "News"
+msgstr ""
+
+#: include/Contact.php:776
+msgid "Forum"
+msgstr ""
+
 #: mod/oexchange.php:25
 msgid "Post successful."
 msgstr ""
@@ -7861,6 +7861,49 @@ msgstr ""
 msgid "Import your profile to this friendica instance"
 msgstr ""
 
+#: mod/suggest.php:27
+msgid "Do you really want to delete this suggestion?"
+msgstr ""
+
+#: mod/suggest.php:71
+msgid ""
+"No suggestions available. If this is a new site, please try again in 24 "
+"hours."
+msgstr ""
+
+#: mod/suggest.php:84 mod/suggest.php:104
+msgid "Ignore/Hide"
+msgstr ""
+
+#: mod/update_community.php:19 mod/update_display.php:23
+#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
+msgid "[Embedded content - reload page to view]"
+msgstr ""
+
+#: mod/videos.php:120
+msgid "Do you really want to delete this video?"
+msgstr ""
+
+#: mod/videos.php:125
+msgid "Delete Video"
+msgstr ""
+
+#: mod/videos.php:204
+msgid "No videos selected"
+msgstr ""
+
+#: mod/videos.php:396
+msgid "Recent Videos"
+msgstr ""
+
+#: mod/videos.php:398
+msgid "Upload New Videos"
+msgstr ""
+
+#: mod/viewcontacts.php:72
+msgid "No contacts."
+msgstr ""
+
 #: mod/settings.php:60
 msgid "Display"
 msgstr ""
@@ -8181,6 +8224,12 @@ msgstr ""
 msgid "Bandwith Saver Mode"
 msgstr ""
 
+#: mod/settings.php:1007
+msgid ""
+"When enabled, embedded content is not displayed on automatic updates, they "
+"only show on page reload."
+msgstr ""
+
 #: mod/settings.php:1009
 msgid "General Theme Settings"
 msgstr ""
@@ -8556,49 +8605,6 @@ msgstr ""
 msgid "Resend relocate message to contacts"
 msgstr ""
 
-#: mod/suggest.php:27
-msgid "Do you really want to delete this suggestion?"
-msgstr ""
-
-#: mod/suggest.php:71
-msgid ""
-"No suggestions available. If this is a new site, please try again in 24 "
-"hours."
-msgstr ""
-
-#: mod/suggest.php:84 mod/suggest.php:104
-msgid "Ignore/Hide"
-msgstr ""
-
-#: mod/update_community.php:19 mod/update_display.php:23
-#: mod/update_network.php:27 mod/update_notes.php:36 mod/update_profile.php:35
-msgid "[Embedded content - reload page to view]"
-msgstr ""
-
-#: mod/videos.php:120
-msgid "Do you really want to delete this video?"
-msgstr ""
-
-#: mod/videos.php:125
-msgid "Delete Video"
-msgstr ""
-
-#: mod/videos.php:204
-msgid "No videos selected"
-msgstr ""
-
-#: mod/videos.php:396
-msgid "Recent Videos"
-msgstr ""
-
-#: mod/videos.php:398
-msgid "Upload New Videos"
-msgstr ""
-
-#: mod/viewcontacts.php:72
-msgid "No contacts."
-msgstr ""
-
 #: object/Item.php:370
 msgid "via"
 msgstr ""