Merge pull request stringer-rss#72 from csmrmn/master

matt swanson · matt swanson · commit 45c9a282f7ed · 2013-05-11T10:35:36.000-07:00
Fixed untranslated word in kbd shortcuts
diff --git a/app/views/partials/_shortcuts.erb b/app/views/partials/_shortcuts.erb
@@ -6,7 +6,7 @@
   <div class="modal-body">
     <ul class="shortcut-legend">
       <li><kbd>j</kbd>/<kbd>k</kbd>: <%= t('partials.shortcuts.keys.jk') %></li>
-      <li><kbd>o</kbd> or <kbd>enter</kbd>: <%= t('partials.shortcuts.keys.oenter') %></li>
+      <li><kbd>o</kbd> <%= t('partials.shortcuts.keys.or') %> <kbd>enter</kbd>: <%= t('partials.shortcuts.keys.oenter') %></li>
       <li><kbd>v</kbd>: <%= t('partials.shortcuts.keys.v') %></li>
       <li class="blank"></li>
       <li><kbd>shift</kbd>+<kbd>a</kbd>: <%= t('partials.shortcuts.keys.shifta') %></li>
diff --git a/config/locales/de.yml b/config/locales/de.yml
@@ -42,6 +42,7 @@ de:
       keys:
         jk: "Nächste/vorherige Geschichte"
         oenter: "Klappe Geschichte aus/ein"
+        or: "oder"
         v: "Öffne die URL der Geschichte"
         shifta: "Alle als gelesen markieren"
         r: "Aktualisieren"
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -42,6 +42,7 @@ en:
       keys:
         jk: "Next/previous story"
         oenter: "Toggle story open/closed"
+        or: "or"
         v: "Go to story URL"
         shifta: "Mark all as read"
         r: "Refresh"
diff --git a/config/locales/es.yml b/config/locales/es.yml
@@ -36,6 +36,7 @@ es:
       keys:
         jk: "Siguiente/Anterior historia"
         oenter: "Arrastrar historia abierta/cerrada"
+        or: "o"
         v: "Ir a URL de la historia"
         shifta: "Marcar todas como leidas"
         r: "Refrescar"
diff --git a/config/locales/it.yml b/config/locales/it.yml
@@ -36,6 +36,7 @@ it:
       keys:
         jk: "Prossima/precedente storia"
         oenter: "Apri/chiudi la storia"
+        or: "o"
         v: "Vai all'URL della storia"
         shifta: "Segna tutte le storie come lette"
         r: "Aggiorna"
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
@@ -42,6 +42,7 @@ nl:
       keys:
         jk: "Volgend/vorig artikel"
         oenter: "Artikel open-/dichtklappen"
+        or: "of"
         v: "Open de URL van het artikel"
         shifta: "Alles als gelezen markeren"
         r: "Vernieuwen"
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
@@ -36,6 +36,7 @@ pt:
       keys:
         jk: "História seguinte/anterior"
         oenter: "Abrir/fechar história"
+        or: "ou"
         v: "Ir para URL da história"
         shifta: "Marcar tudo como lido"
         r: "Atualizar"
diff --git a/config/locales/zh_CN.yml b/config/locales/zh_CN.yml
@@ -42,6 +42,7 @@ zh_CN:
       keys:
         jk: "下一个/上一个故事"
         oenter: "点击打开/关闭"
+        or: "或"
         v: "转到原网址"
         shifta: "全部标为已读"
         r: "刷新"
