Skip to content
Browse files

avoid translation key clash

  • Loading branch information...
1 parent 315ace9 commit 5406045f1b06a072851d64b0b66b1dd1b4a83bb4 @yeah yeah committed
View
2 app/views/gitosis_public_keys/_form.html.erb
@@ -1,6 +1,6 @@
<div class="box tabular">
<p><%= f.text_field :title, :required => true %></p>
- <p><%= f.text_area :key, :required => true, :disabled => !@gitosis_public_key.new_record?, :style => 'width:99%;height:140px;' %>
+ <p><%= f.text_area :key, :required => true, :disabled => !@gitosis_public_key.new_record?, :style => 'width:99%;height:140px;', :label => :field_public_key %>
<% if !@gitosis_public_key.new_record?%>
<br/><em><%= l(:label_key_cannot_be_changed_please_create_new_key) %></em>
<% end %>
View
2 config/locales/bg.yml
@@ -1,7 +1,7 @@
'bg':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/bs.yml
@@ -1,7 +1,7 @@
'bs':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/ca.yml
@@ -1,7 +1,7 @@
'ca':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/cs.yml
@@ -1,7 +1,7 @@
'cs':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/da.yml
@@ -1,7 +1,7 @@
'da':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/de.yml
@@ -1,7 +1,7 @@
'de':
label_public_keys: Öffentliche Schlüssel
label_public_key_new: Neuer öffentlicher Schlüssel
- field_key: Schlüssel
+ field_public_key: Schlüssel
notice_public_key_updated: Öffentlicher Schlüssel wurde erfolgreich aktualisiert.
notice_public_key_added: Öffentlicher Schlüssel wurde erfolgreich hinzugefügt.
View
2 config/locales/el.yml
@@ -1,7 +1,7 @@
'el':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/en.yml
@@ -1,7 +1,7 @@
en:
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/es.yml
@@ -1,7 +1,7 @@
'es':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/fi.yml
@@ -1,7 +1,7 @@
'fi':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/fr.yml
@@ -1,7 +1,7 @@
'fr':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/gl.yml
@@ -1,7 +1,7 @@
'gl':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/he.yml
@@ -1,7 +1,7 @@
'he':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/hu.yml
@@ -1,7 +1,7 @@
'hu':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/id.yml
@@ -1,7 +1,7 @@
'id':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/it.yml
@@ -1,7 +1,7 @@
'it':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/ja.yml
@@ -1,7 +1,7 @@
'ja':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/ko.yml
@@ -1,7 +1,7 @@
'ko':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/lt.yml
@@ -1,7 +1,7 @@
'lt':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/nl.yml
@@ -1,7 +1,7 @@
'nl':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/no.yml
@@ -1,7 +1,7 @@
'no':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/pl.yml
@@ -1,7 +1,7 @@
'pl':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/pt-BR.yml
@@ -1,7 +1,7 @@
'pt-BR':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/pt.yml
@@ -1,7 +1,7 @@
'pt':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/ro.yml
@@ -1,7 +1,7 @@
'ro':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/ru.yml
@@ -1,7 +1,7 @@
'ru':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/sk.yml
@@ -1,7 +1,7 @@
'sk':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/sl.yml
@@ -1,7 +1,7 @@
'sl':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/sr.yml
@@ -1,7 +1,7 @@
'sr':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/sv.yml
@@ -1,7 +1,7 @@
'sv':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/th.yml
@@ -1,7 +1,7 @@
'th':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/tr.yml
@@ -1,7 +1,7 @@
'tr':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/uk.yml
@@ -1,7 +1,7 @@
'uk':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/vi.yml
@@ -1,7 +1,7 @@
'vi':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/zh-TW.yml
@@ -1,7 +1,7 @@
'zh-TW':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.
View
2 config/locales/zh.yml
@@ -1,7 +1,7 @@
'zh':
label_public_keys: Public keys
label_public_key_new: New public key
- field_key: Key
+ field_public_key: Key
notice_public_key_updated: Public key was successfully updated.
notice_public_key_added: Public key was successfully added.

0 comments on commit 5406045

Please sign in to comment.
Something went wrong with that request. Please try again.