Make sure custom settings are picked up by tests

[rails.git] / config / locales / oc.yml

diff --git a/config/locales/oc.yml b/config/locales/oc.yml
index 483544d464805fccbe98f533315014362a213e4d..75b295b43e507473079a9dc0704c125f020a2bd4 100644 (file)
--- a/config/locales/oc.yml
+++ b/config/locales/oc.yml
@@ -293,8 +293,8 @@ oc:
       open_title: Nòta pas resolguda nº %{note_name}
       closed_title: Nòta resolguda nº %{note_name}
       hidden_title: Nòta amagada nº %{note_name}
       open_title: Nòta pas resolguda nº %{note_name}
       closed_title: Nòta resolguda nº %{note_name}
       hidden_title: Nòta amagada nº %{note_name}

-      open_by: Creat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
-      open_by_anonymous: Creat per un utilizaire anonim <abbr title='%{exact_time}'>fa
+      opened_by: Creat per %{user} <abbr title='%{exact_time}'>fa %{when}</abbr>
+      opened_by_anonymous: Creat per un utilizaire anonim <abbr title='%{exact_time}'>fa

         %{when}</abbr>
       commented_by: Comentari de %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Comentat per un utilizaire anonim <abbr title='%{exact_time}'>fa
         %{when}</abbr>
       commented_by: Comentari de %{user} fa <abbr title='%{exact_time}'>%{when}</abbr>
       commented_by_anonymous: Comentat per un utilizaire anonim <abbr title='%{exact_time}'>fa


@@ -843,7 +843,7 @@ oc:
           isolated_dwelling: Escart
           locality: Localitat
           municipality: Municipalitat
           isolated_dwelling: Escart
           locality: Localitat
           municipality: Municipalitat

-          neighbourhood: Quartier de vila
+          neighbourhood: Quartier forestier, escart

           postcode: Còdi postal
           quarter: Quartièr
           region: Region
           postcode: Còdi postal
           quarter: Quartièr
           region: Region


@@ -851,7 +851,7 @@ oc:
           square: Plaça
           state: Estat / província
           subdivision: Subdivision
           square: Plaça
           state: Estat / província
           subdivision: Subdivision

-          suburb: Quartier exterior
+          suburb: Quartier de vila, borgada

           town: Vila
           unincorporated_area: Luòc pas organizat
           village: Vilatge
           town: Vila
           unincorporated_area: Luòc pas organizat
           village: Vilatge


@@ -1838,7 +1838,7 @@ oc:
       upload_trace: Mandar una traça
       see_all_traces: Veire totas las traças
       see_my_traces: véder las mias traças
       upload_trace: Mandar una traça
       see_all_traces: Veire totas las traças
       see_my_traces: véder las mias traças

-    delete:
+    destroy:

       scheduled_for_deletion: Pista prevista per la supression
     make_public:
       made_public: Pista renduda publica
       scheduled_for_deletion: Pista prevista per la supression
     make_public:
       made_public: Pista renduda publica