aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorroot <root@diekershoff.homeunix.net>2011-01-21 12:47:31 +0100
committerroot <root@diekershoff.homeunix.net>2011-01-21 12:47:31 +0100
commitecc7fff4e207c9948577c22871e017777fc2509b (patch)
tree99e43b2c75d17addbe268a792094a6b7ea6d4020
parentfdddf93ccc78c7f291be54f04b511983ec6fe030 (diff)
parent734476c5e2cb8e118aa85fba5443131b245acf33 (diff)
downloadvolse-hubzilla-ecc7fff4e207c9948577c22871e017777fc2509b.tar.gz
volse-hubzilla-ecc7fff4e207c9948577c22871e017777fc2509b.tar.bz2
volse-hubzilla-ecc7fff4e207c9948577c22871e017777fc2509b.zip
Merge branch 'master' of git://github.com/tobiasd/friendika
-rw-r--r--view/de/profile_edit.tpl2
-rw-r--r--view/de/registrations-top.tpl2
-rw-r--r--view/de/strings.php60
3 files changed, 32 insertions, 32 deletions
diff --git a/view/de/profile_edit.tpl b/view/de/profile_edit.tpl
index beff3b8bd..09a761023 100644
--- a/view/de/profile_edit.tpl
+++ b/view/de/profile_edit.tpl
@@ -1,4 +1,4 @@
-<h1>Edit Profile Details</h1>
+<h1>Proil Details Bearbeiten</h1>
<div id="profile-edit-links">
<ul>
diff --git a/view/de/registrations-top.tpl b/view/de/registrations-top.tpl
index 1a5c4c34d..d788b515d 100644
--- a/view/de/registrations-top.tpl
+++ b/view/de/registrations-top.tpl
@@ -1,3 +1,3 @@
-<h1>Nutzer Neuanmeldungen die noch bestätigt werden müssen</h1>
+<h1>Schwebende Neuanmeldungen</h1>
diff --git a/view/de/strings.php b/view/de/strings.php
index 695e0ecb4..bca09a5b0 100644
--- a/view/de/strings.php
+++ b/view/de/strings.php
@@ -18,7 +18,7 @@ $a->strings[' likes this.'] = ' mag dies.';
$a->strings[' doesn\'t like this.'] = ' mag dies nicht.';
$a->strings['people'] = 'Leute';
$a->strings['like this.'] = 'mögen dies.';
-$a->strings['don\'t like this.'] = 'mag dies nicht.';
+$a->strings['don\'t like this.'] = 'mögen dies nicht.';
$a->strings['and'] = 'und';
$a->strings[', and '] = ' und ';
$a->strings[' other people'] = ' andere Leute';
@@ -153,7 +153,7 @@ $a->strings['Membership list updated.'] = 'Mitgliedsliste aktualisiert.';
$a->strings['Group removed.'] = 'Gruppe entfernt.';
$a->strings['Unable to remove group.'] = 'Konnte die Gruppe nicht entfernen.';
$a->strings['Delete'] = 'Löschen';
-$a->strings["Welcome to "] = "Welcome to ";
+$a->strings["Welcome to "] = "Willkommen zu ";
$a->strings['Could not create/connect to database.'] = 'Konnte die Verbindung zur Datenbank nicht aufbauen bzw. die Datenbank anlegen.';
$a->strings['Connected to database.'] = 'Mit der Datenbank verbunden.';
$a->strings['Database import succeeded.'] = 'Import der Datenbank erfolgreich.';
@@ -226,36 +226,36 @@ $a->strings['Delete conversation'] = 'Unterhaltung löschen';
$a->strings['Message not available.'] = 'Nachricht nicht verfügbar.';
$a->strings['Delete message'] = 'Nachricht löschen';
$a->strings['Send Reply'] = 'Antwort senden';
-$a->strings['No such group'] = 'No such group';
-$a->strings['Group is empty'] = 'Group is empty';
-$a->strings['Group: '] = 'Group: ';
+$a->strings['No such group'] = 'Es gibt keine solche Gruppe';
+$a->strings['Group is empty'] = 'Gruppe ist leer';
+$a->strings['Group: '] = 'Gruppe: ';
$a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
-$a->strings['Discard'] = 'Discard';
-$a->strings['Ignore'] = 'Ignore';
-$a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
-$a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
-$a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
-$a->strings['yes'] = 'yes';
-$a->strings['no'] = 'no';
-$a->strings['Notification type: '] = 'Notification type: ';
-$a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
-$a->strings['New Follower'] = 'New Follower';
-$a->strings['Approve'] = 'Approve';
-$a->strings['No notifications.'] = 'No notifications.';
-$a->strings['No registrations.'] = 'No registrations.';
-$a->strings['Login failed.'] = 'Login failed.';
-$a->strings["Welcome back "] = "Welcome back ";
-$a->strings['Photo Albums'] = 'Photo Albums';
-$a->strings['Contact Photos'] = 'Contact Photos';
-$a->strings['Contact information unavailable'] = 'Contact information unavailable';
-$a->strings['Profile Photos'] = 'Profile Photos';
-$a->strings['Album not found.'] = 'Album not found.';
-$a->strings['Delete Album'] = 'Delete Album';
-$a->strings['Delete Photo'] = 'Delete Photo';
+$a->strings['Discard'] = 'Verwerfen';
+$a->strings['Ignore'] = 'Ignorieren';
+$a->strings['Show Ignored Requests'] = 'Zeige ignorierte Anfragen';
+$a->strings['Hide Ignored Requests'] = 'Verberge ignorierte Anfragen';
+$a->strings['Claims to be known to you: '] = 'Behauptet dich zu kennen: ';
+$a->strings['yes'] = 'ja';
+$a->strings['no'] = 'nein';
+$a->strings['Notification type: '] = 'Benachrichtigungs Typ: ';
+$a->strings['Friend/Connect Request'] = 'Kontakt-/Freundschaftsanfrage';
+$a->strings['New Follower'] = 'Neuer Anhänger';
+$a->strings['Approve'] = 'Genehmigen';
+$a->strings['No notifications.'] = 'Keine Benachrichtigungen.';
+$a->strings['No registrations.'] = 'Keine Neuanmeldungen.';
+$a->strings['Login failed.'] = 'Annmeldung fehlgeschlagen.';
+$a->strings["Welcome back "] = "Willkommen zurück ";
+$a->strings['Photo Albums'] = 'Fotoalben';
+$a->strings['Contact Photos'] = 'Kontaktbilder';
+$a->strings['Contact information unavailable'] = 'Kontakt Informationen nicht verfügbar';
+$a->strings['Profile Photos'] = 'Profilbilder';
+$a->strings['Album not found.'] = 'Album nicht gefunden.';
+$a->strings['Delete Album'] = 'Album löschen';
+$a->strings['Delete Photo'] = 'Foto löschen';
$a->strings['was tagged in a'] = 'was tagged in a';
$a->strings['by'] = 'by';
-$a->strings['Image exceeds size limit of '] = 'Image exceeds size limit of ';
-$a->strings['Unable to process image.'] = 'Unable to process image.';
+$a->strings['Image exceeds size limit of '] = 'Die Bildgröße übersteigt das Limit von ';
+$a->strings['Unable to process image.'] = 'Konntte das Bild nicht bearbeiten.';
$a->strings['Image upload failed.'] = 'Image upload failed.';
$a->strings['No photos selected'] = 'No photos selected';
$a->strings['Upload Photos'] = 'Upload Photos';
@@ -377,7 +377,7 @@ $a->strings['second'] = 'Sekunde';
$a->strings['seconds'] = 'Sekunden';
$a->strings[' ago'] = ' her';
$a->strings['Create a new group'] = 'Neue Gruppe erstellen';
-$a->strings['Everybody'] = 'Jede(r)';
+$a->strings['Everybody'] = 'Alle Kontakte';
$a->strings['Logout'] = 'Abmelden';
$a->strings['Home'] = 'Persönlich';
$a->strings['Directory'] = 'Verzeichnis';