Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
4f72e656ca
2 changed files with 4 additions and 4 deletions
|
@ -22,8 +22,8 @@ msgstr ""
|
||||||
"Project-Id-Version: friendica\n"
|
"Project-Id-Version: friendica\n"
|
||||||
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
|
"Report-Msgid-Bugs-To: http://bugs.friendica.com/\n"
|
||||||
"POT-Creation-Date: 2012-08-19 10:00-0700\n"
|
"POT-Creation-Date: 2012-08-19 10:00-0700\n"
|
||||||
"PO-Revision-Date: 2012-08-20 09:09+0000\n"
|
"PO-Revision-Date: 2012-08-20 22:08+0000\n"
|
||||||
"Last-Translator: bavatar <tobias.diekershoff@gmx.net>\n"
|
"Last-Translator: Oliver <post@toktan.org>\n"
|
||||||
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
|
"Language-Team: German (http://www.transifex.com/projects/p/friendica/language/de/)\n"
|
||||||
"MIME-Version: 1.0\n"
|
"MIME-Version: 1.0\n"
|
||||||
"Content-Type: text/plain; charset=UTF-8\n"
|
"Content-Type: text/plain; charset=UTF-8\n"
|
||||||
|
@ -7931,7 +7931,7 @@ msgstr "%1$s kommentierte [url=%2$s]%3$ss %4$s[/url]"
|
||||||
#: ../../include/enotify.php:104
|
#: ../../include/enotify.php:104
|
||||||
#, php-format
|
#, php-format
|
||||||
msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
|
msgid "%1$s commented on [url=%2$s]your %3$s[/url]"
|
||||||
msgstr "%1$s kommentierte [url=%2$s]deinen Beitrag %3$s[/url]"
|
msgstr "%1$s kommentierte [url=%2$s]deinen %3$s[/url]"
|
||||||
|
|
||||||
#: ../../include/enotify.php:114
|
#: ../../include/enotify.php:114
|
||||||
#, php-format
|
#, php-format
|
||||||
|
|
|
@ -1808,7 +1808,7 @@ $a->strings["a private message"] = "eine private Nachricht";
|
||||||
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
|
$a->strings["Please visit %s to view and/or reply to your private messages."] = "Bitte besuche %s, um deine privaten Nachrichten anzusehen und/oder zu beantworten.";
|
||||||
$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
|
$a->strings["%1\$s commented on [url=%2\$s]a %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]a %3\$s[/url]";
|
||||||
$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
|
$a->strings["%1\$s commented on [url=%2\$s]%3\$s's %4\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]%3\$ss %4\$s[/url]";
|
||||||
$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen Beitrag %3\$s[/url]";
|
$a->strings["%1\$s commented on [url=%2\$s]your %3\$s[/url]"] = "%1\$s kommentierte [url=%2\$s]deinen %3\$s[/url]";
|
||||||
$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
|
$a->strings["[Friendica:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Friendica Meldung] Kommentar zum Beitrag #%1\$d von %2\$s";
|
||||||
$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
|
$a->strings["%s commented on an item/conversation you have been following."] = "%s hat einen Beitrag kommentiert, dem du folgst.";
|
||||||
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
|
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bitte besuche %s, um die Konversation anzusehen und/oder zu kommentieren.";
|
||||||
|
|
Loading…
Reference in a new issue