← Back to branch summary

~osomon/webbrowser-app/maxCacheSizeHint

« back to all changes in this revision

Viewing changes to po/webbrowser-app.pot

  • Committer: Olivier Tilloy
  • Date: 2015-04-08 15:29:44 UTC
  • mfrom: (930.1.25 webbrowser-app)
  • Revision ID: olivier.tilloy@canonical.com-20150408152944-zg7hpedldixspgf7
Merge the latest changes from trunk and resolve a conflict.

Show diffs side-by-side

added added

removed removed

Lines of Context:
po/webbrowser-app.pot
8
8
msgstr ""
9
9
"Project-Id-Version: webbrowser-app\n"
10
10
"Report-Msgid-Bugs-To: \n"
11
 
"POT-Creation-Date: 2015-02-27 10:29+0100\n"
 
11
"POT-Creation-Date: 2015-03-22 21:26+0100\n"
12
12
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13
13
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
14
"Language-Team: LANGUAGE <LL@li.org>\n"
354
354
msgid "Address;URL;www"
355
355
msgstr ""
356
356
 
357
 
#: src/app/actions/NewTab.qml:23
 
357
#: src/app/actions/NewTab.qml:23 src/app/webbrowser/Browser.qml:355
358
358
msgid "New Tab"
359
359
msgstr ""
360
360
 
405
405
msgid "Delete"
406
406
msgstr ""
407
407
 
408
 
#: src/app/webbrowser/Browser.qml:161
 
408
#: src/app/webbrowser/Browser.qml:178
409
409
msgid "Share"
410
410
msgstr ""
411
411
 
412
 
#: src/app/webbrowser/Browser.qml:175
 
412
#: src/app/webbrowser/Browser.qml:192
413
413
msgid "History"
414
414
msgstr ""
415
415
 
416
 
#: src/app/webbrowser/Browser.qml:182
 
416
#: src/app/webbrowser/Browser.qml:199
417
417
msgid "Open tabs"
418
418
msgstr ""
419
419
 
420
 
#: src/app/webbrowser/Browser.qml:188 src/app/webbrowser/HistoryView.qml:244
421
 
#: src/app/webbrowser/TabsView.qml:57
 
420
#: src/app/webbrowser/Browser.qml:209 src/app/webbrowser/HistoryView.qml:244
 
421
#: src/app/webbrowser/TabsList.qml:84
422
422
msgid "New tab"
423
423
msgstr ""
424
424
 
 
425
#: src/app/webbrowser/Browser.qml:338 src/app/webbrowser/HistoryView.qml:231
 
426
msgid "Done"
 
427
msgstr ""
 
428
 
425
429
#: src/app/webbrowser/ExpandedHistoryView.qml:180
426
430
#, qt-format
427
431
msgid "%1 page"
441
445
msgid "Yesterday"
442
446
msgstr ""
443
447
 
444
 
#: src/app/webbrowser/HistoryView.qml:231 src/app/webbrowser/TabsView.qml:99
445
 
msgid "Done"
446
 
msgstr ""
447
 
 
448
448
#: src/app/webbrowser/HistoryView.qml:295
449
449
msgid "Select all"
450
450
msgstr ""
517
517
msgid "Which is run by"
518
518
msgstr ""
519
519
 
520
 
#: src/app/webbrowser/TabPreview.qml:163
 
520
#: src/app/webbrowser/TabPreview.qml:99
521
521
msgid "Tap to view"
522
522
msgstr ""
523
523
 
524
 
#: src/app/webbrowser/TabsView.qml:113
525
 
msgid "Add"
526
 
msgstr ""
527
 
 
528
524
#. TRANSLATORS: %1 refers to the current page’s title
529
525
#: src/app/webbrowser/webbrowser-app.qml:38
530
526
#: src/app/webcontainer/webapp-container.qml:66