← Back to branch summary

~mardy/ubuntu-system-settings-online-accounts/handle-errors-1349975

« back to all changes in this revision

Viewing changes to po/ja.po

  • Committer: Alberto Mardegan
  • Date: 2015-10-29 15:45:25 UTC
  • mfrom: (295.1.6 trunk)
  • Revision ID: alberto.mardegan@canonical.com-20151029154525-f6obiia8r9zg79nl
Merge trunk

[ Alberto Mardegan ]
* Regenerate hooks whenever file time changes (LP: #1510640)
[ CI Train Bot ]
* Resync trunk. added: po/hi.po
[ Alberto Mardegan ]
* Simplify hooks, load v2api library added: click-hooks/accounts.cpp
  click-hooks/accounts.hook.in click-hooks/acl-updater.cpp click-
  hooks/acl-updater.h click-hooks/click-hooks.pro click-hooks/online-
  accounts-hooks2.pro online-accounts-
  service/com.ubuntu.OnlineAccounts.Manager.service.in tests/click-
  hooks/click-hooks.pro tests/click-hooks/fake_signond.h tests/click-
  hooks/signond.py tests/click-hooks/tst_online_accounts_hooks2.cpp
  tests/click-hooks/tst_online_accounts_hooks2.pro renamed: click-
  hooks/click-hooks.pro => click-hooks/online-accounts-hooks.pro
  tests/click-hooks/click-hooks.pro => tests/click-
  hooks/tst_online_accounts_hooks.pro
[ CI Train Bot ]
* Resync trunk. added: po/mr.po po/th.po

Show diffs side-by-side

added added

removed removed

Lines of Context:
po/ja.po
14
14
"MIME-Version: 1.0\n"
15
15
"Content-Type: text/plain; charset=UTF-8\n"
16
16
"Content-Transfer-Encoding: 8bit\n"
17
 
"X-Launchpad-Export-Date: 2015-09-03 05:38+0000\n"
18
 
"X-Generator: Launchpad (build 17706)\n"
 
17
"X-Launchpad-Export-Date: 2015-10-23 05:46+0000\n"
 
18
"X-Generator: Launchpad (build 17812)\n"
19
19
 
20
20
#: ../plugins/example/Main.qml:33
21
21
msgid "User name"
100
100
 
101
101
#: ../online-accounts-ui/qml/AuthorizationPage.qml:96
102
102
msgid "Add another account…"
103
 
msgstr ""
 
103
msgstr "他のアカウントを追加…"
104
104
 
105
105
#: ../online-accounts-ui/qml/AuthorizationPage.qml:104
106
106
msgid "Don't allow"