diff options
author | Andrew Dolgov <[email protected]> | 2010-09-13 14:50:23 +0400 |
---|---|---|
committer | Andrew Dolgov <[email protected]> | 2010-09-13 14:50:23 +0400 |
commit | 4973c5ef559316dda90108f5854701389790e407 (patch) | |
tree | 462d9512f0495689ac3b6f95d933ddf490e1ed87 /locale/pt_BR | |
parent | c7a5c8a5a2703f78bf36dc3f2c5cc2f8fc8ec713 (diff) | |
parent | 0dfdf70816eb7ec94ac8d009829cf6ad4c4d162f (diff) |
fix merge conflict with master
Diffstat (limited to 'locale/pt_BR')
-rw-r--r-- | locale/pt_BR/LC_MESSAGES/messages.mo | bin | 8957 -> 8957 bytes | |||
-rw-r--r-- | locale/pt_BR/LC_MESSAGES/messages.po | 75 |
2 files changed, 28 insertions, 47 deletions
diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo Binary files differindex 385601b37..c9c7ca42e 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.mo +++ b/locale/pt_BR/LC_MESSAGES/messages.mo diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po index 424736a01..882de8a7b 100644 --- a/locale/pt_BR/LC_MESSAGES/messages.po +++ b/locale/pt_BR/LC_MESSAGES/messages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: tt-rss 1.2.14.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2010-09-11 12:07+0400\n" +"POT-Creation-Date: 2010-09-11 12:16+0400\n" "PO-Revision-Date: 2007-10-24 00:47-0200\n" "Last-Translator: Marcelo Jorge VIeira (metal) <[email protected]>\n" "Language-Team: Portuguese/Brazil\n" @@ -112,28 +112,6 @@ msgstr "Administrador" msgid "Default profile" msgstr "Padrão" -#: digest.php:58 prefs.php:90 tt-rss.php:112 -msgid "Hello," -msgstr "Olá," - -#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60 -#: mobile/functions.php:234 -msgid "Logout" -msgstr "Sair" - -#: digest.php:67 -msgid "Tiny Tiny RSS" -msgstr "" - -#: digest.php:88 -#, fuzzy -msgid "feeds" -msgstr "Feed" - -#: digest.php:94 -msgid "headlines" -msgstr "" - #: errors.php:3 msgid "Unknown error" msgstr "Erro desconhecido" @@ -485,8 +463,7 @@ msgstr "" msgid "Set starred" msgstr "Marcar como favorito" -#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545 -#: viewfeed.js:659 +#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659 msgid "Publish article" msgstr "" @@ -811,10 +788,19 @@ msgid "" "\t\tbrowser settings." msgstr "" +#: prefs.php:90 tt-rss.php:112 +msgid "Hello," +msgstr "Olá," + #: prefs.php:92 help/4.php:14 msgid "Exit preferences" msgstr "Sair das preferências" +#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60 +#: mobile/functions.php:234 +msgid "Logout" +msgstr "Sair" + #: prefs.php:102 #, fuzzy msgid "Keyboard shortcuts" @@ -2257,28 +2243,6 @@ msgstr "Favoritos" msgid "Sort feeds by unread count" msgstr "" -#: digest.js:295 -#, fuzzy -msgid "More articles..." -msgstr "Ações..." - -#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592 -#, fuzzy -msgid "Star article" -msgstr "Favoritos" - -#: digest.js:371 viewfeed.js:577 -msgid "Unstar article" -msgstr "" - -#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652 -msgid "Please wait..." -msgstr "" - -#: digest.js:412 viewfeed.js:648 -msgid "Unpublish article" -msgstr "" - #: functions.js:1332 msgid "Can't add filter: nothing to match on." msgstr "" @@ -2616,6 +2580,23 @@ msgstr "" msgid "Rescore articles in %s?" msgstr "Favoritos" +#: viewfeed.js:528 viewfeed.js:592 +#, fuzzy +msgid "Star article" +msgstr "Favoritos" + +#: viewfeed.js:577 +msgid "Unstar article" +msgstr "" + +#: viewfeed.js:585 viewfeed.js:652 +msgid "Please wait..." +msgstr "" + +#: viewfeed.js:648 +msgid "Unpublish article" +msgstr "" + #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394 msgid "No articles are selected." |