address-book-app

Merge lp:~aacid/address-book-app/addi18ntr into lp:address-book-app

  1. addi18ntr
  2. Merge into trunk
Proposed by Albert Astals Cid
Status: Superseded
Proposed branch: lp:~aacid/address-book-app/addi18ntr
Merge into: lp:address-book-app
Diff against target: 145 lines (+19/-18)
2 files modified
po/address-book-app.pot (+18/-17)
src/imports/ContactView/ContactFetchError.qml (+1/-1)
To merge this branch: bzr merge lp:~aacid/address-book-app/addi18ntr
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Gustavo Pichorim Boiko Pending
Renato Araujo Oliveira Filho Pending
Ubuntu Phablet Team Pending
Review via email: mp+235912@code.launchpad.net

This proposal has been superseded by a proposal from 2014-09-29.

Commit message

Add i18n.tr

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:313
http://jenkins.qa.ubuntu.com/job/address-book-app-ci/688/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/address-book-app-utopic-i386-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/5166
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/3770
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4909
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6418
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6418/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13729
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/3156
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4081
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/4081/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/address-book-app-ci/688/rebuild

review: Approve (continuous-integration)
lp:~aacid/address-book-app/addi18ntr updated
308. By Albert Astals Cid

Add i18n.tr

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'po/address-book-app.pot'
--- po/address-book-app.pot 2014-09-18 19:24:02 +0000
+++ po/address-book-app.pot 2014-09-29 13:20:18 +0000
@@ -8,7 +8,7 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: address-book-app\n"9"Project-Id-Version: address-book-app\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2014-09-18 16:18-0300\n"11"POT-Creation-Date: 2014-09-25 10:42+0200\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -31,7 +31,7 @@
31msgid "Add Field"31msgid "Add Field"
32msgstr ""32msgstr ""
3333
34#: ../src/imports/ContactList/ContactListPage.qml:52834#: ../src/imports/ContactList/ContactListPage.qml:532
35msgid "Add contact"35msgid "Add contact"
36msgstr ""36msgstr ""
3737
@@ -55,7 +55,7 @@
55msgstr ""55msgstr ""
5656
57#. TRANSLATORS: this refers to all contacts57#. TRANSLATORS: this refers to all contacts
58#: ../src/imports/ContactList/ContactListPage.qml:41058#: ../src/imports/ContactList/ContactListPage.qml:414
59msgid "All"59msgid "All"
60msgstr ""60msgstr ""
6161
@@ -68,12 +68,13 @@
68msgstr ""68msgstr ""
6969
70#: ../src/imports/ContactEdit/ContactEditor.qml:39870#: ../src/imports/ContactEdit/ContactEditor.qml:398
71#: ../src/imports/ContactList/ContactListPage.qml:42371#: ../src/imports/ContactList/ContactListPage.qml:427
72#: ../src/imports/ContactView/ContactFetchError.qml:29
72#: ../src/imports/MainWindow.qml:13373#: ../src/imports/MainWindow.qml:133
73msgid "Cancel"74msgid "Cancel"
74msgstr ""75msgstr ""
7576
76#: ../src/imports/ContactList/ContactListPage.qml:44777#: ../src/imports/ContactList/ContactListPage.qml:451
77msgid "Cancel selection"78msgid "Cancel selection"
78msgstr ""79msgstr ""
7980
@@ -102,13 +103,13 @@
102msgid "Country"103msgid "Country"
103msgstr ""104msgstr ""
104105
105#: ../src/imports/ContactList/ContactListPage.qml:607106#: ../src/imports/ContactList/ContactListPage.qml:613
106msgid "Create a new contact by swiping up from the bottom of the screen."107msgid "Create a new contact by swiping up from the bottom of the screen."
107msgstr ""108msgstr ""
108109
109#: ../src/imports/ContactEdit/ContactEditor.qml:355110#: ../src/imports/ContactEdit/ContactEditor.qml:355
110#: ../src/imports/ContactList/ContactListPage.qml:267111#: ../src/imports/ContactList/ContactListPage.qml:267
111#: ../src/imports/ContactList/ContactListPage.qml:489112#: ../src/imports/ContactList/ContactListPage.qml:493
112msgid "Delete"113msgid "Delete"
113msgstr ""114msgstr ""
114115
@@ -141,7 +142,7 @@
141msgid "Error"142msgid "Error"
142msgstr ""143msgstr ""
143144
144#: ../src/imports/ContactList/ContactListPage.qml:410145#: ../src/imports/ContactList/ContactListPage.qml:414
145msgid "Favorites"146msgid "Favorites"
146msgstr ""147msgstr ""
147148
@@ -183,7 +184,7 @@
183msgid "Last name"184msgid "Last name"
184msgstr ""185msgstr ""
185186
186#: ../src/imports/ContactList/ContactListPage.qml:338187#: ../src/imports/ContactList/ContactListPage.qml:342
187msgid "Loading..."188msgid "Loading..."
188msgstr ""189msgstr ""
189190
@@ -243,7 +244,7 @@
243msgid "Professional Details"244msgid "Professional Details"
244msgstr ""245msgstr ""
245246
246#: ../src/imports/ContactList/ContactListPage.qml:381247#: ../src/imports/ContactList/ContactListPage.qml:385
247msgid "Quit"248msgid "Quit"
248msgstr ""249msgstr ""
249250
@@ -259,19 +260,19 @@
259msgid "Save"260msgid "Save"
260msgstr ""261msgstr ""
261262
262#: ../src/imports/ContactList/ContactListPage.qml:396263#: ../src/imports/ContactList/ContactListPage.qml:400
263msgid "Search"264msgid "Search"
264msgstr ""265msgstr ""
265266
266#: ../src/imports/ContactList/ContactListPage.qml:353267#: ../src/imports/ContactList/ContactListPage.qml:357
267msgid "Search..."268msgid "Search..."
268msgstr ""269msgstr ""
269270
270#: ../src/imports/ContactList/ContactListPage.qml:453271#: ../src/imports/ContactList/ContactListPage.qml:457
271msgid "Select All"272msgid "Select All"
272msgstr ""273msgstr ""
273274
274#: ../src/imports/ContactList/ContactListPage.qml:466275#: ../src/imports/ContactList/ContactListPage.qml:470
275#: ../src/imports/ContactView/ContactView.qml:98276#: ../src/imports/ContactView/ContactView.qml:98
276msgid "Share"277msgid "Share"
277msgstr ""278msgstr ""
@@ -289,15 +290,15 @@
289msgid "Street"290msgid "Street"
290msgstr ""291msgstr ""
291292
292#: ../src/imports/ContactList/ContactListPage.qml:390293#: ../src/imports/ContactList/ContactListPage.qml:394
293msgid "Sync"294msgid "Sync"
294msgstr ""295msgstr ""
295296
296#: ../src/imports/ContactList/ContactListPage.qml:390297#: ../src/imports/ContactList/ContactListPage.qml:394
297msgid "Syncing"298msgid "Syncing"
298msgstr ""299msgstr ""
299300
300#: ../src/imports/ContactList/ContactListPage.qml:338301#: ../src/imports/ContactList/ContactListPage.qml:342
301msgid "Syncing..."302msgid "Syncing..."
302msgstr ""303msgstr ""
303304
304305
=== modified file 'src/imports/ContactView/ContactFetchError.qml'
--- src/imports/ContactView/ContactFetchError.qml 2014-07-20 20:23:20 +0000
+++ src/imports/ContactView/ContactFetchError.qml 2014-09-29 13:20:18 +0000
@@ -26,7 +26,7 @@
26 text: i18n.tr("Contact not found")26 text: i18n.tr("Contact not found")
2727
28 Button {28 Button {
29 text: "Cancel"29 text: i18n.tr("Cancel")
30 gradient: UbuntuColors.greyGradient30 gradient: UbuntuColors.greyGradient
31 onClicked: {31 onClicked: {
32 PopupUtils.close(dialogue)32 PopupUtils.close(dialogue)

Subscribers

People subscribed via source and target branches