diff --git a/view/de/messages.po b/view/de/messages.po
index 08456186d8..69b0744cd1 100644
--- a/view/de/messages.po
+++ b/view/de/messages.po
@@ -22,8 +22,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: friendica\n"
 "Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
-"POT-Creation-Date: 2012-09-19 10:00-0700\n"
-"PO-Revision-Date: 2012-09-22 06:02+0000\n"
+"POT-Creation-Date: 2012-09-25 10:00-0700\n"
+"PO-Revision-Date: 2012-09-27 04:19+0000\n"
 "Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
 "MIME-Version: 1.0\n"
@@ -146,7 +146,7 @@ msgstr "Neues Foto von dieser URL"
 #: ../../mod/photos.php:1378 ../../mod/photos.php:1419
 #: ../../mod/photos.php:1451 ../../mod/install.php:246
 #: ../../mod/install.php:284 ../../mod/localtime.php:45 ../../mod/poke.php:199
-#: ../../mod/content.php:691 ../../mod/contacts.php:348
+#: ../../mod/content.php:693 ../../mod/contacts.php:348
 #: ../../mod/settings.php:543 ../../mod/settings.php:697
 #: ../../mod/settings.php:769 ../../mod/settings.php:976
 #: ../../mod/group.php:85 ../../mod/mood.php:137 ../../mod/message.php:294
@@ -185,13 +185,13 @@ msgstr "Neues Foto von dieser URL"
 #: ../../addon/wppost/wppost.php:110 ../../addon/showmore/showmore.php:48
 #: ../../addon/piwik/piwik.php:89 ../../addon/twitter/twitter.php:180
 #: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:394
-#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
-#: ../../addon/posterous/posterous.php:103
+#: ../../addon/irc/irc.php:55 ../../addon/fromapp/fromapp.php:77
+#: ../../addon/blogger/blogger.php:102 ../../addon/posterous/posterous.php:103
 #: ../../view/theme/cleanzero/config.php:80
 #: ../../view/theme/diabook/theme.php:757
 #: ../../view/theme/diabook/config.php:190
 #: ../../view/theme/quattro/config.php:53 ../../view/theme/dispy/config.php:70
-#: ../../include/conversation.php:608 ../../object/Item.php:532
+#: ../../include/conversation.php:607 ../../object/Item.php:559
 msgid "Submit"
 msgstr "Senden"
 
@@ -246,7 +246,7 @@ msgstr "l, F j"
 msgid "Edit event"
 msgstr "Veranstaltung bearbeiten"
 
-#: ../../mod/events.php:323 ../../include/text.php:1147
+#: ../../mod/events.php:323 ../../include/text.php:1187
 msgid "link to source"
 msgstr "Link zum Originalbeitrag"
 
@@ -322,7 +322,7 @@ msgstr "Veranstaltung teilen"
 #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 ../../mod/editpost.php:136
 #: ../../mod/dfrn_request.php:847 ../../mod/settings.php:544
 #: ../../mod/settings.php:570 ../../addon/js_upload/js_upload.php:45
-#: ../../include/conversation.php:1290
+#: ../../include/conversation.php:1307
 msgid "Cancel"
 msgstr "Abbrechen"
 
@@ -443,7 +443,7 @@ msgstr "wurde getaggt in einem"
 
 #: ../../mod/photos.php:584 ../../mod/like.php:145 ../../mod/tagger.php:62
 #: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1399
+#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1439
 #: ../../include/diaspora.php:1824 ../../include/conversation.php:125
 #: ../../include/conversation.php:253
 msgid "photo"
@@ -551,8 +551,8 @@ msgstr "Foto bearbeiten"
 msgid "Use as profile photo"
 msgstr "Als Profilbild verwenden"
 
-#: ../../mod/photos.php:1224 ../../mod/content.php:601
-#: ../../include/conversation.php:435 ../../object/Item.php:103
+#: ../../mod/photos.php:1224 ../../mod/content.php:603
+#: ../../include/conversation.php:436 ../../object/Item.php:103
 msgid "Private Message"
 msgstr "Private Nachricht"
 
@@ -593,52 +593,52 @@ msgid ""
 "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr "Beispiel: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 
-#: ../../mod/photos.php:1356 ../../mod/content.php:665
-#: ../../include/conversation.php:582 ../../object/Item.php:185
+#: ../../mod/photos.php:1356 ../../mod/content.php:667
+#: ../../include/conversation.php:581 ../../object/Item.php:195
 msgid "I like this (toggle)"
 msgstr "Ich mag das (toggle)"
 
-#: ../../mod/photos.php:1357 ../../mod/content.php:666
-#: ../../include/conversation.php:583 ../../object/Item.php:186
+#: ../../mod/photos.php:1357 ../../mod/content.php:668
+#: ../../include/conversation.php:582 ../../object/Item.php:196
 msgid "I don't like this (toggle)"
 msgstr "Ich mag das nicht (toggle)"
 
-#: ../../mod/photos.php:1358 ../../include/conversation.php:1251
+#: ../../mod/photos.php:1358 ../../include/conversation.php:1268
 msgid "Share"
 msgstr "Teilen"
 
 #: ../../mod/photos.php:1359 ../../mod/editpost.php:112
-#: ../../mod/content.php:482 ../../mod/content.php:843
+#: ../../mod/content.php:482 ../../mod/content.php:845
 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
-#: ../../mod/message.php:481 ../../include/conversation.php:678
-#: ../../include/conversation.php:928 ../../include/conversation.php:1270
-#: ../../object/Item.php:237
+#: ../../mod/message.php:481 ../../include/conversation.php:686
+#: ../../include/conversation.php:944 ../../include/conversation.php:1287
+#: ../../object/Item.php:257
 msgid "Please wait"
 msgstr "Bitte warten"
 
 #: ../../mod/photos.php:1375 ../../mod/photos.php:1416
-#: ../../mod/photos.php:1448 ../../mod/content.php:688
-#: ../../include/conversation.php:605 ../../object/Item.php:529
+#: ../../mod/photos.php:1448 ../../mod/content.php:690
+#: ../../include/conversation.php:604 ../../object/Item.php:556
 msgid "This is you"
 msgstr "Das bist du"
 
 #: ../../mod/photos.php:1377 ../../mod/photos.php:1418
-#: ../../mod/photos.php:1450 ../../mod/content.php:690
-#: ../../include/conversation.php:607 ../../boot.php:574
-#: ../../object/Item.php:531
+#: ../../mod/photos.php:1450 ../../mod/content.php:692
+#: ../../include/conversation.php:606 ../../boot.php:574
+#: ../../object/Item.php:558
 msgid "Comment"
 msgstr "Kommentar"
 
 #: ../../mod/photos.php:1379 ../../mod/editpost.php:133
-#: ../../mod/content.php:700 ../../include/conversation.php:617
-#: ../../include/conversation.php:1288 ../../object/Item.php:541
+#: ../../mod/content.php:702 ../../include/conversation.php:616
+#: ../../include/conversation.php:1305 ../../object/Item.php:568
 msgid "Preview"
 msgstr "Vorschau"
 
 #: ../../mod/photos.php:1479 ../../mod/content.php:439
-#: ../../mod/content.php:721 ../../mod/settings.php:606
+#: ../../mod/content.php:723 ../../mod/settings.php:606
 #: ../../mod/settings.php:695 ../../mod/group.php:168 ../../mod/admin.php:696
-#: ../../include/conversation.php:447 ../../include/conversation.php:881
+#: ../../include/conversation.php:448 ../../include/conversation.php:889
 #: ../../object/Item.php:116
 msgid "Delete"
 msgstr "Löschen"
@@ -705,29 +705,29 @@ msgstr "Beitrag nicht gefunden"
 msgid "Edit post"
 msgstr "Beitrag bearbeiten"
 
-#: ../../mod/editpost.php:88 ../../include/conversation.php:1237
+#: ../../mod/editpost.php:88 ../../include/conversation.php:1254
 msgid "Post to Email"
 msgstr "An E-Mail senden"
 
-#: ../../mod/editpost.php:103 ../../mod/content.php:708
-#: ../../mod/settings.php:605 ../../include/conversation.php:440
+#: ../../mod/editpost.php:103 ../../mod/content.php:710
+#: ../../mod/settings.php:605 ../../include/conversation.php:441
 #: ../../object/Item.php:107
 msgid "Edit"
 msgstr "Bearbeiten"
 
 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
 #: ../../mod/message.php:291 ../../mod/message.php:478
-#: ../../include/conversation.php:1252
+#: ../../include/conversation.php:1269
 msgid "Upload photo"
 msgstr "Foto hochladen"
 
-#: ../../mod/editpost.php:105 ../../include/conversation.php:1254
+#: ../../mod/editpost.php:105 ../../include/conversation.php:1271
 msgid "Attach file"
 msgstr "Datei anhängen"
 
 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
 #: ../../mod/message.php:292 ../../mod/message.php:479
-#: ../../include/conversation.php:1256
+#: ../../include/conversation.php:1273
 msgid "Insert web link"
 msgstr "einen Link einfügen"
 
@@ -743,35 +743,35 @@ msgstr "Vorbis [.ogg] Video einfügen"
 msgid "Insert Vorbis [.ogg] audio"
 msgstr "Vorbis [.ogg] Audio einfügen"
 
-#: ../../mod/editpost.php:110 ../../include/conversation.php:1262
+#: ../../mod/editpost.php:110 ../../include/conversation.php:1279
 msgid "Set your location"
 msgstr "Deinen Standort festlegen"
 
-#: ../../mod/editpost.php:111 ../../include/conversation.php:1264
+#: ../../mod/editpost.php:111 ../../include/conversation.php:1281
 msgid "Clear browser location"
 msgstr "Browser-Standort leeren"
 
-#: ../../mod/editpost.php:113 ../../include/conversation.php:1271
+#: ../../mod/editpost.php:113 ../../include/conversation.php:1288
 msgid "Permission settings"
 msgstr "Berechtigungseinstellungen"
 
-#: ../../mod/editpost.php:121 ../../include/conversation.php:1280
+#: ../../mod/editpost.php:121 ../../include/conversation.php:1297
 msgid "CC: email addresses"
 msgstr "Cc:-E-Mail-Addressen"
 
-#: ../../mod/editpost.php:122 ../../include/conversation.php:1281
+#: ../../mod/editpost.php:122 ../../include/conversation.php:1298
 msgid "Public post"
 msgstr "Öffentlicher Beitrag"
 
-#: ../../mod/editpost.php:125 ../../include/conversation.php:1267
+#: ../../mod/editpost.php:125 ../../include/conversation.php:1284
 msgid "Set title"
 msgstr "Titel setzen"
 
-#: ../../mod/editpost.php:127 ../../include/conversation.php:1269
+#: ../../mod/editpost.php:127 ../../include/conversation.php:1286
 msgid "Categories (comma-separated list)"
 msgstr "Kategorien (kommasepariert)"
 
-#: ../../mod/editpost.php:128 ../../include/conversation.php:1283
+#: ../../mod/editpost.php:128 ../../include/conversation.php:1300
 msgid "Example: bob@example.com, mary@example.com"
 msgstr "Z.B.: bob@example.com, mary@example.com"
 
@@ -1313,148 +1313,156 @@ msgstr "Gruppe ist leer"
 msgid "Group: "
 msgstr "Gruppe: "
 
-#: ../../mod/content.php:438 ../../mod/content.php:720
-#: ../../include/conversation.php:446 ../../include/conversation.php:880
+#: ../../mod/content.php:438 ../../mod/content.php:722
+#: ../../include/conversation.php:447 ../../include/conversation.php:888
 #: ../../object/Item.php:115
 msgid "Select"
 msgstr "Auswählen"
 
-#: ../../mod/content.php:455 ../../mod/content.php:813
-#: ../../mod/content.php:814 ../../include/conversation.php:646
-#: ../../include/conversation.php:647 ../../include/conversation.php:897
-#: ../../object/Item.php:206 ../../object/Item.php:207
+#: ../../mod/content.php:455 ../../mod/content.php:815
+#: ../../mod/content.php:816 ../../include/conversation.php:654
+#: ../../include/conversation.php:655 ../../include/conversation.php:907
+#: ../../object/Item.php:226 ../../object/Item.php:227
 #, php-format
 msgid "View %s's profile @ %s"
 msgstr "Das Profil von %s auf %s betrachten."
 
-#: ../../mod/content.php:465 ../../mod/content.php:825
-#: ../../include/conversation.php:660 ../../include/conversation.php:911
-#: ../../object/Item.php:219
+#: ../../mod/content.php:465 ../../mod/content.php:827
+#: ../../include/conversation.php:668 ../../include/conversation.php:927
+#: ../../object/Item.php:239
 #, php-format
 msgid "%s from %s"
 msgstr "%s von %s"
 
-#: ../../mod/content.php:480 ../../include/conversation.php:926
+#: ../../mod/content.php:480 ../../include/conversation.php:942
 msgid "View in context"
 msgstr "Im Zusammenhang betrachten"
 
-#: ../../mod/content.php:586 ../../include/conversation.php:687
-#: ../../object/Item.php:256
+#: ../../mod/content.php:586 ../../include/conversation.php:695
+#: ../../object/Item.php:276
 #, php-format
 msgid "%d comment"
 msgid_plural "%d comments"
 msgstr[0] "%d Kommentar"
 msgstr[1] "%d Kommentare"
 
-#: ../../mod/content.php:587 ../../addon/page/page.php:76
+#: ../../mod/content.php:588 ../../include/text.php:1443
+#: ../../include/conversation.php:697 ../../object/Item.php:278
+#: ../../object/Item.php:291
+msgid "comment"
+msgid_plural "comments"
+msgstr[0] ""
+msgstr[1] "Kommentar"
+
+#: ../../mod/content.php:589 ../../addon/page/page.php:76
 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
-#: ../../include/contact_widgets.php:195 ../../include/conversation.php:688
-#: ../../boot.php:575 ../../object/Item.php:257
+#: ../../include/contact_widgets.php:195 ../../include/conversation.php:698
+#: ../../boot.php:575 ../../object/Item.php:279
 msgid "show more"
 msgstr "mehr anzeigen"
 
-#: ../../mod/content.php:665 ../../include/conversation.php:582
-#: ../../object/Item.php:185
+#: ../../mod/content.php:667 ../../include/conversation.php:581
+#: ../../object/Item.php:195
 msgid "like"
 msgstr "mag ich"
 
-#: ../../mod/content.php:666 ../../include/conversation.php:583
-#: ../../object/Item.php:186
+#: ../../mod/content.php:668 ../../include/conversation.php:582
+#: ../../object/Item.php:196
 msgid "dislike"
 msgstr "mag ich nicht"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:585
-#: ../../object/Item.php:188
+#: ../../mod/content.php:670 ../../include/conversation.php:584
+#: ../../object/Item.php:198
 msgid "Share this"
 msgstr "Weitersagen"
 
-#: ../../mod/content.php:668 ../../include/conversation.php:585
-#: ../../object/Item.php:188
+#: ../../mod/content.php:670 ../../include/conversation.php:584
+#: ../../object/Item.php:198
 msgid "share"
 msgstr "Teilen"
 
-#: ../../mod/content.php:692 ../../include/conversation.php:609
-#: ../../object/Item.php:533
+#: ../../mod/content.php:694 ../../include/conversation.php:608
+#: ../../object/Item.php:560
 msgid "Bold"
 msgstr "Fett"
 
-#: ../../mod/content.php:693 ../../include/conversation.php:610
-#: ../../object/Item.php:534
+#: ../../mod/content.php:695 ../../include/conversation.php:609
+#: ../../object/Item.php:561
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../../mod/content.php:694 ../../include/conversation.php:611
-#: ../../object/Item.php:535
+#: ../../mod/content.php:696 ../../include/conversation.php:610
+#: ../../object/Item.php:562
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../../mod/content.php:695 ../../include/conversation.php:612
-#: ../../object/Item.php:536
+#: ../../mod/content.php:697 ../../include/conversation.php:611
+#: ../../object/Item.php:563
 msgid "Quote"
 msgstr "Zitat"
 
-#: ../../mod/content.php:696 ../../include/conversation.php:613
-#: ../../object/Item.php:537
+#: ../../mod/content.php:698 ../../include/conversation.php:612
+#: ../../object/Item.php:564
 msgid "Code"
 msgstr "Code"
 
-#: ../../mod/content.php:697 ../../include/conversation.php:614
-#: ../../object/Item.php:538
+#: ../../mod/content.php:699 ../../include/conversation.php:613
+#: ../../object/Item.php:565
 msgid "Image"
 msgstr "Bild"
 
-#: ../../mod/content.php:698 ../../include/conversation.php:615
-#: ../../object/Item.php:539
+#: ../../mod/content.php:700 ../../include/conversation.php:614
+#: ../../object/Item.php:566
 msgid "Link"
 msgstr "Verweis"
 
-#: ../../mod/content.php:699 ../../include/conversation.php:616
-#: ../../object/Item.php:540
+#: ../../mod/content.php:701 ../../include/conversation.php:615
+#: ../../object/Item.php:567
 msgid "Video"
 msgstr "Video"
 
-#: ../../mod/content.php:733 ../../include/conversation.php:546
-#: ../../object/Item.php:169
+#: ../../mod/content.php:735 ../../include/conversation.php:545
+#: ../../object/Item.php:179
 msgid "add star"
 msgstr "markieren"
 
-#: ../../mod/content.php:734 ../../include/conversation.php:547
-#: ../../object/Item.php:170
+#: ../../mod/content.php:736 ../../include/conversation.php:546
+#: ../../object/Item.php:180
 msgid "remove star"
 msgstr "Markierung entfernen"
 
-#: ../../mod/content.php:735 ../../include/conversation.php:548
-#: ../../object/Item.php:171
+#: ../../mod/content.php:737 ../../include/conversation.php:547
+#: ../../object/Item.php:181
 msgid "toggle star status"
 msgstr "Markierung umschalten"
 
-#: ../../mod/content.php:738 ../../include/conversation.php:551
-#: ../../object/Item.php:174
+#: ../../mod/content.php:740 ../../include/conversation.php:550
+#: ../../object/Item.php:184
 msgid "starred"
 msgstr "markiert"
 
-#: ../../mod/content.php:739 ../../include/conversation.php:552
-#: ../../object/Item.php:175
+#: ../../mod/content.php:741 ../../include/conversation.php:551
+#: ../../object/Item.php:185
 msgid "add tag"
 msgstr "Tag hinzufügen"
 
-#: ../../mod/content.php:743 ../../include/conversation.php:450
+#: ../../mod/content.php:745 ../../include/conversation.php:451
 #: ../../object/Item.php:119
 msgid "save to folder"
 msgstr "In Ordner speichern"
 
-#: ../../mod/content.php:815 ../../include/conversation.php:648
-#: ../../object/Item.php:208
+#: ../../mod/content.php:817 ../../include/conversation.php:656
+#: ../../object/Item.php:228
 msgid "to"
 msgstr "zu"
 
-#: ../../mod/content.php:816 ../../include/conversation.php:649
-#: ../../object/Item.php:209
+#: ../../mod/content.php:818 ../../include/conversation.php:657
+#: ../../object/Item.php:229
 msgid "Wall-to-Wall"
 msgstr "Wall-to-Wall"
 
-#: ../../mod/content.php:817 ../../include/conversation.php:650
-#: ../../object/Item.php:210
+#: ../../mod/content.php:819 ../../include/conversation.php:658
+#: ../../object/Item.php:230
 msgid "via Wall-To-Wall:"
 msgstr "via Wall-To-Wall:"
 
@@ -2705,7 +2713,7 @@ msgstr "Kein Empfänger."
 
 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
 #: ../../mod/message.php:242 ../../mod/message.php:250
-#: ../../include/conversation.php:1188 ../../include/conversation.php:1205
+#: ../../include/conversation.php:1205 ../../include/conversation.php:1222
 msgid "Please enter a link URL:"
 msgstr "Bitte gib die URL des Links ein:"
 
@@ -3066,38 +3074,38 @@ msgstr "Deine OpenID (optional): "
 msgid "Include your profile in member directory?"
 msgstr "Soll dein Profil im Nutzerverzeichnis angezeigt werden?"
 
-#: ../../mod/register.php:253
+#: ../../mod/register.php:255
 msgid "Membership on this site is by invitation only."
 msgstr "Mitgliedschaft auf dieser Seite ist nur nach vorheriger Einladung möglich."
 
-#: ../../mod/register.php:254
+#: ../../mod/register.php:256
 msgid "Your invitation ID: "
 msgstr "ID deiner Einladung: "
 
-#: ../../mod/register.php:257 ../../mod/admin.php:444
+#: ../../mod/register.php:259 ../../mod/admin.php:444
 msgid "Registration"
 msgstr "Registrierung"
 
-#: ../../mod/register.php:265
+#: ../../mod/register.php:267
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr "Vollständiger Name (z.B. Max Mustermann): "
 
-#: ../../mod/register.php:266
+#: ../../mod/register.php:268
 msgid "Your Email Address: "
 msgstr "Deine E-Mail-Adresse: "
 
-#: ../../mod/register.php:267
+#: ../../mod/register.php:269
 msgid ""
 "Choose a profile nickname. This must begin with a text character. Your "
 "profile address on this site will then be "
 "'<strong>nickname@$sitename</strong>'."
 msgstr "Wähle einen Spitznamen für dein Profil. Dieser muss mit einem Buchstaben beginnen. Die Adresse deines Profils auf dieser Seite wird '<strong>spitzname@$sitename</strong>' sein."
 
-#: ../../mod/register.php:268
+#: ../../mod/register.php:270
 msgid "Choose a nickname: "
 msgstr "Spitznamen wählen: "
 
-#: ../../mod/register.php:271 ../../include/nav.php:81 ../../boot.php:887
+#: ../../mod/register.php:273 ../../include/nav.php:81 ../../boot.php:887
 msgid "Register"
 msgstr "Registrieren"
 
@@ -4431,8 +4439,8 @@ msgstr "sichtbar für jeden"
 msgid "Edit visibility"
 msgstr "Sichtbarkeit bearbeiten"
 
-#: ../../mod/filer.php:29 ../../include/conversation.php:1192
-#: ../../include/conversation.php:1209
+#: ../../mod/filer.php:29 ../../include/conversation.php:1209
+#: ../../include/conversation.php:1226
 msgid "Save to Folder:"
 msgstr "In diesen Ordner verschieben:"
 
@@ -5363,7 +5371,7 @@ msgid "Latest likes"
 msgstr "Neueste Favoriten"
 
 #: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1397
+#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1437
 #: ../../include/conversation.php:117 ../../include/conversation.php:245
 msgid "event"
 msgstr "Veranstaltung"
@@ -6957,6 +6965,23 @@ msgstr "IRC Chatraum"
 msgid "Popular Channels"
 msgstr "Beliebte Räume"
 
+#: ../../addon/fromapp/fromapp.php:38
+msgid "Fromapp settings updated."
+msgstr "FromApp Einstellungen aktualisiert."
+
+#: ../../addon/fromapp/fromapp.php:64
+msgid "FromApp Settings"
+msgstr "FromApp Einstellungen"
+
+#: ../../addon/fromapp/fromapp.php:66
+msgid ""
+"The application name you would like to show your posts originating from."
+msgstr "Der Name der Anwendung von der deine Beiträge stammen sollen."
+
+#: ../../addon/fromapp/fromapp.php:70
+msgid "Use this application name even if another application was used."
+msgstr "Verwende diesen Namen auch wenn eine andere Anwendung den Anwendungsnamen bereits gesetzt hat."
+
 #: ../../addon/blogger/blogger.php:42
 msgid "Post to blogger"
 msgstr "Auf Blogger posten"
@@ -7818,47 +7843,27 @@ msgstr "Dezember"
 msgid "bytes"
 msgstr "Byte"
 
-#: ../../include/text.php:1027 ../../include/text.php:1042
-msgid "remove"
-msgstr "löschen"
-
-#: ../../include/text.php:1027 ../../include/text.php:1042
-msgid "[remove]"
-msgstr "[löschen]"
-
-#: ../../include/text.php:1030
-msgid "Categories:"
-msgstr "Kategorien:"
-
-#: ../../include/text.php:1045
-msgid "Filed under:"
-msgstr "Abgelegt unter:"
-
-#: ../../include/text.php:1061 ../../include/text.php:1073
+#: ../../include/text.php:1034 ../../include/text.php:1046
 msgid "Click to open/close"
 msgstr "Zum öffnen/schließen klicken"
 
-#: ../../include/text.php:1179 ../../include/user.php:236
+#: ../../include/text.php:1219 ../../include/user.php:236
 msgid "default"
 msgstr "Standard"
 
-#: ../../include/text.php:1191
+#: ../../include/text.php:1231
 msgid "Select an alternate language"
 msgstr "Alternative Sprache auswählen"
 
-#: ../../include/text.php:1401
+#: ../../include/text.php:1441
 msgid "activity"
 msgstr "Aktivität"
 
-#: ../../include/text.php:1403
-msgid "comment"
-msgstr "Kommentar"
-
-#: ../../include/text.php:1404
+#: ../../include/text.php:1444
 msgid "post"
 msgstr "Beitrag"
 
-#: ../../include/text.php:1559
+#: ../../include/text.php:1599
 msgid "Item filed"
 msgstr "Beitrag abgelegt"
 
@@ -7866,7 +7871,7 @@ msgstr "Beitrag abgelegt"
 msgid "Sharing notification from Diaspora network"
 msgstr "Freigabe-Benachrichtigung von Diaspora"
 
-#: ../../include/diaspora.php:2202
+#: ../../include/diaspora.php:2211
 msgid "Attachments:"
 msgstr "Anhänge:"
 
@@ -8533,34 +8538,34 @@ msgstr "Das Sicherheitsmerkmal war nicht korrekt. Das passiert meistens wenn das
 msgid "stopped following"
 msgstr "wird nicht mehr gefolgt"
 
-#: ../../include/Contact.php:220 ../../include/conversation.php:1089
+#: ../../include/Contact.php:220 ../../include/conversation.php:1106
 msgid "Poke"
 msgstr "Anstupsen"
 
-#: ../../include/Contact.php:221 ../../include/conversation.php:1083
+#: ../../include/Contact.php:221 ../../include/conversation.php:1100
 msgid "View Status"
 msgstr "Pinnwand anschauen"
 
-#: ../../include/Contact.php:222 ../../include/conversation.php:1084
+#: ../../include/Contact.php:222 ../../include/conversation.php:1101
 msgid "View Profile"
 msgstr "Profil anschauen"
 
-#: ../../include/Contact.php:223 ../../include/conversation.php:1085
+#: ../../include/Contact.php:223 ../../include/conversation.php:1102
 msgid "View Photos"
 msgstr "Bilder anschauen"
 
 #: ../../include/Contact.php:224 ../../include/Contact.php:237
-#: ../../include/conversation.php:1086
+#: ../../include/conversation.php:1103
 msgid "Network Posts"
 msgstr "Netzwerkbeiträge"
 
 #: ../../include/Contact.php:225 ../../include/Contact.php:237
-#: ../../include/conversation.php:1087
+#: ../../include/conversation.php:1104
 msgid "Edit Contact"
 msgstr "Kontakt bearbeiten"
 
 #: ../../include/Contact.php:226 ../../include/Contact.php:237
-#: ../../include/conversation.php:1088
+#: ../../include/conversation.php:1105
 msgid "Send PM"
 msgstr "Private Nachricht senden"
 
@@ -8578,118 +8583,132 @@ msgstr "Nachricht/Beitrag"
 msgid "%1$s marked %2$s's %3$s as favorite"
 msgstr "%1$s hat %2$s\\s %3$s als Favorit markiert"
 
-#: ../../include/conversation.php:989
+#: ../../include/conversation.php:645 ../../include/conversation.php:919
+#: ../../object/Item.php:217
+msgid "Categories:"
+msgstr "Kategorien"
+
+#: ../../include/conversation.php:646 ../../include/conversation.php:920
+#: ../../object/Item.php:218
+msgid "Filed under:"
+msgstr "Abgelegt unter:"
+
+#: ../../include/conversation.php:1002
+msgid "remove"
+msgstr "löschen"
+
+#: ../../include/conversation.php:1006
 msgid "Delete Selected Items"
 msgstr "Lösche die markierten Beiträge"
 
-#: ../../include/conversation.php:1147
+#: ../../include/conversation.php:1164
 #, php-format
 msgid "%s likes this."
 msgstr "%s mag das."
 
-#: ../../include/conversation.php:1147
+#: ../../include/conversation.php:1164
 #, php-format
 msgid "%s doesn't like this."
 msgstr "%s mag das nicht."
 
-#: ../../include/conversation.php:1151
+#: ../../include/conversation.php:1168
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das."
 
-#: ../../include/conversation.php:1153
+#: ../../include/conversation.php:1170
 #, php-format
 msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr "<span  %1$s>%2$d Leute</span> mögen das nicht."
 
-#: ../../include/conversation.php:1159
+#: ../../include/conversation.php:1176
 msgid "and"
 msgstr "und"
 
-#: ../../include/conversation.php:1162
+#: ../../include/conversation.php:1179
 #, php-format
 msgid ", and %d other people"
 msgstr " und %d andere"
 
-#: ../../include/conversation.php:1163
+#: ../../include/conversation.php:1180
 #, php-format
 msgid "%s like this."
 msgstr "%s mögen das."
 
-#: ../../include/conversation.php:1163
+#: ../../include/conversation.php:1180
 #, php-format
 msgid "%s don't like this."
 msgstr "%s mögen das nicht."
 
-#: ../../include/conversation.php:1187 ../../include/conversation.php:1204
+#: ../../include/conversation.php:1204 ../../include/conversation.php:1221
 msgid "Visible to <strong>everybody</strong>"
 msgstr "Für <strong>jedermann</strong> sichtbar"
 
-#: ../../include/conversation.php:1189 ../../include/conversation.php:1206
+#: ../../include/conversation.php:1206 ../../include/conversation.php:1223
 msgid "Please enter a video link/URL:"
 msgstr "Bitte Link/URL zum Video einfügen:"
 
-#: ../../include/conversation.php:1190 ../../include/conversation.php:1207
+#: ../../include/conversation.php:1207 ../../include/conversation.php:1224
 msgid "Please enter an audio link/URL:"
 msgstr "Bitte Link/URL zum Audio einfügen:"
 
-#: ../../include/conversation.php:1191 ../../include/conversation.php:1208
+#: ../../include/conversation.php:1208 ../../include/conversation.php:1225
 msgid "Tag term:"
 msgstr "Tag:"
 
-#: ../../include/conversation.php:1193 ../../include/conversation.php:1210
+#: ../../include/conversation.php:1210 ../../include/conversation.php:1227
 msgid "Where are you right now?"
 msgstr "Wo hältst du dich jetzt gerade auf?"
 
-#: ../../include/conversation.php:1253
+#: ../../include/conversation.php:1270
 msgid "upload photo"
 msgstr "Bild hochladen"
 
-#: ../../include/conversation.php:1255
+#: ../../include/conversation.php:1272
 msgid "attach file"
 msgstr "Datei anhängen"
 
-#: ../../include/conversation.php:1257
+#: ../../include/conversation.php:1274
 msgid "web link"
 msgstr "Weblink"
 
-#: ../../include/conversation.php:1258
+#: ../../include/conversation.php:1275
 msgid "Insert video link"
 msgstr "Video-Adresse einfügen"
 
-#: ../../include/conversation.php:1259
+#: ../../include/conversation.php:1276
 msgid "video link"
 msgstr "Video-Link"
 
-#: ../../include/conversation.php:1260
+#: ../../include/conversation.php:1277
 msgid "Insert audio link"
 msgstr "Audio-Adresse einfügen"
 
-#: ../../include/conversation.php:1261
+#: ../../include/conversation.php:1278
 msgid "audio link"
 msgstr "Audio-Link"
 
-#: ../../include/conversation.php:1263
+#: ../../include/conversation.php:1280
 msgid "set location"
 msgstr "Ort setzen"
 
-#: ../../include/conversation.php:1265
+#: ../../include/conversation.php:1282
 msgid "clear location"
 msgstr "Ort löschen"
 
-#: ../../include/conversation.php:1272
+#: ../../include/conversation.php:1289
 msgid "permissions"
 msgstr "Zugriffsrechte"
 
-#: ../../include/plugin.php:400 ../../include/plugin.php:402
+#: ../../include/plugin.php:389 ../../include/plugin.php:391
 msgid "Click here to upgrade."
 msgstr "Zum Upgraden hier klicken."
 
-#: ../../include/plugin.php:408
+#: ../../include/plugin.php:397
 msgid "This action exceeds the limits set by your subscription plan."
 msgstr "Diese Aktion überschreitet die Obergrenze deines Abonnements."
 
-#: ../../include/plugin.php:413
+#: ../../include/plugin.php:402
 msgid "This action is not available under your subscription plan."
 msgstr "Diese Aktion ist in deinem Abonnement nicht verfügbar."
 
diff --git a/view/de/strings.php b/view/de/strings.php
index dc90ed08a3..119676bdbd 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -277,6 +277,10 @@ $a->strings["%d comment"] = array(
 	0 => "%d Kommentar",
 	1 => "%d Kommentare",
 );
+$a->strings["comment"] = array(
+	0 => "",
+	1 => "Kommentar",
+);
 $a->strings["show more"] = "mehr anzeigen";
 $a->strings["like"] = "mag ich";
 $a->strings["dislike"] = "mag ich nicht";
@@ -1565,6 +1569,10 @@ $a->strings["Popular Channels (comma separated)"] = "Beliebte Kanäle (mit Komma
 $a->strings["IRC settings saved."] = "IRC Einstellungen gespeichert.";
 $a->strings["IRC Chatroom"] = "IRC Chatraum";
 $a->strings["Popular Channels"] = "Beliebte Räume";
+$a->strings["Fromapp settings updated."] = "FromApp Einstellungen aktualisiert.";
+$a->strings["FromApp Settings"] = "FromApp Einstellungen";
+$a->strings["The application name you would like to show your posts originating from."] = "Der Name der Anwendung von der deine Beiträge stammen sollen.";
+$a->strings["Use this application name even if another application was used."] = "Verwende diesen Namen auch wenn eine andere Anwendung den Anwendungsnamen bereits gesetzt hat.";
 $a->strings["Post to blogger"] = "Auf Blogger posten";
 $a->strings["Blogger Post Settings"] = "Einstellungen zum posten auf Blogger";
 $a->strings["Enable Blogger Post Plugin"] = "Blogger-Post-Plugin aktivieren";
@@ -1770,15 +1778,10 @@ $a->strings["October"] = "Oktober";
 $a->strings["November"] = "November";
 $a->strings["December"] = "Dezember";
 $a->strings["bytes"] = "Byte";
-$a->strings["remove"] = "löschen";
-$a->strings["[remove]"] = "[löschen]";
-$a->strings["Categories:"] = "Kategorien:";
-$a->strings["Filed under:"] = "Abgelegt unter:";
 $a->strings["Click to open/close"] = "Zum öffnen/schließen klicken";
 $a->strings["default"] = "Standard";
 $a->strings["Select an alternate language"] = "Alternative Sprache auswählen";
 $a->strings["activity"] = "Aktivität";
-$a->strings["comment"] = "Kommentar";
 $a->strings["post"] = "Beitrag";
 $a->strings["Item filed"] = "Beitrag abgelegt";
 $a->strings["Sharing notification from Diaspora network"] = "Freigabe-Benachrichtigung von Diaspora";
@@ -1947,6 +1950,9 @@ $a->strings["Send PM"] = "Private Nachricht senden";
 $a->strings["%1\$s poked %2\$s"] = "%1\$s hat %2\$s angestupst";
 $a->strings["post/item"] = "Nachricht/Beitrag";
 $a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s hat %2\$s\\s %3\$s als Favorit markiert";
+$a->strings["Categories:"] = "Kategorien";
+$a->strings["Filed under:"] = "Abgelegt unter:";
+$a->strings["remove"] = "löschen";
 $a->strings["Delete Selected Items"] = "Lösche die markierten Beiträge";
 $a->strings["%s likes this."] = "%s mag das.";
 $a->strings["%s doesn't like this."] = "%s mag das nicht.";