diff --git a/config/langcodes_alias_map.yml b/config/langcodes_alias_map.yml
index 8a782b0d6..f503a7b64 100644
--- a/config/langcodes_alias_map.yml
+++ b/config/langcodes_alias_map.yml
@@ -3,3 +3,4 @@ en-shaw: [:en, :en-GB, :en-US]
 sv: [:sv-SE]
 he: [:he-IL]
 es-CL: [:es]
+gl: [:gl-ES]
diff --git a/config/languages.yml b/config/languages.yml
index 5e07d1fd2..159898cd0 100644
--- a/config/languages.yml
+++ b/config/languages.yml
@@ -13,6 +13,7 @@ available:
   fi: 'Suomi'
   fr: 'Français'
   ga: 'Gaeilge'
+  gl: 'Galego'
   he: 'עברית'
   hu: 'magyar nyelv'
   id: 'Bahasa Indonesia'
diff --git a/config/locales/devise/devise.gl-ES.yml b/config/locales/devise/devise.gl.yml
similarity index 99%
rename from config/locales/devise/devise.gl-ES.yml
rename to config/locales/devise/devise.gl.yml
index 1ed57e382..e903ef3cb 100644
--- a/config/locales/devise/devise.gl-ES.yml
+++ b/config/locales/devise/devise.gl.yml
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 
-gl-ES: 
+gl: 
   devise: 
     confirmations: 
       confirmed: "A túa conta foi confirmada. Xa estás en Diaspora"
diff --git a/config/locales/diaspora/da.yml b/config/locales/diaspora/da.yml
index f3eebb9fe..68f6c1fc2 100644
--- a/config/locales/diaspora/da.yml
+++ b/config/locales/diaspora/da.yml
@@ -197,7 +197,7 @@ da:
     index: 
       mark_all_as_read: "Marker alle som læst"
       notifications: "Notifikationer"
-    mentioned: "has mentioned you in their"
+    mentioned: "har omtalt dig i deres"
     new_request: "tilbød at dele med dig."
     post: "indlæg"
     request_accepted: "accepterede din anmodning."
@@ -205,18 +205,18 @@ da:
     also_commented: 
       commented: "har også kommenteret på %{post_author}'s post:"
       sign_in: "Log in for at se det."
-      subject: "%{name} har også kommenteret."
+      subject: "%{name} har også kommenteret på din kontakts post."
     comment_on_post: 
-      commented: "har kommenteret på din post!"
+      commented: "har kommenteret på din post:"
       sign_in: "Log in for at se det."
       subject: "%{name} har kommenteret på din post!"
     diaspora: "Diaspora e-mail robotten"
     hello: "Hej %{name}!"
     love: "Hilsen,"
     mentioned: 
-      mentioned: "mentioned you in a post:"
-      sign_in: "Sign in to view it."
-      subject: "%{name} has mentioned you on Diaspora*"
+      mentioned: "omtalte dig i en post:"
+      sign_in: "Log in for at se det."
+      subject: "%{name} har omtalt dig på Diaspora*"
     new_request: 
       just_sent_you: "har lige sendt dig en kontaktanmodning på Diaspora*"
       sign_in: "Log ind her"
@@ -279,10 +279,10 @@ da:
       accepts: "Så snart %{name} accepterer, vil i begynde at se hinandens indlæg på Diaspora"
       share_with: "Begynd at dele med %{name}"
     share_with_pane: 
-      add_new_aspect: "add new aspect"
+      add_new_aspect: "Tilføj nyt aspekt"
     show: 
       does_not_exist: "Personen findes ikke!"
-      incoming_request: "Du har en anmodning fra denne person."
+      incoming_request: "%{name} vil gerne dele med dig."
       no_posts: "ingen indlæg at vise!"
       not_connected: "Du er ikke forbundet til denne person."
       recent_posts: "Nylige indlæg"
@@ -425,7 +425,7 @@ da:
       all: "alle"
       all_contacts: "alle kontaktpersoner"
       make_public: "offentliggør"
-      mention_helper_text: "to mention someone, press '@' and start typing their name"
+      mention_helper_text: "for at nævne nogen i en post, tryk '@' og begynd at skrive deres navn"
       post_a_message_to: "Send en besked til %{aspect}"
       posting: "Sender..."
       share: "Del"
@@ -435,7 +435,7 @@ da:
       reshare: "Del igen"
   status_messages: 
     destroy: 
-      failure: "Failed to delete post"
+      failure: "Kunne ikke slette post."
     helper: 
       no_message_to_display: "Ingen beskeder at vise."
     new_status_message: 
@@ -475,11 +475,11 @@ da:
       signup_steps: "Fuldfør din tilmelding ved at gøre følgende:"
       skip: "spring kom godt i gang over"
       step_2: 
-        find_your_friends_on_diaspora: "Would you like to find your Facebook friends on Diaspora?"
-        skip: "Skip"
+        find_your_friends_on_diaspora: "Vil du gerne finde dine Facebook venner på Diaspora?"
+        skip: "Spring over"
       step_3: 
-        finish: "Finish"
-        people_already_on_diaspora: "People already on Diaspora"
+        finish: "Færdig"
+        people_already_on_diaspora: "Personer bruger allerede Diaspora"
       welcome: "Velkommen til Diaspora!"
     public: 
       does_not_exist: "Brugeren %{username} findes ikke!"
diff --git a/config/locales/diaspora/gl-ES.yml b/config/locales/diaspora/gl.yml
similarity index 99%
rename from config/locales/diaspora/gl-ES.yml
rename to config/locales/diaspora/gl.yml
index 0a2d7fd67..a444b85be 100644
--- a/config/locales/diaspora/gl-ES.yml
+++ b/config/locales/diaspora/gl.yml
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 
-gl-ES: 
+gl: 
   _aspect: "Aspecto"
   _aspects: "Aspectos"
   _comment: "Comentar"
diff --git a/config/locales/javascript/javascript.gl-ES.yml b/config/locales/javascript/javascript.gl.yml
similarity index 99%
rename from config/locales/javascript/javascript.gl-ES.yml
rename to config/locales/javascript/javascript.gl.yml
index e624741cf..25c80a385 100644
--- a/config/locales/javascript/javascript.gl-ES.yml
+++ b/config/locales/javascript/javascript.gl.yml
@@ -3,7 +3,7 @@
 #   the COPYRIGHT file.
 
 
-gl-ES: 
+gl: 
   javascripts: 
     confirm_dialog: "Seguro?"
     search_for: "Procurar a {{name}}"