From 4951540f1755a64c68eb802481a17c63d090263b Mon Sep 17 00:00:00 2001
From: Matt Swanson <mdswanson@sep.com>
Date: Mon, 30 Dec 2013 22:50:18 -0500
Subject: [PATCH] update translations

---
 config/locales/de.yml    | 10 +++++-----
 config/locales/el-GR.yml |  8 ++++----
 config/locales/en.yml    |  8 ++++----
 config/locales/es.yml    | 10 +++++-----
 config/locales/fr.yml    | 14 +++++++-------
 config/locales/he.yml    |  4 ++--
 config/locales/it.yml    | 10 +++++-----
 config/locales/ja.yml    |  6 +++---
 config/locales/nl.yml    | 14 +++++++-------
 config/locales/pt-BR.yml | 22 +++++++++++-----------
 config/locales/pt.yml    |  8 ++++----
 config/locales/ru.yml    |  8 ++++----
 config/locales/sv.yml    | 16 ++++++++--------
 config/locales/tr.yml    |  6 +++---
 config/locales/zh-CN.yml |  8 ++++----
 15 files changed, 76 insertions(+), 76 deletions(-)

diff --git a/config/locales/de.yml b/config/locales/de.yml
index aa0f0b01b..52f874161 100644
--- a/config/locales/de.yml
+++ b/config/locales/de.yml
@@ -43,13 +43,13 @@ de:
         password_confirmation: Bestätigung
       flash:
         passwords_dont_match: Hey, deine Passwortbestätigung stimmte nicht überein. Probiere es noch einmal.
-      subtitle: ! 'Es gibt nur einen Benutzer: Dich.'
+      subtitle: 'Es gibt nur einen Benutzer: Dich.'
       title: Stringer ist
   flash:
     cookies_required: Das ist jetzt peinlich. Die App benötigt Cookies um richtig zu funktionieren.
     js_required: Das ist jetzt peinlich. Die App benötigt JavaScript um richtig zu funktionieren.
   import:
-    description: ! '%{link} deine Feeds aus Google Reader und importiere sie hier.'
+    description: '%{link} deine Feeds aus Google Reader und importiere sie hier.'
     export: Exportiere
     fields:
       import: Importieren
@@ -60,7 +60,7 @@ de:
     back_to_work: Mach dich wieder an die Arbeit, Faulpelz!
     export: Exportieren
     hey: Hey!
-    import: 
+    import: Importieren
     logout: Ausloggen
     support: Support
     title: stringer | dein rss Kumpel
@@ -128,7 +128,7 @@ de:
     keep_unread: Als ungelesen behalten
   time:
     formats:
-      default: ! '%e. %b, %H:%M Uhr'
+      default: '%e. %b, %H:%M Uhr'
   tutorial:
     add_feed: Feed hinzufügen
     as_read: als gelesen markieren
@@ -140,6 +140,6 @@ de:
     simple: einfach
     start: Fang an zu lesen
     subtitle: Hier ist die Bedienungsanleitung.
-    title: ! 'Stringer ist '
+    title: 'Stringer ist '
     your_feeds: deine Feeds
     your_stories: deine Geschichten
diff --git a/config/locales/el-GR.yml b/config/locales/el-GR.yml
index 638001b8c..67ba40c13 100644
--- a/config/locales/el-GR.yml
+++ b/config/locales/el-GR.yml
@@ -43,7 +43,7 @@ el-GR:
         password_confirmation: Επιβεβαίωση
       flash:
         passwords_dont_match: Ψψψιιτ, η επιβεβαίωση του κωδικού σου δεν ταιριάζει με τον κωδικό. Δοκίμασε ξανά.
-      subtitle: ! 'Υπάρχει μόνο ένας χρήστης: Εσύ!'
+      subtitle: 'Υπάρχει μόνο ένας χρήστης: Εσύ!'
       title: Το Stringer είναι
   flash:
     cookies_required: Έχετε την καλοσύνη να ενεργοποιήσετε τα Cookies ώστε να λειτουργήσει κανονικά η εφαρμογή?
@@ -104,7 +104,7 @@ el-GR:
     zen:
       archive: εμφάνισης όλων των αντικειμένων
       go_make: και δράσε
-      gtfo: ! 'Τώρα σταμάτα να διαβάζεις ιστολόγια '
+      gtfo: 'Τώρα σταμάτα να διαβάζεις ιστολόγια '
       rss_zero: Έχεις Μηδέν RSS Ειδήσεις
   sessions:
     destroy:
@@ -128,7 +128,7 @@ el-GR:
     keep_unread: Φύλαξη στα μη αναγνωσμένα
   time:
     formats:
-      default: ! '%d %b %H:%M'
+      default: '%d %b %H:%M'
   tutorial:
     add_feed: προσθήκη ιστολογίου
     as_read: ως αναγνωσμένα
@@ -140,6 +140,6 @@ el-GR:
     simple: απλό
     start: Ξεκίνα την ανάγνωση
     subtitle: Εδώ είναι το εγχειρίδιο.
-    title: ! 'Το Stringer είναι '
+    title: 'Το Stringer είναι '
     your_feeds: τα ιστολόγια σου
     your_stories: οι ειδήσεις σου
diff --git a/config/locales/en.yml b/config/locales/en.yml
index d66428857..a94f5f302 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -43,13 +43,13 @@ en:
         password_confirmation: Confirm
       flash:
         passwords_dont_match: Hey, your password confirmation didn't match. Try again.
-      subtitle: ! 'There is only one user: you.'
+      subtitle: 'There is only one user: you.'
       title: Stringer is
   flash:
     cookies_required: Well, this is awkward. Cookies are required for the app to work properly.
     js_required: Well, this is awkward. Javascript is required for the app to work properly.
   import:
-    description: ! '%{link} your feeds from Google Reader and import them.'
+    description: '%{link} your feeds from Google Reader and import them.'
     export: Export
     fields:
       import: Import
@@ -128,7 +128,7 @@ en:
     keep_unread: Keep unread
   time:
     formats:
-      default: ! '%b %d, %H:%M'
+      default: '%b %d, %H:%M'
   tutorial:
     add_feed: add feed
     as_read: as read
@@ -140,6 +140,6 @@ en:
     simple: simple
     start: Start Reading
     subtitle: Here's the instruction manual.
-    title: ! 'Stringer is '
+    title: 'Stringer is '
     your_feeds: your feeds
     your_stories: your stories
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 9f071bd5b..cb2ab1a9c 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -43,13 +43,13 @@ es:
         password_confirmation: Confirmar
       flash:
         passwords_dont_match: Oye, tus contraseñas no coinciden. Inténtalo de vuelta.
-      subtitle: ! 'Nada mas hay un usuario: tu.'
+      subtitle: 'Nada mas hay un usuario: tu.'
       title: Stringer es
   flash:
     cookies_required: Bueno esto es incomodo. Cookies son requeridas para que la aplicación funcione correctamente.
     js_required: Bueno esto es incomodo. JavaScript es requerido para que la aplicación funcione correctamente.
   import:
-    description: ! '%{link} tus feeds desde Google Reader e importalas.'
+    description: '%{link} tus feeds desde Google Reader e importalas.'
     export: Exportar
     fields:
       import: Importar
@@ -60,7 +60,7 @@ es:
     back_to_work: ¡Regresa a tu trabajo, holgazán!
     export: Exportar
     hey: ¡Oye!
-    import: 
+    import: Importar
     logout: Salir
     support: Soporte
     title: stringer | tu compadre de rss
@@ -128,7 +128,7 @@ es:
     keep_unread: Dejar sin leer
   time:
     formats:
-      default: ! '%d de %b, %H:%M'
+      default: '%d de %b, %H:%M'
   tutorial:
     add_feed: agregar feed
     as_read: como leído
@@ -140,6 +140,6 @@ es:
     simple: simple
     start: Comenzar a Leer
     subtitle: Aqui esta el manual de instrucciones
-    title: ! 'Stringer es '
+    title: 'Stringer es '
     your_feeds: tus feeds
     your_stories: tus historias
diff --git a/config/locales/fr.yml b/config/locales/fr.yml
index eb3dd004e..bb6fde9a6 100644
--- a/config/locales/fr.yml
+++ b/config/locales/fr.yml
@@ -43,13 +43,13 @@ fr:
         password_confirmation: Confirmez
       flash:
         passwords_dont_match: Les mots de passe sont différents. Essayez à nouveau.
-      subtitle: ! 'Il n''y a qu''un seul utilisateur : vous.'
+      subtitle: 'Il n''y a qu''un seul utilisateur : vous.'
       title: Stringer est
   flash:
-    cookies_required: ! 'C''est embêtant : les cookies sont obligatoires pour le bon fonctionnement de l''application.'
-    js_required: ! 'C''est embêtant : Javascript est obligatoire pour le bon fonctionnement de l''application.'
+    cookies_required: 'C''est embêtant : les cookies sont obligatoires pour le bon fonctionnement de l''application.'
+    js_required: 'C''est embêtant : Javascript est obligatoire pour le bon fonctionnement de l''application.'
   import:
-    description: ! '%{link} vos flux provenant de Google Reader et importez-les.'
+    description: '%{link} vos flux provenant de Google Reader et importez-les.'
     export: Exportez
     fields:
       import: Importez
@@ -60,7 +60,7 @@ fr:
     back_to_work: Retournez au travail, fénéant !
     export: Export
     hey: Hé !
-    import: 
+    import: Import
     logout: Déconnection
     support: Aide
     title: stringer | votre compagnon rss
@@ -128,7 +128,7 @@ fr:
     keep_unread: Marquer comme non lu
   time:
     formats:
-      default: ! '%d %b %H:%M'
+      default: '%d %b %H:%M'
   tutorial:
     add_feed: ajouter un flux
     as_read: comme lu
@@ -140,6 +140,6 @@ fr:
     simple: simple
     start: Commencez à lire
     subtitle: Voici le manuel d'utilisation.
-    title: ! 'Stringer est '
+    title: 'Stringer est '
     your_feeds: vos flux
     your_stories: vos articles
diff --git a/config/locales/he.yml b/config/locales/he.yml
index 16c2947d5..20ac0e246 100644
--- a/config/locales/he.yml
+++ b/config/locales/he.yml
@@ -49,7 +49,7 @@ he:
     cookies_required: 
     js_required: 
   import:
-    description: ! '%{link} את הפיד שלך מ- Google Reader ויבא אותו.'
+    description: '%{link} את הפיד שלך מ- Google Reader ויבא אותו.'
     export: יצוא
     fields:
       import: יבוא
@@ -128,7 +128,7 @@ he:
     keep_unread: סמן כלא נקרא
   time:
     formats:
-      default: ! '%b %d, %H:%M%'
+      default: '%b %d, %H:%M%'
   tutorial:
     add_feed: הוסף פיד
     as_read: כנקרא
diff --git a/config/locales/it.yml b/config/locales/it.yml
index 233d1c3f8..8424e2c23 100644
--- a/config/locales/it.yml
+++ b/config/locales/it.yml
@@ -43,13 +43,13 @@ it:
         password_confirmation: Conferma
       flash:
         passwords_dont_match: Hey, le password non combaciano. Riprova.
-      subtitle: ! 'Esiste un solo utente: tu.'
+      subtitle: 'Esiste un solo utente: tu.'
       title: Stringer è
   flash:
     cookies_required: Beh, questo sì che è strano. L'app necessita di cookie per funzionare correttamente.
     js_required: Beh, questo sì che è strano. L'app necessita di Javascript attivato per funzionare correttamente.
   import:
-    description: ! '%{link} i tuoi feed da Google Reader e importali qui.'
+    description: '%{link} i tuoi feed da Google Reader e importali qui.'
     export: Esporta
     fields:
       import: Importa
@@ -60,7 +60,7 @@ it:
     back_to_work: Torna a lavorare, fannullone!
     export: Esporta
     hey: Hey!
-    import: 
+    import: Importa
     logout: Logout
     support: Supporto
     title: stringer | your rss buddy
@@ -128,7 +128,7 @@ it:
     keep_unread: Mantieni come non letta
   time:
     formats:
-      default: ! '%d %b, %H:%M'
+      default: '%d %b, %H:%M'
   tutorial:
     add_feed: aggiungi feed
     as_read: come lette
@@ -140,6 +140,6 @@ it:
     simple: semplice
     start: Inizia a leggere
     subtitle: Ecco il manuale d'istruzioni.
-    title: ! 'Stringer è '
+    title: 'Stringer è '
     your_feeds: i tuoi feed
     your_stories: le tue storie
diff --git a/config/locales/ja.yml b/config/locales/ja.yml
index 1a8704c2d..b17f7ab83 100644
--- a/config/locales/ja.yml
+++ b/config/locales/ja.yml
@@ -49,7 +49,7 @@ ja:
     cookies_required: 正常に動作するためにクッキーを有効にして下さい
     js_required: 正常に動作するためにJavascriptを有効にして下さい
   import:
-    description: ! '%{link} あなたのGoogle Readerからのフィードです、それを取り込めます'
+    description: '%{link} あなたのGoogle Readerからのフィードです、それを取り込めます'
     export: 書き出し
     fields:
       import: 取り込み
@@ -60,7 +60,7 @@ ja:
     back_to_work: 怠け者さん！仕事に戻りましょう
     export: 書き出し
     hey: やぁ！
-    import: 
+    import: 読み込み
     logout: ログアウト
     support: サポート
     title: stringer | your rss buddy
@@ -128,7 +128,7 @@ ja:
     keep_unread: 未読にする
   time:
     formats:
-      default: ! '%b%d日 %H:%M'
+      default: '%b%d日 %H:%M'
   tutorial:
     add_feed: add feed
     as_read: as read
diff --git a/config/locales/nl.yml b/config/locales/nl.yml
index b40c02451..1e546d975 100644
--- a/config/locales/nl.yml
+++ b/config/locales/nl.yml
@@ -43,13 +43,13 @@ nl:
         password_confirmation: Bevestigen
       flash:
         passwords_dont_match: Hé, je wachtwoordbevestiging kwam niet overeen. Probeer het opnieuw.
-      subtitle: ! 'Er is maar één gebruiker: jij.'
+      subtitle: 'Er is maar één gebruiker: jij.'
       title: Stringer is
   flash:
-    cookies_required: ! 'Wel, dit is vervelend: deze applicatie heeft cookies nodig om goed te werken.'
-    js_required: ! 'Wel, dit is vervelend: deze applicatie heeft Javascript nodig om goed te werken.'
+    cookies_required: 'Wel, dit is vervelend: deze applicatie heeft cookies nodig om goed te werken.'
+    js_required: 'Wel, dit is vervelend: deze applicatie heeft Javascript nodig om goed te werken.'
   import:
-    description: ! '%{link} je feeds uit Google Reader en importeer ze.'
+    description: '%{link} je feeds uit Google Reader en importeer ze.'
     export: Exporteer
     fields:
       import: Importeren
@@ -60,7 +60,7 @@ nl:
     back_to_work: Aan het werk, luilak!
     export: Exporteren
     hey: Hé!
-    import: 
+    import: Importeren
     logout: Uitloggen
     support: Hulp
     title: stringer | jouw rss-buddy
@@ -128,7 +128,7 @@ nl:
     keep_unread: Behouden als ongelezen
   time:
     formats:
-      default: ! '%d %b, %H:%M'
+      default: '%d %b, %H:%M'
   tutorial:
     add_feed: feeds toevoegen
     as_read: als gelezen markeren
@@ -140,6 +140,6 @@ nl:
     simple: simpel
     start: Je kunt beginnen met lezen
     subtitle: Hier is de handleiding.
-    title: ! 'Stringer is '
+    title: 'Stringer is '
     your_feeds: je feeds
     your_stories: je artikelen
diff --git a/config/locales/pt-BR.yml b/config/locales/pt-BR.yml
index cb0978d18..bb196f48e 100644
--- a/config/locales/pt-BR.yml
+++ b/config/locales/pt-BR.yml
@@ -43,13 +43,13 @@ pt-BR:
         password_confirmation: Confirmar
       flash:
         passwords_dont_match: Hey, a confirmação de senha não confere. Tente novamente.
-      subtitle: ! 'Existe apenas um usuário: você.'
+      subtitle: 'Existe apenas um usuário: você.'
       title: Stringer é
   flash:
     cookies_required: Bem, isso é estranho. É necessário habilitar Cookies para que o aplicativo funcione corretamente.
     js_required: Bem, isso é estranho. É necessário habilitar Javascript para que o aplicativo funcione corretamente.
   import:
-    description: ! '%{link} seus feeds do Google Reader e importe-os.'
+    description: '%{link} seus feeds do Google Reader e importe-os.'
     export: Exportar
     fields:
       import: Importar
@@ -60,7 +60,7 @@ pt-BR:
     back_to_work: Volte ao trabalho, preguiçoso!
     export: Exportar
     hey: Hey!
-    import: 
+    import: Importar
     logout: Sair
     support: Suporte
     title: stringer | seu companheiro de rss
@@ -96,8 +96,8 @@ pt-BR:
         oenter: Alterna história aberta/fechada
         or: ou
         r: Atualizar
-        right: 
-        s: 
+        right: Próxima Página
+        s: Marcar item com estrela/Remover estrela
         shifta: Marcar tudo como lido
         v: Ir para a URL da história
       title: Atalhos de teclado
@@ -120,15 +120,15 @@ pt-BR:
       subtitle: Bem vindo novamente, amigo.
       title: Stringer fala
   starred:
-    next: 
-    of: 
-    previous: 
-    sorry: 
+    next: Próximo
+    of: de
+    previous: Anterior
+    sorry: Desculpe, você ainda não tem histórias com estrela!
   stories:
     keep_unread: Continue não lido
   time:
     formats:
-      default: ! '%d de %b, %H:%M'
+      default: '%d de %b, %H:%M'
   tutorial:
     add_feed: adicionar feed
     as_read: como lido
@@ -140,6 +140,6 @@ pt-BR:
     simple: simples
     start: Começar a leitura
     subtitle: Aqui está o manual de instruções.
-    title: ! 'Stringer é '
+    title: 'Stringer é '
     your_feeds: seus feeds
     your_stories: suas histórias
diff --git a/config/locales/pt.yml b/config/locales/pt.yml
index 2b66ac143..0808368c0 100644
--- a/config/locales/pt.yml
+++ b/config/locales/pt.yml
@@ -43,13 +43,13 @@ pt:
         password_confirmation: Confirmar
       flash:
         passwords_dont_match: Ei, a password de confirmação não está correcta. Tente novamente.
-      subtitle: ! 'Existe apenas um utilizador: você.'
+      subtitle: 'Existe apenas um utilizador: você.'
       title: Stringer é
   flash:
     cookies_required: 
     js_required: 
   import:
-    description: ! '%{link} as suas feeds do Google Reader e importe-as.'
+    description: '%{link} as suas feeds do Google Reader e importe-as.'
     export: Exportar
     fields:
       import: Importar
@@ -128,7 +128,7 @@ pt:
     keep_unread: Continuar como não lido
   time:
     formats:
-      default: ! '%d de %b, %H:%M'
+      default: '%d de %b, %H:%M'
   tutorial:
     add_feed: adicionar feed
     as_read: como lido
@@ -140,6 +140,6 @@ pt:
     simple: simples
     start: Começar a ler
     subtitle: Aqui está o manual de instruções.
-    title: ! 'Stringer é '
+    title: 'Stringer é '
     your_feeds: as seus feeds
     your_stories: as suas histórias
diff --git a/config/locales/ru.yml b/config/locales/ru.yml
index 233aa65b2..ab8a6ce29 100644
--- a/config/locales/ru.yml
+++ b/config/locales/ru.yml
@@ -43,13 +43,13 @@ ru:
         password_confirmation: Подтвердить
       flash:
         passwords_dont_match: Эй, Ваше подтверждение пароля не совпадает с паролем. Попробуйте еще раз.
-      subtitle: ! 'Существует только один пользователь: ВЫ.'
+      subtitle: 'Существует только один пользователь: ВЫ.'
       title: Stringer это
   flash:
     cookies_required: Ну, это неудобно. Cookies необходимы, чтобы приложение работало корректно.
     js_required: Ну, это неудобно. Javascript необходим, чтобы приложение работало корректно.
   import:
-    description: ! '%{link} фиды из Google Reader и импортировать их.'
+    description: '%{link} фиды из Google Reader и импортировать их.'
     export: Экспортировать
     fields:
       import: Импортировать
@@ -128,7 +128,7 @@ ru:
     keep_unread: Пометить как непрочитанное
   time:
     formats:
-      default: ! '%b %d, %H:%M'
+      default: '%b %d, %H:%M'
   tutorial:
     add_feed: добавить фид
     as_read: как прочитанное
@@ -140,6 +140,6 @@ ru:
     simple: просто
     start: Начать читать
     subtitle: Вот руководство по эксплуатации.
-    title: ! 'Stringer это '
+    title: 'Stringer это '
     your_feeds: ваши фиды
     your_stories: Ваши истории
diff --git a/config/locales/sv.yml b/config/locales/sv.yml
index 1c884c861..5a0a24137 100644
--- a/config/locales/sv.yml
+++ b/config/locales/sv.yml
@@ -21,13 +21,13 @@ sv:
     - dec
   feeds:
     add:
-      description: Kopiera in URL:en till bloggen du vill läsa.
+      description: Klistra in URL:en till bloggen du vill läsa.
       fields:
         feed_url: Feedens URL
         submit: Lägg till
       flash:
         added_successfully: Vi har lagt till din nya feed. Kom tillbaks om en stund.
-        already_subscribed_error: Du har redan prenumererat på den här feeden...
+        already_subscribed_error: Du prenumererar redan på den här feeden...
         feed_not_found_error: Vi kunde inte hitta feeden. Prova igen.
       title: Behöver du nya berättelser?
     index:
@@ -43,13 +43,13 @@ sv:
         password_confirmation: Bekräfta
       flash:
         passwords_dont_match: Din bekräftelse matchade inte. Försök igen.
-      subtitle: ! 'Det finns bara en användare: du.'
+      subtitle: 'Det finns bara en användare: du.'
       title: Stringer är
   flash:
     cookies_required: Jaha, det här var tråkigt. Cookies behövs för att appen ska fungera.
     js_required: Jaha, det här var tråkigt. Javascript behövs för att appen ska fungera.
   import:
-    description: ! '%{link} dina feeds från Google Reader och importera dom.'
+    description: '%{link} dina feeds från Google Reader och importera dem.'
     export: Exportera
     fields:
       import: Importera
@@ -60,7 +60,7 @@ sv:
     back_to_work: Tillbaks till arbetet, slöfock!
     export: Exportera
     hey: Hallå!
-    import: 
+    import: Importera
     logout: Logga ut
     support: Hjälp
     title: stringer | din rss-polare
@@ -97,7 +97,7 @@ sv:
         or: eller
         r: Uppdatera
         right: Nästa sida
-        s: Markera som stjärnad/ej stjärnad
+        s: Markera som stjärnmärkt/ej stjärnmärkt
         shifta: Markera alla som lästa
         v: Gå till berättelsens URL
       title: Kortkommandon
@@ -128,7 +128,7 @@ sv:
     keep_unread: Behåll oläst
   time:
     formats:
-      default: ! '%e %b %H:%M'
+      default: '%e %b %H:%M'
   tutorial:
     add_feed: lägg till feed
     as_read: som lästa
@@ -140,6 +140,6 @@ sv:
     simple: enkelt
     start: Börja läsa
     subtitle: Här är manualen.
-    title: ! 'Stringer är '
+    title: 'Stringer är '
     your_feeds: dina feeds
     your_stories: dina berättelser
diff --git a/config/locales/tr.yml b/config/locales/tr.yml
index c5d70734f..51c360412 100644
--- a/config/locales/tr.yml
+++ b/config/locales/tr.yml
@@ -43,7 +43,7 @@ tr:
         password_confirmation: Tekrar
       flash:
         passwords_dont_match: Sifrelerin tekrari farkli. Tekrardan dene.
-      subtitle: ! 'Sadece bir kullanici var: Sen!'
+      subtitle: 'Sadece bir kullanici var: Sen!'
       title: Stringer is
   flash:
     cookies_required: Aaa, garip!. Uygulamanin duzgun calismasi icin Cookies gerekli.
@@ -128,7 +128,7 @@ tr:
     keep_unread: Okunmadi olarak tut
   time:
     formats:
-      default: ! '%b %d, %H:%M'
+      default: '%b %d, %H:%M'
   tutorial:
     add_feed: feed ekle
     as_read: okundu olarak
@@ -140,6 +140,6 @@ tr:
     simple: basit
     start: Okumaya basla
     subtitle: Iste kullanma klavuzu.
-    title: ! 'Stringer '
+    title: 'Stringer '
     your_feeds: beslemeleriniz
     your_stories: hikayeleriniz
diff --git a/config/locales/zh-CN.yml b/config/locales/zh-CN.yml
index b284f704c..b5617bb38 100644
--- a/config/locales/zh-CN.yml
+++ b/config/locales/zh-CN.yml
@@ -49,7 +49,7 @@ zh-CN:
     cookies_required: 抱歉，你的浏览器禁用了Cookie记录功能。为了你的正常使用，请开启浏览器的Cookie功能。
     js_required: 抱歉，你的浏览器禁用了Javascript脚本。为了你的正常使用，请开启脚本功能。
   import:
-    description: ! '%{link}你在Google Reader上的订阅列表然后再将它们导入这里'
+    description: '%{link}你在Google Reader上的订阅列表然后再将它们导入这里'
     export: 导出
     fields:
       import: 导入
@@ -60,7 +60,7 @@ zh-CN:
     back_to_work: 懒鬼，还不赶紧去干活！
     export: 导出
     hey: 喂！
-    import: 
+    import: 导入
     logout: 退出
     support: 支持
     title: stringer | your rss buddy
@@ -128,7 +128,7 @@ zh-CN:
     keep_unread: 保持未读状态
   time:
     formats:
-      default: ! '%b%d日 %H:%M'
+      default: '%b%d日 %H:%M'
   tutorial:
     add_feed: 添加新订阅
     as_read: 已读
@@ -140,6 +140,6 @@ zh-CN:
     simple: simple
     start: 开始阅读吧！
     subtitle: 这是一份简单的指导手册。
-    title: ! 'Stringer is '
+    title: 'Stringer is '
     your_feeds: 你的订阅列表
     your_stories: 你订阅的内容