[gnome-keyring: 18/18] Merge branch 'gnome-2-32'



commit 4671e0383067ec198bd99ff3d39158215b34b510
Merge: 3ec5f82 58240b9
Author: Stef Walter <stef memberwebs com>
Date:   Fri Oct 1 17:42:41 2010 +0000

    Merge branch 'gnome-2-32'

 pkcs11/rpc-layer/gkm-rpc-util.c |    4 +-
 po/bg.po                        |    2 +-
 po/cs.po                        |    2 +-
 po/et.po                        |   10 +-
 po/eu.po                        |  603 ++++++++++++++++++++-----------------
 po/id.po                        |  124 ++++----
 po/ko.po                        |  611 +++++++++++++++++++++-----------------
 po/pt_BR.po                     |  633 +++++++++++++++++++++------------------
 po/ru.po                        |  600 ++++++++++++++++++-------------------
 9 files changed, 1363 insertions(+), 1226 deletions(-)
---
diff --cc po/bg.po
index aee7e36,8844413..493e5d4
--- a/po/bg.po
+++ b/po/bg.po
@@@ -9,10 -9,10 +9,10 @@@
  #
  msgid ""
  msgstr ""
- "Project-Id-Version: gnome-keyring master\n"
+ "Project-Id-Version: gnome-keyring gnome-2-32\n"
  "Report-Msgid-Bugs-To: \n"
 -"POT-Creation-Date: 2010-09-26 18:01+0300\n"
 -"PO-Revision-Date: 2010-09-26 18:01+0300\n"
 +"POT-Creation-Date: 2010-09-26 18:02+0300\n"
 +"PO-Revision-Date: 2010-09-26 18:02+0300\n"
  "Last-Translator: Damyan Ivanov <dmn debian org>\n"
  "Language-Team: Bulgarian <dict fsa-bg org>\n"
  "Language: bg\n"
diff --cc po/cs.po
index 76242ea,12839bf..5e776c6
--- a/po/cs.po
+++ b/po/cs.po
@@@ -1070,4 -1069,45 +1071,3 @@@ msgstr "_Staré heslo:
  #: ../ui/gku-prompt.ui.h:7
  msgid "_Password:"
  msgstr "_Heslo:"
--
 -#~ msgid ""
 -#~ "This option enables the PKCS#11 component in the gnome-keyring daemon. It "
 -#~ "only takes effect during startup with gnome-session, (ie: when the user "
 -#~ "logs in). This setting may be overridden when certain command line "
 -#~ "arguments are passed to the daemon."
 -#~ msgstr ""
 -#~ "Tato volba aktivuje komponentu PKCS#11 v démonovi gnome-keyring. ZmÄ?na se "
 -#~ "projeví pouze bÄ?hem spouÅ¡tÄ?ní gnome-session (napÅ?. když se uživatel "
 -#~ "pÅ?ihlásí). Toto nastavení může být potlaÄ?eno, pokud jsou démonu pÅ?edány "
 -#~ "jisté parametry pÅ?íkazové Å?ádky."
 -
 -#~ msgid ""
 -#~ "This option enables the SSH agent in the gnome-keyring daemon. It only "
 -#~ "takes effect as gnome-keyring-daemon starts, (ie: when the user logs in). "
 -#~ "This setting may be overridden when certain command line arguments are "
 -#~ "passed to the daemon."
 -#~ msgstr ""
 -#~ "Tato volba aktivuje SSH agenta v démonovi gnome-keyring. ZmÄ?na se projeví "
 -#~ "pouze bÄ?hem spouÅ¡tÄ?ní gnome-keyring-daemon (napÅ?. když se uživatel "
 -#~ "pÅ?ihlásí). Toto nastavení může být potlaÄ?eno, pokud jsou démonu pÅ?edány "
 -#~ "jisté parametry pÅ?íkazové Å?ádky."
 -
 -#~ msgid ""
 -#~ "This option enables the secret service component in the gnome-keyring "
 -#~ "daemon. It only takes effect during startup with gnome-session, (ie: when "
 -#~ "the user logs in). This setting may be overridden when certain command "
 -#~ "line arguments are passed to the daemon."
 -#~ msgstr ""
 -#~ "Tato volba aktivuje komponentu služba utajení dat v démonovi gnome-"
 -#~ "keyring. ZmÄ?na se projeví pouze bÄ?hem spouÅ¡tÄ?ní gnome-keyring-daemon "
 -#~ "(napÅ?. když se uživatel pÅ?ihlásí). Toto nastavení může být potlaÄ?eno, "
 -#~ "pokud jsou démonu pÅ?edány jisté parametry pÅ?íkazové Å?ádky."
 -
 -#~ msgid "Whether the gnome-keyring PKCS#11 component is enabled."
 -#~ msgstr "Zda je komponenta PKCS#11 pro gnome-keyring aktivní."
 -
 -#~ msgid "Whether the gnome-keyring SSH agent is enabled."
 -#~ msgstr "Zda je agent SSH pro gnome-keyring aktivní."
 -
 -#~ msgid "Whether the gnome-keyring secret service is enabled."
 -#~ msgstr "Zda je služba utajení dat pro gnome-keyring aktivní."
diff --cc po/ru.po
index ff31417,e50c92c..e74e10e
--- a/po/ru.po
+++ b/po/ru.po
@@@ -1063,6 -873,183 +873,182 @@@ msgstr "Ð?еизвеÑ?Ñ?наÑ? оÑ?иб
  msgid "Unnamed Certificate"
  msgstr "Ð?езÑ?мÑ?ннÑ?й Ñ?еÑ?Ñ?иÑ?икаÑ?"
  
- #: ../pkcs11/ssh-store/gck-ssh-private-key.c:339
+ #: ../pkcs11/ssh-store/gkm-ssh-private-key.c:339
  msgid "Couldn't parse public SSH key"
  msgstr "Ð?е Ñ?далоÑ?Ñ? Ñ?азобÑ?аÑ?Ñ? оÑ?кÑ?Ñ?Ñ?Ñ?й клÑ?Ñ? SSH"
+ 
+ #. Get the label ready
+ #: ../pkcs11/wrap-layer/gkm-wrap-login.c:317
+ #, c-format
+ msgid "Unlock password for: %s"
+ msgstr "Ð?аÑ?олÑ? длÑ? Ñ?азблокиÑ?ованиÑ?: %s"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:90
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:794
+ msgid "The unlock password was incorrect"
+ msgstr "Ð?евеÑ?нÑ?й паÑ?олÑ? Ñ?азблокиÑ?овки"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:626
+ msgid "Unlock Login Keyring"
+ msgstr "РазблокиÑ?ование Ñ?вÑ?зки клÑ?Ñ?ей длÑ? вÑ?ода в Ñ?иÑ?Ñ?емÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:628
+ #| msgid "Enter password for to unlock your login keyring"
+ msgid "Enter password to unlock your login keyring"
+ msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? Ñ?азблокиÑ?овки Ñ?вÑ?зки клÑ?Ñ?ей длÑ? вÑ?ода в Ñ?иÑ?Ñ?емÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:632
+ msgid "The password you use to log in to your computer no longer matches that of your login keyring."
+ msgstr "Ð?аÑ?олÑ?, коÑ?оÑ?Ñ?й вÑ? иÑ?полÑ?зÑ?еÑ?е длÑ? вÑ?ода, болÑ?Ñ?е не Ñ?ооÑ?веÑ?Ñ?Ñ?вÑ?еÑ? паÑ?олÑ? Ñ?вÑ?зки клÑ?Ñ?ей длÑ? вÑ?ода в Ñ?иÑ?Ñ?емÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:634
+ msgid "The login keyring did not get unlocked when you logged into your computer."
+ msgstr "Ð?аÑ?а Ñ?вÑ?зка клÑ?Ñ?ей длÑ? вÑ?ода в Ñ?иÑ?Ñ?емÑ? не бÑ?ла авÑ?омаÑ?иÑ?еÑ?ки Ñ?азблокиÑ?ована, когда вÑ? заÑ?егиÑ?Ñ?Ñ?иÑ?овалиÑ?Ñ? в компÑ?Ñ?Ñ?еÑ?е."
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:652
+ msgid "Unlock Keyring"
+ msgstr "РазблокиÑ?ование Ñ?вÑ?зки клÑ?Ñ?ей"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:654
+ #, c-format
+ msgid "Enter password for keyring '%s' to unlock"
+ msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? Ñ?азблокиÑ?ованиÑ? Ñ?вÑ?зки клÑ?Ñ?ей «%s»"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:658
+ #, c-format
+ msgid "An application wants access to the keyring '%s', but it is locked"
+ msgstr "Ð?Ñ?иложение Ñ?оÑ?еÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?вÑ?зке клÑ?Ñ?ей «%s», но она заблокиÑ?ован"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:678
+ msgid "Unlock private key"
+ msgstr "РазблокиÑ?ование Ñ?екÑ?еÑ?ного клÑ?Ñ?а"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:680
+ msgid "Unlock certificate"
+ msgstr "РазблокиÑ?ование Ñ?еÑ?Ñ?иÑ?икаÑ?а"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:682
+ msgid "Unlock public key"
+ msgstr "РазблокиÑ?ование оÑ?кÑ?Ñ?Ñ?ого клÑ?Ñ?а"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:684
+ msgid "Unlock"
+ msgstr "РазблокиÑ?ование"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:697
+ msgid "Enter password to unlock the public key"
+ msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? Ñ?азблокиÑ?ованиÑ? оÑ?кÑ?Ñ?Ñ?ого клÑ?Ñ?а"
+ 
+ #. TRANSLATORS: The private key is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:709
+ #, c-format
+ msgid "An application wants access to the private key '%s', but it is locked"
+ msgstr "Ð?Ñ?иложение Ñ?оÑ?еÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?екÑ?еÑ?номÑ? клÑ?Ñ?Ñ? «%s», но он заблокиÑ?ован"
+ 
+ #. TRANSLATORS: The certificate is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:712
+ #, c-format
+ msgid "An application wants access to the certificate '%s', but it is locked"
+ msgstr "Ð?Ñ?иложение Ñ?оÑ?еÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ? «%s», но он заблокиÑ?ован"
+ 
+ #. TRANSLATORS: The public key is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:715
+ #, c-format
+ msgid "An application wants access to the public key '%s', but it is locked"
+ msgstr "Ð?Ñ?иложение Ñ?оÑ?еÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к оÑ?кÑ?Ñ?Ñ?омÑ? клÑ?Ñ?Ñ? «%s», но он заблокиÑ?ован"
+ 
+ #. TRANSLATORS: The object '%s' is locked
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:718
+ #, c-format
+ msgid "An application wants access to '%s', but it is locked"
+ msgstr "Ð?Ñ?иложение Ñ?оÑ?еÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к «%s», но он заблокиÑ?ован"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:815
+ msgid "Unlock certificate/key storage"
+ msgstr "РазблокиÑ?оваÑ?Ñ? Ñ?еÑ?Ñ?иÑ?икаÑ?/Ñ?Ñ?анилиÑ?е клÑ?Ñ?ей"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:816
+ msgid "Enter password to unlock the certificate/key storage"
+ msgstr "Ð?ведиÑ?е паÑ?олÑ? длÑ? Ñ?азблокиÑ?ованиÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?а/Ñ?Ñ?анилиÑ?а клÑ?Ñ?ей"
+ 
+ #. TRANSLATORS: The storage is locked, and needs unlocking before the application can use it.
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:819
+ #, c-format
+ msgid "An application wants access to the certificate/key storage '%s', but it is locked"
+ msgstr "Ð?Ñ?иложение Ñ?оÑ?еÑ? полÑ?Ñ?иÑ?Ñ? доÑ?Ñ?Ñ?п к Ñ?еÑ?Ñ?иÑ?икаÑ?Ñ?/Ñ?Ñ?анилиÑ?Ñ? клÑ?Ñ?ей «%s», но доÑ?Ñ?Ñ?п заблокиÑ?ован"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1057
+ msgid "New Password Required"
+ msgstr "ТÑ?ебÑ?еÑ?Ñ?Ñ? задаÑ?Ñ? новÑ?й паÑ?олÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1058
+ msgid "New password required for secure storage"
+ msgstr "Ð?лÑ? Ñ?Ñ?анилиÑ?а нÑ?жно задаÑ?Ñ? новÑ?й паÑ?олÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1060
+ #, c-format
+ msgid "In order to prepare '%s' for storage of certificates or keys, a password is required"
+ msgstr "ЧÑ?обÑ? подгоÑ?овиÑ?Ñ? «%s» длÑ? Ñ?Ñ?анениÑ? Ñ?еÑ?Ñ?иÑ?икаÑ?ов и клÑ?Ñ?ей необÑ?одимо задаÑ?Ñ? паÑ?олÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1183
+ #| msgid "Change Keyring Password"
+ msgid "Change Password"
+ msgstr "Ð?змениÑ?Ñ? паÑ?олÑ?"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1184
+ #| msgid "New password required for secure storage"
+ msgid "Change password for secure storage"
+ msgstr "Ð?змениÑ?Ñ? паÑ?олÑ? длÑ? Ñ?Ñ?анилиÑ?а"
+ 
+ #: ../pkcs11/wrap-layer/gkm-wrap-prompt.c:1186
+ #, c-format
+ msgid "To change the password for '%s', the original and new passwords are required"
+ msgstr "ЧÑ?обÑ? измениÑ?Ñ? паÑ?олÑ? длÑ? «%s», Ñ?Ñ?ебÑ?еÑ?Ñ?Ñ? иÑ?Ñ?однÑ?й паÑ?олÑ? и новÑ?й паÑ?олÑ?"
+ 
+ #: ../ui/gku-prompt-tool.c:538
+ msgid "Store passwords unencrypted?"
+ msgstr "Ð¥Ñ?аниÑ?Ñ? паÑ?оли неÑ?иÑ?Ñ?ованнÑ?ми?"
+ 
+ #: ../ui/gku-prompt-tool.c:539
+ msgid "By choosing to use a blank password, your stored passwords will not be safely encrypted. They will be accessible by anyone with access to your files."
+ msgstr "Ð?Ñ?ли ввеÑ?Ñ?и пÑ?Ñ?Ñ?ой паÑ?олÑ?, Ñ?о ваÑ?и Ñ?Ñ?анимÑ?е паÑ?оли не бÑ?дÑ?Ñ? надÑ?жно заÑ?иÑ?Ñ?ованÑ?. Ð?ни бÑ?дÑ?Ñ? доÑ?Ñ?Ñ?пнÑ? лÑ?бомÑ?, кÑ?о имееÑ? доÑ?Ñ?Ñ?п к ваÑ?им Ñ?айлам."
+ 
+ #: ../ui/gku-prompt-tool.c:546
+ msgid "Use Unsafe Storage"
+ msgstr "Ð?Ñ?полÑ?зоваÑ?Ñ? небезопаÑ?ное Ñ?Ñ?анилиÑ?е"
+ 
+ #: ../ui/gku-prompt-tool.c:584
+ msgid "Passwords do not match."
+ msgstr "Ð?аÑ?оли не Ñ?овпадаÑ?Ñ?."
+ 
+ #: ../ui/gku-prompt-tool.c:594
+ msgid "Password cannot be blank"
+ msgstr "Ð?аÑ?олÑ? не можеÑ? бÑ?Ñ?Ñ? пÑ?Ñ?Ñ?Ñ?м"
+ 
+ #: ../ui/gku-prompt.ui.h:1
+ msgid "New password strength"
+ msgstr "СÑ?ойкоÑ?Ñ?Ñ? нового паÑ?олÑ?"
+ 
+ #: ../ui/gku-prompt.ui.h:2
+ msgid "_Application:"
+ msgstr "Ð?_Ñ?иложение:"
+ 
+ #: ../ui/gku-prompt.ui.h:3
+ msgid "_Confirm:"
+ msgstr "Ð?о_дÑ?веÑ?диÑ?е паÑ?олÑ?:"
+ 
+ #: ../ui/gku-prompt.ui.h:4
+ msgid "_Details:"
+ msgstr "_Ð?одÑ?обноÑ?Ñ?и:"
+ 
+ #: ../ui/gku-prompt.ui.h:5
+ msgid "_Name:"
+ msgstr "_Ð?мÑ?"
+ 
+ #: ../ui/gku-prompt.ui.h:6
+ msgid "_Old Password:"
+ msgstr "_СÑ?аÑ?Ñ?й паÑ?олÑ?:"
+ 
+ #: ../ui/gku-prompt.ui.h:7
+ msgid "_Password:"
+ msgstr "_Ð?аÑ?олÑ?:"
 -



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]