From 8323e7dcb21189ad5aa010dea2c28df141110e58 Mon Sep 17 00:00:00 2001 From: Daniele Di Sarli Date: Sat, 25 Sep 2010 01:21:52 +0800 Subject: [PATCH 01/14] Added Italian translation --- config/locales/diaspora/it.yml | 197 ++++++++++++++++++++++++++++++++- 1 file changed, 196 insertions(+), 1 deletion(-) diff --git a/config/locales/diaspora/it.yml b/config/locales/diaspora/it.yml index 4cce93d73..9ef8c0f7c 100644 --- a/config/locales/diaspora/it.yml +++ b/config/locales/diaspora/it.yml @@ -7,4 +7,199 @@ # See http://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points. it: - hello: "Ciao Mondo" + hello: "Ciao mondo" + application: + helper: + unknown_person: "persona sconosciuta" + new_requests: "nuove richieste" + dashboards: + helper: + home: "home" + error_messages: + helper: + invalid_fields: "Campi non validi" + correct_the_following_errors_and_try_again: "Correggi i seguenti errori e riprova." + people: + helper: + results_for: " risultati per %{params}" + people_on_pod_are_aware_of: " people on pod are aware of" + layouts: + application: + edit_profile: "modifica profilo" + logout: "disconnetti" + shared: + aspect_nav: + all_aspects: "Tutti gli Aspetti" + manage: "Gestisci" + manage_your_aspects: "Gestisci i tuoi Aspetti" + sub_header: + all_aspects: "Tutti gli Aspetti" + manage_aspects: "Gestisci Aspetti" + publisher: + share: "Condividi" + aspect_friends: + add_friends: "aggiungi amici" + albums: + album: + you: "tu" + new_album: + create: "crea" + add_a_new_album: "Aggiungi un nuovo album" + show: + edit_album: "Modifica album" + albums: "album" + updated: "aggiornato" + by: "da" + edit: + editing: "Modifica" + updated: "aggiornato" + are_you_sure: "Sei sicuro?" + delete_album: "Elimina album" + cancel: "Annulla" + index: + home: "home" + new_album: "Nuovo album" + create: + success: "Hai creato un album chiamato %{name}." + update: + success: "L'album %{name} è stato modificato." + failure: "Modifica dell'album %{name} fallita." + destroy: + success: "L'album %{name} è stato eliminato." + helper: + friends_albums: "Album degli amici" + your_albums: "I tuoi album" + aspects: + index: + photos: "foto" + show: + photos: "foto" + manage: + add_a_new_aspect: "Aggiungi un nuovo aspetto" + add_a_new_friend: "Aggiungi un nuovo amico" + show: "Mostra" + update_aspects: "Aggiorna Aspetti" + requests: "Richieste" + ignore_remove: "Ignora/Rimuovi" + new_aspect: + add_a_new_aspect: "Aggiungi un nuovo aspetto" + create: "Crea" + create: + success: "Clicca sul segno "più" nella parte sinistra per dire a Diaspora chi può vedere il tuo nuovo aspetto." + destroy: + success: "%{name} è stato rimosso con successo." + update: + success: "Il tuo aspetto, %{name}, è stato modificato con successo." + move_friends: + failure: "Modifica dell'aspetto fallita per l'amico %{real_name}." + success: "Aspetti modificati con successo." + move_friend: + failure: "non ha funzionato %{inspect}" + success: "Adesso stai mostrando al tuo amico un aspetto differente di te stesso." + helper: + remove: "rimuovi" + aspect_not_empty: "Aspetto non vuoto" + users: + edit: + cancel: "Annulla" + update_profile: "Aggiorna profilo" + home: "Home" + diaspora_username: "NOME UTENTE DIASPORA" + info: "Info" + picture: "Immagine" + editing_profile: "Modifica del profilo" + albums: "Album" + you_dont_have_any_photos: "Non hai nessuna foto! Vai alla pagina" + page_to_upload_some: "per caricarne qualcuna." + comments: + comment: + ago: "fa" + new_comment: + comment: "Commento" + photos: + show: + prev: "indietro" + full_size: "dimensione intera" + next: "avanti" + edit_photo: "Modifica foto" + delete_photo: "Elimina foto" + are_you_sure: "Sei sicuro?" + comments: "commenti" + edit: + editing: "Modifica" + are_you_sure: "Sei sicuro?" + delete_photo: "Elimina foto" + photo: + show_comments: "mostra commenti" + posted_a_new_photo_to: "ha caricato una nuova foto in" + new: + new_photo: "Nuova foto" + back_to_list: "Torna all'elenco" + post_it: "inseriscila!" + create: + runtime_error: "Caricamento della foto fallito. Sei sicuro che la tua cintura di sicurezza è allacciata?" + integrity_error: "Caricamento della foto fallito. Sei sicuro che era un'immagine?" + type_error: "Caricamento della foto fallito. Sei sicuro di aver aggiunto un'immagine?" + update: + notice: "Foto aggiornata con successo." + error: "Modifica della foto fallita." + destroy: + notice: "Foto eliminata." + registrations: + new: + sign_up: "Iscriviti" + create: + success: "Ti sei unito a Diaspora!" + status_messages: + new_status_message: + tell_me_something_good: "dimmi qualcosa di buono" + oh_yeah: "oh si!" + status_message: + show_comments: "mostra commenti" + delete: "Elimina" + are_you_sure: "Sei sicuro?" + show: + status_message: "Messaggio di stato" + comments: "commenti" + are_you_sure: "Sei sicuro?" + destroy: "Distruggi" + view_all: "Vedi tutto" + message: "Messaggio" + owner: "Proprietario" + helper: + no_message_to_display: "Nessun messaggio da visualizzare." + people: + person: + add_friend: "aggiungi amico" + pending_request: "richiesta in sospeso" + index: + add_friend: "aggiungi amico" + real_name: "nome reale" + diaspora_handle: "diaspora handle" + thats_you: "sei tu!" + friend_request_pending: "richiesta d'amicizia in sospeso" + you_have_a_friend_request_from_this_person: "hai una richiesta d'amicizia da questa persona" + new: + new_person: "Nuova persona" + back_to_list: "Torna all'elenco" + show: + last_seen: "ultima visualizzazione: %{how_long_ago}" + friends_since: "amici da: %{how_long_ago}" + save: "salva" + are_you_sure: "Sei sicuro?" + remove_friend: "rimuovi amico" + requests: + new_request: + add_a_new_friend_to: "Aggiungi un amico a" + enter_a_diaspora_username: "Inserisci un nome utente Diaspora:" + your_diaspora_username_is: "Il tuo nome utente Diaspora è: %{diaspora_handle}" + friends_username: "nome utente dell'amico" + destroy: + success: "Adesso siete amici." + error: "Seleziona un aspetto!" + ignore: "Ignora richiesta di amicizia." + create: + error: "Nessun seed Diaspora trovato con questa email!" + already_friends: "Sei già amico con %{destination_url}!" + success: "Una richiesta di amicizia è stata inviata a %{destination_url}." + horribly_wrong: "Qualcosa è andato orribilmente storto." From d66eedaf0046eff40603c696d6af13977117a5b5 Mon Sep 17 00:00:00 2001 From: hemanth Date: Fri, 17 Sep 2010 21:57:02 +0800 Subject: [PATCH 02/14] Fixed a major issue with sudo user check\! --- ubuntu-setup.bash | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 67b602abe..24f4af871 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -8,7 +8,8 @@ shopt -s extglob # Check if the user has sudo privileges. -[[ $( id -u) ]] && echo "$(whoami) has no sudo permissions on this machine" && exit 1 +sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; } + # Install build tools echo "Installing build tools.." From 1add029421f701f2704525c20d726f72347f5d09 Mon Sep 17 00:00:00 2001 From: hemanth Date: Fri, 17 Sep 2010 23:48:06 +0800 Subject: [PATCH 03/14] Check for wget added --- ubuntu-setup.bash | 3 +++ 1 file changed, 3 insertions(+) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 24f4af871..f9e7d9ff8 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -11,6 +11,9 @@ shopt -s extglob sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; } +# Check if wget is installed +test wget || echo "Installing wget.." && sudo apt-get install wget && echo "Installed wget.." + # Install build tools echo "Installing build tools.." sudo apt-get -y --no-install-recommends install build-essential libxslt1.1 libxslt1-dev libxml2 From d4ad943699e76489f7efd8059c2d8e5b80cad95a Mon Sep 17 00:00:00 2001 From: hemanth Date: Sat, 18 Sep 2010 01:43:15 +0800 Subject: [PATCH 04/14] Check on universe repository, if enabled or not. --- ubuntu-setup.bash | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index f9e7d9ff8..50a2f4ff7 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -10,6 +10,8 @@ shopt -s extglob # Check if the user has sudo privileges. sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; } +# Check if universal repository is enabled +grep -i universe /etc/apt/sources.list >> /dev/null || echo "Please enable universe repository" && exit 1 # Check if wget is installed test wget || echo "Installing wget.." && sudo apt-get install wget && echo "Installed wget.." From 5682cf59ab71ac215062f8f38f092dd10495b922 Mon Sep 17 00:00:00 2001 From: hemanth Date: Sat, 18 Sep 2010 02:28:13 +0800 Subject: [PATCH 05/14] Added a check on if the user has already cloned and also a set -e to exit immediately if a command exits with a non-zero status. --- ubuntu-setup.bash | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 50a2f4ff7..bb62088a9 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -2,7 +2,9 @@ # Author : hemanth.hm@gmail.com # Site : www.h3manth.com # This script helps to setup diaspora. -# + +# Exit immediately if a command exits with a non-zero status. +set -e # Set extented globbing shopt -s extglob @@ -82,9 +84,11 @@ echo "Installed blunder.." # Take a clone of Diaspora ( -echo "Clone diaspora source.." -git clone http://github.com/diaspora/diaspora.git + +# Check if the user is already in a cloned source if not clone the source +[[ $( basename $PWD ) == "diaspora" ]] && echo "Already in diaspora directory" || git clone http://github.com/diaspora/diaspora.git ; cd diaspora echo "Cloned the source.." + # Install extra gems cd diaspora echo "Installing more gems.." From dc0fc1f4451c9a7472df5b32b6086fd86b56e8ec Mon Sep 17 00:00:00 2001 From: hemanth Date: Sat, 18 Sep 2010 02:38:13 +0800 Subject: [PATCH 06/14] set -e removed as the rules change from one Bash version to another, as Bash attempts to track the extremely slippery POSIX definition of this "feature". When a SubShell is involved, it gets worse still -- the behavior changes depending on whether Bash is invoked in POSIX mode. --- ubuntu-setup.bash | 3 --- 1 file changed, 3 deletions(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index bb62088a9..65231d9d0 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -3,9 +3,6 @@ # Site : www.h3manth.com # This script helps to setup diaspora. -# Exit immediately if a command exits with a non-zero status. -set -e - # Set extented globbing shopt -s extglob From 585cc7a480ef4327afc500c1883554f7f6356add Mon Sep 17 00:00:00 2001 From: hemanth Date: Sat, 18 Sep 2010 04:49:08 +0800 Subject: [PATCH 07/14] Check if universal repository is enabled or not. --- ubuntu-setup.bash | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 65231d9d0..a969d0fe3 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -10,7 +10,7 @@ shopt -s extglob sudo -v >/dev/null 2>&1 || { echo $(whoami) has no sudo privileges ; exit 1; } # Check if universal repository is enabled -grep -i universe /etc/apt/sources.list >> /dev/null || echo "Please enable universe repository" && exit 1 +grep -i universe /etc/apt/sources.list > /dev/null || { echo "Please enable universe repository" ; exit 1 ; } # Check if wget is installed test wget || echo "Installing wget.." && sudo apt-get install wget && echo "Installed wget.." From 043dadf0ea53208b7d32fabfaa8a4e61b8680c6c Mon Sep 17 00:00:00 2001 From: Daniel Thomas Date: Mon, 20 Sep 2010 04:10:29 +0800 Subject: [PATCH 08/14] Update copyright information on ubuntu-setup.bash Adding Diaspora Inc. copyright and reference to the AGPL and noting that Mackenzie Morgan (maco) and I have made contributions to the file. Signed-off-by: Daniel Thomas --- ubuntu-setup.bash | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index a969d0fe3..f9d4ff9fb 100644 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -1,7 +1,13 @@ #!/bin/bash # Author : hemanth.hm@gmail.com # Site : www.h3manth.com +# Contributions from: Mackenzie Morgan (maco) and Daniel Thomas (drt24) # This script helps to setup diaspora. +# +# Copyright (c) 2010, Diaspora Inc. This file is +# licensed under the Affero General Public License version 3. See +# the COPYRIGHT file. + # Set extented globbing shopt -s extglob From 8a30a287afa9bbe81a41ee488c1957f8b8d8ae87 Mon Sep 17 00:00:00 2001 From: Daniel Thomas Date: Mon, 20 Sep 2010 04:30:31 +0800 Subject: [PATCH 09/14] Make ubuntu-setup.bash executable So that it can run directly when checked out without needing to have chmod +x ubuntu-setup.bash run first. Signed-off-by: Daniel Thomas --- ubuntu-setup.bash | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 ubuntu-setup.bash diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash old mode 100644 new mode 100755 From c5aa22fd284fb8639f952969e4522c1a7709fa95 Mon Sep 17 00:00:00 2001 From: maco Date: Sat, 18 Sep 2010 04:40:33 +0800 Subject: [PATCH 10/14] ubuntu-setup.bash: for rubygems, use maverick's repo or if lucid use ppa or if old use tarball. create /var/lib/gems/1.8/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games-friendly symlink if using debs --- ubuntu-setup.bash | 38 ++++++++++++++++++++++++++------------ 1 file changed, 26 insertions(+), 12 deletions(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index f9d4ff9fb..533524235 100755 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -65,18 +65,32 @@ echo "Installed git-core.." # Setting up ruby gems echo "Fetching and installing ruby gems.." ( - echo "." - cd /tmp - wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz - echo "." - tar -xf rubygems-1.3.7.tgz - echo "." - cd rubygems-1.3.7 - echo "." - sudo ruby setup.rb - echo "." - sudo ln -s /usr/bin/gem1.8 /usr/bin/gem - echo "." + RELEASE=$(lsb_release -c | cut -f2) + if [ RELEASE == "maverick" ] + then + sudo apt-get install --no-install-recommends -y rubygems + sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH + elsif [ RELEASE == "lucid" ] + then + sudo add-apt-repository ppa:maco.m/ruby + sudo apt-get update + sudo apt-get install --no-install-recommends -y rubygems + sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH + else + # Old version + echo "." + cd /tmp + wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz + echo "." + tar -xf rubygems-1.3.7.tgz + echo "." + cd rubygems-1.3.7 + echo "." + sudo ruby setup.rb + echo "." + sudo ln -s /usr/bin/gem1.8 /usr/bin/gem + echo "." + fi ) echo "Done installing the gems.." From ea2739e89225daf2ef32b384c6f8ac8e41b6ce10 Mon Sep 17 00:00:00 2001 From: maco Date: Sun, 19 Sep 2010 06:10:19 +0800 Subject: [PATCH 11/14] ubuntu-setup.bash: fix s/blunder/bundler/ and s/elsif/elif/ --- ubuntu-setup.bash | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ubuntu-setup.bash b/ubuntu-setup.bash index 533524235..08c839f33 100755 --- a/ubuntu-setup.bash +++ b/ubuntu-setup.bash @@ -70,7 +70,7 @@ echo "Fetching and installing ruby gems.." then sudo apt-get install --no-install-recommends -y rubygems sudo ln -s /var/lib/gems/1.8/bin/bundle /usr/local/bin/bundle #for PATH - elsif [ RELEASE == "lucid" ] + elif [ RELEASE == "lucid" ] then sudo add-apt-repository ppa:maco.m/ruby sudo apt-get update @@ -94,10 +94,10 @@ echo "Fetching and installing ruby gems.." ) echo "Done installing the gems.." -# Install blunder -echo "Installing blunder.." +# Install bundler +echo "Installing bundler.." sudo gem install bundler -echo "Installed blunder.." +echo "Installed bundler.." # Take a clone of Diaspora ( From e2db21d7b06f147a14fd51ab5b332bc5eacbbe8a Mon Sep 17 00:00:00 2001 From: sennewood Date: Fri, 24 Sep 2010 14:25:04 +0800 Subject: [PATCH 12/14] Use double quotes in locale files --- config/locales/devise/devise.de.yml | 42 ++++++++++++++--------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/config/locales/devise/devise.de.yml b/config/locales/devise/devise.de.yml index 7c0e0e758..82b658e99 100644 --- a/config/locales/devise/devise.de.yml +++ b/config/locales/devise/devise.de.yml @@ -12,30 +12,30 @@ de: devise: failure: - unauthenticated: 'Du musst dich anmelden oder registrieren um fortzufahren.' - unconfirmed: 'Du musst dein Konto bestätigen um fortzufahren.' - locked: 'Dein Konto ist gesperrt.' - invalid: 'Ungültige E-Mail-Adresse oder Passwort.' - invalid_token: 'Ungültiger Authentifizierungstoken.' - timeout: 'Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren.' - inactive: 'Dein Konto wurde noch nicht aktiviert.' + unauthenticated: "Du musst dich anmelden oder registrieren um fortzufahren." + unconfirmed: "Du musst dein Konto bestätigen um fortzufahren." + locked: "Dein Konto ist gesperrt." + invalid: "Ungültige E-Mail-Adresse oder Passwort." + invalid_token: "Ungültiger Authentifizierungstoken." + timeout: "Deine Sitzung ist abgelaufen, bitte melde dich erneut an um fortzufahren." + inactive: "Dein Konto wurde noch nicht aktiviert." sessions: - signed_in: 'Erfolgreich angemeldet.' - signed_out: 'Erfolgreich abgemeldet.' + signed_in: "Erfolgreich angemeldet." + signed_out: "Erfolgreich abgemeldet." passwords: - send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt.' - updated: 'Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet.' + send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Passwort zurücksetzt." + updated: "Dein Passwort wurde erfolgreich geändert. Du bist nun angemeldet." confirmations: - send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst.' - confirmed: 'Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet.' + send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto bestätigst." + confirmed: "Dein Konto wurde erfolgreich bestätigt. Du bist nun angemeldet." registrations: - signed_up: 'Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet.' - updated: 'Dein Konto wurde aktualisiert.' - destroyed: 'Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen.' + signed_up: "Du hast dich erfolgreich registriert. Sofern aktiviert, wurde dir eine Bestätigung per E-Mail gesendet." + updated: "Dein Konto wurde aktualisiert." + destroyed: "Tschüss! Dein Konto wurde erfolgreich gekündigt. Wir hoffen dich bald wiederzusehen." unlocks: - send_instructions: 'Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst.' - unlocked: 'Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet.' + send_instructions: "Du wirst in ein paar Minuten eine E-Mail erhalten, die beschreibt, wie du dein Konto entsperren kannst." + unlocked: "Dein Konto wurde erfolgreich entsperrt. Du bist nun angemeldet." mailer: - confirmation_instructions: 'Instruktionen zur Bestätigung' - reset_password_instructions: 'Instruktionen zum Zurücksetzen des Passworts' - unlock_instructions: 'Instruktionen zum Entsperren' + confirmation_instructions: "Instruktionen zur Bestätigung" + reset_password_instructions: "Instruktionen zum Zurücksetzen des Passworts" + unlock_instructions: "Instruktionen zum Entsperren" From 16e5f972d12f01eb4b788205f2796e92a04aff41 Mon Sep 17 00:00:00 2001 From: sennewood Date: Fri, 24 Sep 2010 14:44:14 +0800 Subject: [PATCH 13/14] Translation correction --- config/locales/diaspora/de.yml | 44 +++++++++++++++++----------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index 1c4dfb4ad..831b92c52 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -14,15 +14,15 @@ de: new_requests: "neue Anfrage" dashboards: helper: - home: "home" + home: "Startseite" error_messages: helper: invalid_fields: "Ungültige Felder" - correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und probier es erneut." + correct_the_following_errors_and_try_again: "Korrigiere die folgenden Fehler und probiere es erneut." people: helper: - results_for: " resultados para %{params}" - people_on_pod_are_aware_of: " gente en pod estan al tanto de " + results_for: " Resultate für %{params}" + people_on_pod_are_aware_of: " people on pod are aware of" layouts: application: edit_profile: "Profil bearbeiten" @@ -85,19 +85,19 @@ de: add_a_new_aspect: "Neuen Aspekt erstellen" create: "Erstellen" create: - success: "Klicke auf das Plus auf der rechten Seite um Diaspora mitzuteilen wer deinen neuen Aspekt sehen kann." + success: "Klicke auf das Plus auf der linken Seite um Diaspora mitzuteilen wer deinen neuen Aspekt sehen kann." destroy: success: "%{name} wurde erfolgreich gelöscht." update: success: "Dein Aspekt, %{name}, wurde erfolgreich geändert." move_friends: - failure: "Aspect editing failed for friend %{real_name}." + failure: "Ändern des Aspekts für deinen Freund %{real_name} schlug fehl." success: "Aspekt erfolgreich geändert." move_friend: error: "didn't work %{inspect}" - notice: "You are now showing your friend a different aspect of yourself." + notice: "Du zeigst deinem Freund jetzt einen anderen Aspekt von dir." helper: - remove: "remove" + remove: "entfernen" aspect_not_empty: "Aspekt ist nicht leer" users: edit: @@ -109,8 +109,8 @@ de: picture: "Bild" editing_profile: "Profil bearbeiten" albums: "Alben" - you_dont_have_any_photos: "#TODO" - page_to_upload_some: "#TODO" + you_dont_have_any_photos: "Du hast keine Fotos! Gehe auf die" + page_to_upload_some: "Seite um welche hochzuladen." comments: comment: # this won't work in german at all. Needs more thorough I18n @@ -132,18 +132,18 @@ de: delete_photo: "Foto löschen" photo: show_comments: "Kommentare anzeigen" - posted_a_new_photo_to: "posted a new photo to" + posted_a_new_photo_to: "neues Fotos veröffentlicht bei" new: new_photo: "Foto erstellen" back_to_list: "Zurück zur Liste" post_it: "Hochladen" create: - runtime_error: "Photo upload failed. Are you sure that your seatbelt is fastened?" - integrity_error: "Photo upload failed. Are you sure that was an image?" - type_error: "Photo upload failed. Are you sure an image was added?" + runtime_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass dein Sicherheitsgurt befestigt ist?" + integrity_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass das ein Bild war?" + type_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass ein Bild hinzugefügt wurde?" update: notice: "Foto erfolgreich aktualisiert." - error: "Failed to edit photo." + error: "Ändern des Fotos fehlgeschlagen." destroy: notice: "Foto gelöscht." registrations: @@ -154,7 +154,7 @@ de: status_messages: new_status_message: tell_me_something_good: "Erzähl' mir was schönes!" - oh_yeah: "Hey, super!" + oh_yeah: "Oh, super!" status_message: show_comments: "Kommentare anzeigen" delete: "Löschen" @@ -166,13 +166,13 @@ de: destroy: "Löschen" view_all: "Alle anzeigen" message: "Nachricht" - owner: "Besitzer" + owner: "Eigentümer" helper: - no_message_to_display: "No message to display." + no_message_to_display: "Keine Nachricht zum anzeigen." people: index: add_friend: "Freund hinzufügen" - real_name: "real name" + real_name: "Echter Name" diaspora_handle: "diaspora handle" thats_you: "das bist du!" friend_request_pending: "Freundschaftsanfrage ausstehend" @@ -183,15 +183,15 @@ de: show: last_seen: "zuletzt gesehen: %{how_long_ago}" friends_since: "Freunde seit: %{how_long_ago}" - save: "save" + save: "speichern" are_you_sure: "Bist du sicher?" - remove_friend: "remove friend" + remove_friend: "Freund entfernen" destroy: success: "Ihr seid jetzt Freunde." error: "Bitte wähle einen Aspekt aus!" ignore: "Freundschaftsanfrage ignorieren." create: - error: "No diaspora seed found with this email!" + error: "Kein Diaspora-Seed in dieser E-Mail gefunden!" already_friends: "Du bist bereits mit %{destination_url} befreundet!" success: "Eine Freundschaftsanfrage wurde an %{destination_url} gesendet." horribly_wrong: "Etwas ging tierisch schief." From dcedc5d505f615b554d63fb9f011c17586774f83 Mon Sep 17 00:00:00 2001 From: sennewood Date: Fri, 24 Sep 2010 14:56:45 +0800 Subject: [PATCH 14/14] Added the missing lines of code and translated them. --- config/locales/diaspora/de.yml | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml index 831b92c52..ae8fb13e3 100644 --- a/config/locales/diaspora/de.yml +++ b/config/locales/diaspora/de.yml @@ -91,7 +91,7 @@ de: update: success: "Dein Aspekt, %{name}, wurde erfolgreich geändert." move_friends: - failure: "Ändern des Aspekts für deinen Freund %{real_name} schlug fehl." + failure: "Ändern des Aspekts für deinen Freund %{real_name} fehlgeschlagen." success: "Aspekt erfolgreich geändert." move_friend: error: "didn't work %{inspect}" @@ -132,13 +132,13 @@ de: delete_photo: "Foto löschen" photo: show_comments: "Kommentare anzeigen" - posted_a_new_photo_to: "neues Fotos veröffentlicht bei" + posted_a_new_photo_to: "neues Foto veröffentlicht bei" new: new_photo: "Foto erstellen" back_to_list: "Zurück zur Liste" post_it: "Hochladen" create: - runtime_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass dein Sicherheitsgurt befestigt ist?" + runtime_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass dein Sicherheitsgurt befestigt ist?" integrity_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass das ein Bild war?" type_error: "Hochladen eines Fotos fehlgeschlagen. Bist du sicher, dass ein Bild hinzugefügt wurde?" update: @@ -170,13 +170,16 @@ de: helper: no_message_to_display: "Keine Nachricht zum anzeigen." people: + person: + add_friend: "Freund hinzufügen" + pending_request: "Anfrage ausstehend" index: add_friend: "Freund hinzufügen" real_name: "Echter Name" diaspora_handle: "diaspora handle" thats_you: "das bist du!" - friend_request_pending: "Freundschaftsanfrage ausstehend" - you_have_a_friend_request_from_this_person: "du hast eine Freundschaftsanfrage von dieser Person" + friend_request_pending: "Ausstehende Freundschaftsanfrage" + you_have_a_friend_request_from_this_person: "Du hast eine Freundschaftsanfrage von dieser Person" new: new_person: "Neue Person" back_to_list: "Zurück zur Liste" @@ -186,6 +189,12 @@ de: save: "speichern" are_you_sure: "Bist du sicher?" remove_friend: "Freund entfernen" + requests: + new_request: + add_a_new_friend_to: "Add a new friend to" + enter_a_diaspora_username: "Gebe einen Diaspora Benutzernamen ein:" + your_diaspora_username_is: "Dein Diaspora Benutzername ist: %{diaspora_handle}" + friends_username: "Freundes Benutzername" destroy: success: "Ihr seid jetzt Freunde." error: "Bitte wähle einen Aspekt aus!"