Ubuntu Help App

Merge lp:~dholbach/help-app/FLAC into lp:help-app

  1. FLAC
  2. Merge into trunk
Proposed by Daniel Holbach on 2015-06-04
Status: Merged
Approved by: Daniel Holbach on 2015-06-04
Approved revision: 151
Merged at revision: 150
Proposed branch: lp:~dholbach/help-app/FLAC
Merge into: lp:help-app
Diff against target: 3029 lines (+577/-535)
10 files modified
content/pages/apps.md (+1/-1)
po/de.po (+86/-83)
po/es.po (+71/-65)
po/fr.po (+69/-63)
po/help.pot (+2/-2)
po/it.po (+69/-63)
po/pl.po (+69/-63)
po/pt.po (+72/-69)
po/ro.po (+69/-63)
po/ru.po (+69/-63)
To merge this branch: bzr merge lp:~dholbach/help-app/FLAC
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve on 2015-06-04
David Callé (community) Approve on 2015-06-04
Ubuntu Help app developers 2015-06-04 Pending
Review via email: mp+261062@code.launchpad.net

Commit Message

it's FLAC, not FLAG (https://xiph.org/flac/)

Description of the Change

it's FLAC, not FLAG (https://xiph.org/flac/)

To post a comment you must log in.
David Callé (davidc3) wrote :

Indeed :)

review: Approve
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'content/pages/apps.md'
2--- content/pages/apps.md 2015-05-20 14:39:26 +0000
3+++ content/pages/apps.md 2015-06-04 07:56:20 +0000
4@@ -31,7 +31,7 @@
5 You can add music in multiple ways. If you have pre-existing music files, simply connect your phone to your pc via the usb cable. Next, copy the music you wish to listen to to the *Music* folder. Your music will appear in the music app. Alternatively, you can acquire music directly using the device via a scope, such as 7digital or by downloading via the browser or another application.
6
7 ### What music formats are supported? !!QA
8-The music app supports OGG, FLAG and MP3 formats.
9+The music app supports OGG, FLAC and MP3 formats.
10
11 ### How do I listen to podcasts? !!!QA
12 You can install the Podbird app from the Store. Podbird supports search, subscription, offline caching and playing of podcasts.
13
14=== modified file 'po/de.po'
15--- po/de.po 2015-06-04 05:38:35 +0000
16+++ po/de.po 2015-06-04 07:56:20 +0000
17@@ -2,7 +2,7 @@
18 # Copyright (C) YEAR Free Software Foundation, Inc.
19 # This file is distributed under the same license as the PACKAGE package.
20 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
21-#
22+#
23 msgid ""
24 msgstr ""
25 "Project-Id-Version: PACKAGE VERSION\n"
26@@ -11,12 +11,12 @@
27 "PO-Revision-Date: 2015-06-03 10:19+0000\n"
28 "Last-Translator: Daniel Holbach <daniel.holbach@ubuntu.com>\n"
29 "Language-Team: LANGUAGE <LL@li.org>\n"
30+"Language: \n"
31 "MIME-Version: 1.0\n"
32 "Content-Type: text/plain; charset=UTF-8\n"
33 "Content-Transfer-Encoding: 8bit\n"
34+"X-Generator: Launchpad (build 17540)\n"
35 "X-Launchpad-Export-Date: 2015-06-04 05:38+0000\n"
36-"X-Generator: Launchpad (build 17540)\n"
37-"Language: \n"
38
39 #. type: Plain text
40 #: content/pages/scopes.md:2
41@@ -34,7 +34,7 @@
42 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
43 #: content/pages/apps.md:7
44 msgid "[TOC]"
45-msgstr "[Inhaltsverzeichnis]"
46+msgstr "[TOC]"
47
48 #. !!QA
49 #: content/pages/scopes.md:7
50@@ -46,8 +46,8 @@
51 #: content/pages/scopes.md:9
52 msgid ""
53 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
54-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
55-"them again will remove the favorite. All favorited scopes will appear on "
56+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
57+" them again will remove the favorite. All favorited scopes will appear on "
58 "your dash."
59 msgstr ""
60
61@@ -88,8 +88,8 @@
62 "Wischen Sie von unten im Dash nach oben, um in den Scope Manager zu "
63 "gelangen. Sie können eine Scope durch die Auswahl in der Liste Ihrer "
64 "Favoriten entfernen. Diese wird von der Dash entfernt. Wenn Sie es ganz "
65-"entfernen möchten, gehen Sie zur Scope Seite in dem Ubuntu Store und drücken "
66-"bei der Scope *Entfernen*."
67+"entfernen möchten, gehen Sie zur Scope Seite in dem Ubuntu Store und drücken"
68+" bei der Scope *Entfernen*."
69
70 #. type: Plain text
71 #: content/pages/index.md:2
72@@ -125,12 +125,12 @@
73 #. type: Plain text
74 #: content/pages/index.md:11
75 msgid "[Take me to the FAQ!]({filename}faq.md)"
76-msgstr "[Bringen Sie mich zur FAQ!]({filename}faq.md)"
77+msgstr "[Bringen Sie mich zur FAQ!]({filename}faq.de.md)"
78
79 #. type: Plain text
80 #: content/pages/index.md:12
81 msgid "[Get in touch]({filename}get-in-touch.md)"
82-msgstr "[Kontakt]({filename}get-in-touch.md)"
83+msgstr "[Kontakt]({filename}get-in-touch.de.md)"
84
85 #. type: Plain text
86 #: content/pages/security.md:2
87@@ -157,9 +157,9 @@
88 "find this setting under the *System Settings* application. Select *Security "
89 "& Privacy*, then *Phone Locking* to adjust the *Lock when idle* setting."
90 msgstr ""
91-"Durch Drücken der Power-Taste sperren Sie das Telefon. Darüber hinaus können "
92-"Sie festlegen, wie lange Ihr Telefon entsperrt bleibt, wenn es inaktiv ist. "
93-"Sie können diese Einstellung unter der Anwendung *Systemeinstellungen* "
94+"Durch Drücken der Power-Taste sperren Sie das Telefon. Darüber hinaus können"
95+" Sie festlegen, wie lange Ihr Telefon entsperrt bleibt, wenn es inaktiv ist."
96+" Sie können diese Einstellung unter der Anwendung *Systemeinstellungen* "
97 "finden. Wählen Sie *Sicherheit & Datenschutz* dann *Telefon sperren* und "
98 "dann die *Sperren, wenn inaktiv* Einstellung."
99
100@@ -215,8 +215,8 @@
101 #: content/pages/security.md:19
102 #, no-wrap
103 msgid ""
104-"Why do I have to type my PIN when using File Manager & Terminal (not default "
105-"apps)?"
106+"Why do I have to type my PIN when using File Manager & Terminal (not default"
107+" apps)?"
108 msgstr ""
109 "Warum muss ich meine PIN bei Nutzung der nicht standardmässigen Anwendungen "
110 "Dateiverwaltung und des Befehlsfensters eingeben?"
111@@ -236,8 +236,8 @@
112 msgid ""
113 "How can I stop someone using the indicators when the phone is unlocked?"
114 msgstr ""
115-"Wie kann ich es abstellen, dass die Benachrichtigungen im gesperrten Zustand "
116-"genutzt werden können?"
117+"Wie kann ich es abstellen, dass die Benachrichtigungen im gesperrten Zustand"
118+" genutzt werden können?"
119
120 #. type: Plain text
121 #: content/pages/security.md:24
122@@ -291,7 +291,7 @@
123 "[scopes]({filename}scopes.md) such as 7digital can also play music."
124 msgstr ""
125 "Die Musikanwendung lässt Sie auf das Gerät kopierte Musik abspielen. "
126-"Außerdem können [Scopes]({filename}scopes.md) wie 7digital auch Musik "
127+"Außerdem können [Scopes]({filename}scopes.de.md) wie 7digital auch Musik "
128 "abspielen."
129
130 #. !!QA
131@@ -303,8 +303,8 @@
132 #. type: Plain text
133 #: content/pages/basic.md:12
134 msgid ""
135-"The media player application will play videos copied to the device. You will "
136-"also find applications like youtube that give you streaming options."
137+"The media player application will play videos copied to the device. You will"
138+" also find applications like youtube that give you streaming options."
139 msgstr ""
140 "Die Anwendung Media Player spielt Videos ab, die auf das Gerät kopiert "
141 "wurden. Dort finden Sie auch Anwendungen wie YouTube, die Ihnen Streaming-"
142@@ -322,8 +322,8 @@
143 "The included camera application allows you to take photos. If your device "
144 "has both a front and rear camera, you can toggle which camera to use."
145 msgstr ""
146-"Die mitgelieferte Kamera-Anwendung ermöglicht es Ihnen Fotos zu machen. Wenn "
147-"Ihr Gerät sowohl über eine vordere und hintere Kamera verfügt, können Sie "
148+"Die mitgelieferte Kamera-Anwendung ermöglicht es Ihnen Fotos zu machen. Wenn"
149+" Ihr Gerät sowohl über eine vordere und hintere Kamera verfügt, können Sie "
150 "festlegen, welche Kamera benutzt wird."
151
152 #. !!QA
153@@ -336,13 +336,13 @@
154 #: content/pages/basic.md:18
155 msgid ""
156 "Press the Volume Up and Volume Down buttons at the same time until you see "
157-"the screen flashing. The screenshot will capture what is on your screen, and "
158-"you can see the resulting picture in the Gallery app or the Photos scope."
159+"the screen flashing. The screenshot will capture what is on your screen, and"
160+" you can see the resulting picture in the Gallery app or the Photos scope."
161 msgstr ""
162 "Drücken Sie die Lauter und Leiser-Tasten gleichzeitig, bis der Bildschirm "
163 "blinkt. Der Screenshot wird alles was auf dem Bildschirm ist erfassen, und "
164-"Sie können das resultierende Bild in der Galerie-App oder in dem Fotos Scope "
165-"sehen."
166+"Sie können das resultierende Bild in der Galerie-App oder in dem Fotos Scope"
167+" sehen."
168
169 #. !!QA
170 #: content/pages/basic.md:19
171@@ -353,8 +353,8 @@
172 #. type: Plain text
173 #: content/pages/basic.md:21
174 msgid ""
175-"If you've just taken a picture, you can see it easily by swiping to the left "
176-"from the right edge inside the camera app. Alternatively, use the gallery "
177+"If you've just taken a picture, you can see it easily by swiping to the left"
178+" from the right edge inside the camera app. Alternatively, use the gallery "
179 "app to find the picture."
180 msgstr ""
181 "Wenn Sie gerade ein Foto aufgenommen haben, können Sie es einfach durch "
182@@ -373,8 +373,8 @@
183 "The included camera application allows you to take videos. If your device "
184 "has both a front and rear camera, you can toggle which camera to use."
185 msgstr ""
186-"Mit der mitgelieferte Kamera-Anwendung können Sie Videos aufnehmen. Wenn Ihr "
187-"Gerät verfügt sowohl über eine vordere und hintere Kamera verfügt, können "
188+"Mit der mitgelieferte Kamera-Anwendung können Sie Videos aufnehmen. Wenn Ihr"
189+" Gerät verfügt sowohl über eine vordere und hintere Kamera verfügt, können "
190 "Sie festlegen, welche Kamera benutzt wird."
191
192 #. !!QA
193@@ -512,8 +512,8 @@
194 #. type: Plain text
195 #: content/pages/settings.md:22
196 msgid ""
197-"You can set up some of your accounts from the scopes. Today scope allows you "
198-"to configure your Google and Fitbit account, while the Pictures scope lets "
199+"You can set up some of your accounts from the scopes. Today scope allows you"
200+" to configure your Google and Fitbit account, while the Pictures scope lets "
201 "you configure your flickr, Facebook and Instagram account. You can manage "
202 "all your accounts (including social media, email, etc) from the *System "
203 "Settings* app, under *Personal*, *Accounts*."
204@@ -543,8 +543,7 @@
205 #: content/pages/settings.md:26
206 #, no-wrap
207 msgid "How do I change the ringtone for calls and texts?"
208-msgstr ""
209-"Wie kann ich den Klingelton für Telefonanrufe und Nachrichten ändern?"
210+msgstr "Wie kann ich den Klingelton für Telefonanrufe und Nachrichten ändern?"
211
212 #. type: Plain text
213 #: content/pages/settings.md:27
214@@ -554,8 +553,8 @@
215 "will find your current ringtone. Tap it to open a page of ringtones to "
216 "select from."
217 msgstr ""
218-"Sie können den Klingelton für Anrufe und Nachrichten auf einen Neuen ändern. "
219-"Öffnen Sie die *Systemeinstellungen* und wählen *Audio*. Unter "
220+"Sie können den Klingelton für Anrufe und Nachrichten auf einen Neuen ändern."
221+" Öffnen Sie die *Systemeinstellungen* und wählen *Audio*. Unter "
222 "*Telefonanrufe* finden Sie den momentanen Klingelton. Öffnen Sie durch "
223 "Tippen eine Seite mit Klingeltönen, um einen davon auszuwählen."
224
225@@ -568,8 +567,8 @@
226 #: content/pages/ui.md:4
227 #, no-wrap
228 msgid ""
229-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
230-"place!*\n"
231+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
232+" place!*\n"
233 msgstr ""
234 "*Haben Sie Fragen über die Dash, die Scopes und das Wischen? Dann sind Sie "
235 "hier genau richtig!*\n"
236@@ -583,8 +582,8 @@
237 #. type: Plain text
238 #: content/pages/ui.md:9
239 msgid ""
240-"The dash contains a list of applications installed on the device, along with "
241-"presenting the scopes and store. The dash is the first thing you see when "
242+"The dash contains a list of applications installed on the device, along with"
243+" presenting the scopes and store. The dash is the first thing you see when "
244 "booting the phone. You can switch to it again at any time by swiping left "
245 "from the right screen edge."
246 msgstr ""
247@@ -614,7 +613,8 @@
248 "To pin a running app permanently to the launcher, long-press it to reveal "
249 "the context menu and choose the Pin to launcher option. You can do the same "
250 "to unpin apps. You can also move launcher icons around by long-pressing "
251-"them and dragging and dropping them to the position you'd like them to be in."
252+"them and dragging and dropping them to the position you'd like them to be "
253+"in."
254 msgstr ""
255
256 #. !!QA
257@@ -626,8 +626,8 @@
258 #. type: Plain text
259 #: content/pages/ui.md:19
260 msgid ""
261-"Indicators convey quick useful information about your device, like the time, "
262-"data connection, location, sound, and notifications. You can access the "
263+"Indicators convey quick useful information about your device, like the time,"
264+" data connection, location, sound, and notifications. You can access the "
265 "indicators at any time by swiping down from the top screen edge."
266 msgstr ""
267
268@@ -656,10 +656,10 @@
269 #. type: Plain text
270 #: content/pages/ui.md:26
271 msgid ""
272-"To close an application, slide your finger *slowly* left from the right edge "
273-"of the screen. An application switcher will appear. Place your finger on the "
274-"application preview you wish to close and swipe up or down. The application "
275-"will disappear."
276+"To close an application, slide your finger *slowly* left from the right edge"
277+" of the screen. An application switcher will appear. Place your finger on "
278+"the application preview you wish to close and swipe up or down. The "
279+"application will disappear."
280 msgstr ""
281
282 #. !!QA
283@@ -671,8 +671,8 @@
284 #. type: Plain text
285 #: content/pages/ui.md:29
286 msgid ""
287-"For text that can be copied and pasted, press and hold the text in question. "
288-"A menu will appear allowing you to cut, copy and paste."
289+"For text that can be copied and pasted, press and hold the text in question."
290+" A menu will appear allowing you to cut, copy and paste."
291 msgstr ""
292
293 #. !!QA
294@@ -758,8 +758,8 @@
295 #: content/pages/ui.md:48
296 #, no-wrap
297 msgid ""
298-"What is the round circle on the welcome screen for? What does it show? Can I "
299-"configure it?"
300+"What is the round circle on the welcome screen for? What does it show? Can I"
301+" configure it?"
302 msgstr ""
303 "Wofür ist der runde Kreis auf dem Willkommensbildschirm? Was zeigt er an? "
304 "Kann ich ihn konfigurieren?"
305@@ -767,8 +767,8 @@
306 #. type: Plain text
307 #: content/pages/ui.md:49
308 msgid ""
309-"The round circle is the infographic. It hows you recent phone activity, like "
310-"the number of messages received or the number of songs played. You can "
311+"The round circle is the infographic. It hows you recent phone activity, like"
312+" the number of messages received or the number of songs played. You can "
313 "disable it by launching the *Settings* app, navigating to *Security and "
314 "privacy* and unticking *Stats on Welcome screen*."
315 msgstr ""
316@@ -805,8 +805,8 @@
317 msgstr ""
318 "Eine weitere großartige Möglichkeit sich bei Ubuntu **zu engagieren** ist "
319 "unsere [Ubuntu Community Website](http://community.ubuntu.com/). Sie können "
320-"ganz einfach alles über die einzelnen Teams herausfinden, was sie machen, wo "
321-"sie anzutreffen sind und wie sie sich bei denen engagieren können."
322+"ganz einfach alles über die einzelnen Teams herausfinden, was sie machen, wo"
323+" sie anzutreffen sind und wie sie sich bei denen engagieren können."
324
325 #. type: Plain text
326 #: content/pages/faq.md:4
327@@ -826,19 +826,19 @@
328 #: content/pages/faq.md:8
329 #, no-wrap
330 msgid "[First day tasks]({filename}basic.md)"
331-msgstr "[Am ersten Tag]({filename}basic.md)"
332+msgstr "[Am ersten Tag]({filename}basic.de.md)"
333
334 #. type: Title ###
335 #: content/pages/faq.md:9
336 #, no-wrap
337 msgid "[User Interface]({filename}ui.md)"
338-msgstr "[User Interface]({filename}ui.md)"
339+msgstr "[User Interface]({filename}ui.de.md)"
340
341 #. type: Title ###
342 #: content/pages/faq.md:10
343 #, no-wrap
344 msgid "[Settings]({filename}settings.md)"
345-msgstr "[Einstellungen]({filename}settings.md)"
346+msgstr "[Einstellungen]({filename}settings.de.md)"
347
348 #. type: Title ###
349 #: content/pages/faq.md:11
350@@ -850,13 +850,13 @@
351 #: content/pages/faq.md:12
352 #, no-wrap
353 msgid "[Scopes]({filename}scopes.md)"
354-msgstr "[Scopes]({filename}scopes.md)"
355+msgstr "[Scopes]({filename}scopes.de.md)"
356
357 #. type: Title ###
358 #: content/pages/faq.md:13
359 #, no-wrap
360 msgid "[Security]({filename}security.md)"
361-msgstr "[Sicherheit]({filename}security.md)"
362+msgstr "[Sicherheit]({filename}security.de.md)"
363
364 #. type: Plain text
365 #: content/pages/apps.md:2
366@@ -887,8 +887,8 @@
367 #: content/pages/apps.md:12
368 msgid ""
369 "From the Apps scope, you can either tap on the “search” icon on the right "
370-"and start searching by name, or you can go all the way down in the scope and "
371-"tap on the Ubuntu Store icon."
372+"and start searching by name, or you can go all the way down in the scope and"
373+" tap on the Ubuntu Store icon."
374 msgstr ""
375
376 #. !!QA
377@@ -966,8 +966,8 @@
378 #: content/pages/apps.md:32
379 msgid ""
380 "You can add music in multiple ways. If you have pre-existing music files, "
381-"simply connect your phone to your pc via the usb cable. Next, copy the music "
382-"you wish to listen to to the *Music* folder. Your music will appear in the "
383+"simply connect your phone to your pc via the usb cable. Next, copy the music"
384+" you wish to listen to to the *Music* folder. Your music will appear in the "
385 "music app. Alternatively, you can acquire music directly using the device "
386 "via a scope, such as 7digital or by downloading via the browser or another "
387 "application."
388@@ -979,11 +979,6 @@
389 msgid "What music formats are supported?"
390 msgstr ""
391
392-#. type: Plain text
393-#: content/pages/apps.md:35
394-msgid "The music app supports OGG, FLAG and MP3 formats."
395-msgstr ""
396-
397 #. !!QA
398 #: content/pages/apps.md:36
399 #, no-wrap
400@@ -1012,11 +1007,11 @@
401 #. type: Plain text
402 #: content/pages/apps.md:43
403 msgid ""
404-"The first time you open the Contacts app you’ll be asked if you want to sync "
405-"contacts with your Google account. If you have answered “no” but change your "
406-"mind later, you can do so by going to the Today scope, and setting up your "
407-"Google account there. After that you can sync your contacts (and, if you "
408-"want, calendar events as well)."
409+"The first time you open the Contacts app you’ll be asked if you want to sync"
410+" contacts with your Google account. If you have answered “no” but change "
411+"your mind later, you can do so by going to the Today scope, and setting up "
412+"your Google account there. After that you can sync your contacts (and, if "
413+"you want, calendar events as well)."
414 msgstr ""
415
416 #. type: Title ##
417@@ -1049,10 +1044,10 @@
418 #. type: Plain text
419 #: content/pages/apps.md:51
420 msgid ""
421-"If you've just recorded a video, share it easily by swiping to the left from "
422-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
423-"find the video. Once loaded, select *Share* from the menu and choose how you "
424-"wish to share your video."
425+"If you've just recorded a video, share it easily by swiping to the left from"
426+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
427+" find the video. Once loaded, select *Share* from the menu and choose how "
428+"you wish to share your video."
429 msgstr ""
430
431 #. type: Title ##
432@@ -1083,8 +1078,8 @@
433 #. type: Plain text
434 #: content/pages/apps.md:59
435 msgid ""
436-"Use the gallery app to select your picture. Select the *Edit* button next to "
437-"the menu. Inside you'll find options to crop and rotate your picture."
438+"Use the gallery app to select your picture. Select the *Edit* button next to"
439+" the menu. Inside you'll find options to crop and rotate your picture."
440 msgstr ""
441
442 #. !!QA
443@@ -1096,9 +1091,9 @@
444 #. type: Plain text
445 #: content/pages/apps.md:62
446 msgid ""
447-"Select the Camera app from the launcher or apps scope. Select the video icon "
448-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
449-"additional options. Enjoy taking your video!"
450+"Select the Camera app from the launcher or apps scope. Select the video icon"
451+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
452+" additional options. Enjoy taking your video!"
453 msgstr ""
454
455 #. type: Title ##
456@@ -1170,3 +1165,11 @@
457 msgstr ""
458 "Ja, wobei Teile der Karte fehlen können und die Suche offline deaktiviert "
459 "ist."
460+
461+#. type: Plain text
462+#: content/pages/apps.md:35
463+msgid "The music app supports OGG, FLAC and MP3 formats."
464+msgstr ""
465+
466+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
467+#~ msgstr ""
468
469=== modified file 'po/es.po'
470--- po/es.po 2015-06-04 05:38:35 +0000
471+++ po/es.po 2015-06-04 07:56:20 +0000
472@@ -2,7 +2,7 @@
473 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
474 # This file is distributed under the same license as the ubuntu-devices-help package.
475 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
476-#
477+#
478 msgid ""
479 msgstr ""
480 "Project-Id-Version: ubuntu-devices-help\n"
481@@ -14,8 +14,8 @@
482 "MIME-Version: 1.0\n"
483 "Content-Type: text/plain; charset=UTF-8\n"
484 "Content-Transfer-Encoding: 8bit\n"
485+"X-Generator: Launchpad (build 17540)\n"
486 "X-Launchpad-Export-Date: 2015-06-04 05:38+0000\n"
487-"X-Generator: Launchpad (build 17540)\n"
488
489 #. type: Plain text
490 #: content/pages/scopes.md:2
491@@ -33,7 +33,7 @@
492 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
493 #: content/pages/apps.md:7
494 msgid "[TOC]"
495-msgstr ""
496+msgstr "[TOC]"
497
498 #. !!QA
499 #: content/pages/scopes.md:7
500@@ -45,8 +45,8 @@
501 #: content/pages/scopes.md:9
502 msgid ""
503 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
504-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
505-"them again will remove the favorite. All favorited scopes will appear on "
506+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
507+" them again will remove the favorite. All favorited scopes will appear on "
508 "your dash."
509 msgstr ""
510
511@@ -91,8 +91,8 @@
512 "The world-wide Ubuntu community wants to give you the best possible "
513 "experience on your Ubuntu device. This is why we collected:"
514 msgstr ""
515-"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible "
516-"en su dispositivo con Ubuntu. Por ello hemos recopilado:"
517+"La comunidad mundial de Ubuntu quiere ofrecerle la mejor experiencia posible"
518+" en su dispositivo con Ubuntu. Por ello hemos recopilado:"
519
520 #. type: Bullet: ' * '
521 #: content/pages/index.md:9
522@@ -112,12 +112,12 @@
523 #. type: Plain text
524 #: content/pages/index.md:11
525 msgid "[Take me to the FAQ!]({filename}faq.md)"
526-msgstr ""
527+msgstr "[Take me to the FAQ!]({filename}faq.es.md)"
528
529 #. type: Plain text
530 #: content/pages/index.md:12
531 msgid "[Get in touch]({filename}get-in-touch.md)"
532-msgstr ""
533+msgstr "[Get in touch]({filename}get-in-touch.es.md)"
534
535 #. type: Plain text
536 #: content/pages/security.md:2
537@@ -188,8 +188,8 @@
538 #: content/pages/security.md:19
539 #, no-wrap
540 msgid ""
541-"Why do I have to type my PIN when using File Manager & Terminal (not default "
542-"apps)?"
543+"Why do I have to type my PIN when using File Manager & Terminal (not default"
544+" apps)?"
545 msgstr ""
546
547 #. type: Plain text
548@@ -249,6 +249,8 @@
549 "The music app let's you play music copied to the device. In addition, "
550 "[scopes]({filename}scopes.md) such as 7digital can also play music."
551 msgstr ""
552+"The music app let's you play music copied to the device. In addition, "
553+"[scopes]({filename}scopes.es.md) such as 7digital can also play music."
554
555 #. !!QA
556 #: content/pages/basic.md:10
557@@ -259,8 +261,8 @@
558 #. type: Plain text
559 #: content/pages/basic.md:12
560 msgid ""
561-"The media player application will play videos copied to the device. You will "
562-"also find applications like youtube that give you streaming options."
563+"The media player application will play videos copied to the device. You will"
564+" also find applications like youtube that give you streaming options."
565 msgstr ""
566
567 #. !!QA
568@@ -286,8 +288,8 @@
569 #: content/pages/basic.md:18
570 msgid ""
571 "Press the Volume Up and Volume Down buttons at the same time until you see "
572-"the screen flashing. The screenshot will capture what is on your screen, and "
573-"you can see the resulting picture in the Gallery app or the Photos scope."
574+"the screen flashing. The screenshot will capture what is on your screen, and"
575+" you can see the resulting picture in the Gallery app or the Photos scope."
576 msgstr ""
577
578 #. !!QA
579@@ -299,8 +301,8 @@
580 #. type: Plain text
581 #: content/pages/basic.md:21
582 msgid ""
583-"If you've just taken a picture, you can see it easily by swiping to the left "
584-"from the right edge inside the camera app. Alternatively, use the gallery "
585+"If you've just taken a picture, you can see it easily by swiping to the left"
586+" from the right edge inside the camera app. Alternatively, use the gallery "
587 "app to find the picture."
588 msgstr ""
589
590@@ -431,8 +433,8 @@
591 #. type: Plain text
592 #: content/pages/settings.md:22
593 msgid ""
594-"You can set up some of your accounts from the scopes. Today scope allows you "
595-"to configure your Google and Fitbit account, while the Pictures scope lets "
596+"You can set up some of your accounts from the scopes. Today scope allows you"
597+" to configure your Google and Fitbit account, while the Pictures scope lets "
598 "you configure your flickr, Facebook and Instagram account. You can manage "
599 "all your accounts (including social media, email, etc) from the *System "
600 "Settings* app, under *Personal*, *Accounts*."
601@@ -477,8 +479,8 @@
602 #: content/pages/ui.md:4
603 #, no-wrap
604 msgid ""
605-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
606-"place!*\n"
607+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
608+" place!*\n"
609 msgstr ""
610
611 #. !!QA
612@@ -490,8 +492,8 @@
613 #. type: Plain text
614 #: content/pages/ui.md:9
615 msgid ""
616-"The dash contains a list of applications installed on the device, along with "
617-"presenting the scopes and store. The dash is the first thing you see when "
618+"The dash contains a list of applications installed on the device, along with"
619+" presenting the scopes and store. The dash is the first thing you see when "
620 "booting the phone. You can switch to it again at any time by swiping left "
621 "from the right screen edge."
622 msgstr ""
623@@ -521,7 +523,8 @@
624 "To pin a running app permanently to the launcher, long-press it to reveal "
625 "the context menu and choose the Pin to launcher option. You can do the same "
626 "to unpin apps. You can also move launcher icons around by long-pressing "
627-"them and dragging and dropping them to the position you'd like them to be in."
628+"them and dragging and dropping them to the position you'd like them to be "
629+"in."
630 msgstr ""
631
632 #. !!QA
633@@ -533,8 +536,8 @@
634 #. type: Plain text
635 #: content/pages/ui.md:19
636 msgid ""
637-"Indicators convey quick useful information about your device, like the time, "
638-"data connection, location, sound, and notifications. You can access the "
639+"Indicators convey quick useful information about your device, like the time,"
640+" data connection, location, sound, and notifications. You can access the "
641 "indicators at any time by swiping down from the top screen edge."
642 msgstr ""
643
644@@ -563,10 +566,10 @@
645 #. type: Plain text
646 #: content/pages/ui.md:26
647 msgid ""
648-"To close an application, slide your finger *slowly* left from the right edge "
649-"of the screen. An application switcher will appear. Place your finger on the "
650-"application preview you wish to close and swipe up or down. The application "
651-"will disappear."
652+"To close an application, slide your finger *slowly* left from the right edge"
653+" of the screen. An application switcher will appear. Place your finger on "
654+"the application preview you wish to close and swipe up or down. The "
655+"application will disappear."
656 msgstr ""
657
658 #. !!QA
659@@ -578,8 +581,8 @@
660 #. type: Plain text
661 #: content/pages/ui.md:29
662 msgid ""
663-"For text that can be copied and pasted, press and hold the text in question. "
664-"A menu will appear allowing you to cut, copy and paste."
665+"For text that can be copied and pasted, press and hold the text in question."
666+" A menu will appear allowing you to cut, copy and paste."
667 msgstr ""
668
669 #. !!QA
670@@ -665,15 +668,15 @@
671 #: content/pages/ui.md:48
672 #, no-wrap
673 msgid ""
674-"What is the round circle on the welcome screen for? What does it show? Can I "
675-"configure it?"
676+"What is the round circle on the welcome screen for? What does it show? Can I"
677+" configure it?"
678 msgstr ""
679
680 #. type: Plain text
681 #: content/pages/ui.md:49
682 msgid ""
683-"The round circle is the infographic. It hows you recent phone activity, like "
684-"the number of messages received or the number of songs played. You can "
685+"The round circle is the infographic. It hows you recent phone activity, like"
686+" the number of messages received or the number of songs played. You can "
687 "disable it by launching the *Settings* app, navigating to *Security and "
688 "privacy* and unticking *Stats on Welcome screen*."
689 msgstr ""
690@@ -721,37 +724,37 @@
691 #: content/pages/faq.md:8
692 #, no-wrap
693 msgid "[First day tasks]({filename}basic.md)"
694-msgstr ""
695+msgstr "[First day tasks]({filename}basic.es.md)"
696
697 #. type: Title ###
698 #: content/pages/faq.md:9
699 #, no-wrap
700 msgid "[User Interface]({filename}ui.md)"
701-msgstr "[Interfaz de usuario]({filename}ui.md)"
702+msgstr "[Interfaz de usuario]({filename}ui.es.md)"
703
704 #. type: Title ###
705 #: content/pages/faq.md:10
706 #, no-wrap
707 msgid "[Settings]({filename}settings.md)"
708-msgstr "[Configuración]({filename}settings.md)"
709+msgstr "[Configuración]({filename}settings.es.md)"
710
711 #. type: Title ###
712 #: content/pages/faq.md:11
713 #, no-wrap
714 msgid "[Apps]({filename}apps.md)"
715-msgstr "[Aplicaciones]({filename}apps.md)"
716+msgstr "[Aplicaciones]({filename}apps.es.md)"
717
718 #. type: Title ###
719 #: content/pages/faq.md:12
720 #, no-wrap
721 msgid "[Scopes]({filename}scopes.md)"
722-msgstr "[«Scopes»]({filename}scopes.md)"
723+msgstr "[«Scopes»]({filename}scopes.es.md)"
724
725 #. type: Title ###
726 #: content/pages/faq.md:13
727 #, no-wrap
728 msgid "[Security]({filename}security.md)"
729-msgstr "[Seguridad]({filename}security.md)"
730+msgstr "[Seguridad]({filename}security.es.md)"
731
732 #. type: Plain text
733 #: content/pages/apps.md:2
734@@ -782,8 +785,8 @@
735 #: content/pages/apps.md:12
736 msgid ""
737 "From the Apps scope, you can either tap on the “search” icon on the right "
738-"and start searching by name, or you can go all the way down in the scope and "
739-"tap on the Ubuntu Store icon."
740+"and start searching by name, or you can go all the way down in the scope and"
741+" tap on the Ubuntu Store icon."
742 msgstr ""
743
744 #. !!QA
745@@ -861,8 +864,8 @@
746 #: content/pages/apps.md:32
747 msgid ""
748 "You can add music in multiple ways. If you have pre-existing music files, "
749-"simply connect your phone to your pc via the usb cable. Next, copy the music "
750-"you wish to listen to to the *Music* folder. Your music will appear in the "
751+"simply connect your phone to your pc via the usb cable. Next, copy the music"
752+" you wish to listen to to the *Music* folder. Your music will appear in the "
753 "music app. Alternatively, you can acquire music directly using the device "
754 "via a scope, such as 7digital or by downloading via the browser or another "
755 "application."
756@@ -874,11 +877,6 @@
757 msgid "What music formats are supported?"
758 msgstr ""
759
760-#. type: Plain text
761-#: content/pages/apps.md:35
762-msgid "The music app supports OGG, FLAG and MP3 formats."
763-msgstr ""
764-
765 #. !!QA
766 #: content/pages/apps.md:36
767 #, no-wrap
768@@ -907,11 +905,11 @@
769 #. type: Plain text
770 #: content/pages/apps.md:43
771 msgid ""
772-"The first time you open the Contacts app you’ll be asked if you want to sync "
773-"contacts with your Google account. If you have answered “no” but change your "
774-"mind later, you can do so by going to the Today scope, and setting up your "
775-"Google account there. After that you can sync your contacts (and, if you "
776-"want, calendar events as well)."
777+"The first time you open the Contacts app you’ll be asked if you want to sync"
778+" contacts with your Google account. If you have answered “no” but change "
779+"your mind later, you can do so by going to the Today scope, and setting up "
780+"your Google account there. After that you can sync your contacts (and, if "
781+"you want, calendar events as well)."
782 msgstr ""
783
784 #. type: Title ##
785@@ -944,10 +942,10 @@
786 #. type: Plain text
787 #: content/pages/apps.md:51
788 msgid ""
789-"If you've just recorded a video, share it easily by swiping to the left from "
790-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
791-"find the video. Once loaded, select *Share* from the menu and choose how you "
792-"wish to share your video."
793+"If you've just recorded a video, share it easily by swiping to the left from"
794+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
795+" find the video. Once loaded, select *Share* from the menu and choose how "
796+"you wish to share your video."
797 msgstr ""
798
799 #. type: Title ##
800@@ -978,8 +976,8 @@
801 #. type: Plain text
802 #: content/pages/apps.md:59
803 msgid ""
804-"Use the gallery app to select your picture. Select the *Edit* button next to "
805-"the menu. Inside you'll find options to crop and rotate your picture."
806+"Use the gallery app to select your picture. Select the *Edit* button next to"
807+" the menu. Inside you'll find options to crop and rotate your picture."
808 msgstr ""
809
810 #. !!QA
811@@ -991,9 +989,9 @@
812 #. type: Plain text
813 #: content/pages/apps.md:62
814 msgid ""
815-"Select the Camera app from the launcher or apps scope. Select the video icon "
816-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
817-"additional options. Enjoy taking your video!"
818+"Select the Camera app from the launcher or apps scope. Select the video icon"
819+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
820+" additional options. Enjoy taking your video!"
821 msgstr ""
822
823 #. type: Title ##
824@@ -1063,3 +1061,11 @@
825 "Yes, although parts of the map may be missing and search is disabled while "
826 "offline."
827 msgstr ""
828+
829+#. type: Plain text
830+#: content/pages/apps.md:35
831+msgid "The music app supports OGG, FLAC and MP3 formats."
832+msgstr ""
833+
834+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
835+#~ msgstr ""
836
837=== modified file 'po/fr.po'
838--- po/fr.po 2015-05-22 05:13:33 +0000
839+++ po/fr.po 2015-06-04 07:56:20 +0000
840@@ -2,7 +2,7 @@
841 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
842 # This file is distributed under the same license as the ubuntu-devices-help package.
843 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
844-#
845+#
846 msgid ""
847 msgstr ""
848 "Project-Id-Version: ubuntu-devices-help\n"
849@@ -14,8 +14,8 @@
850 "MIME-Version: 1.0\n"
851 "Content-Type: text/plain; charset=UTF-8\n"
852 "Content-Transfer-Encoding: 8bit\n"
853+"X-Generator: Launchpad (build 17514)\n"
854 "X-Launchpad-Export-Date: 2015-05-22 05:13+0000\n"
855-"X-Generator: Launchpad (build 17514)\n"
856
857 #. type: Plain text
858 #: content/pages/scopes.md:2
859@@ -33,7 +33,7 @@
860 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
861 #: content/pages/apps.md:7
862 msgid "[TOC]"
863-msgstr ""
864+msgstr "[TOC]"
865
866 #. !!QA
867 #: content/pages/scopes.md:7
868@@ -45,8 +45,8 @@
869 #: content/pages/scopes.md:9
870 msgid ""
871 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
872-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
873-"them again will remove the favorite. All favorited scopes will appear on "
874+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
875+" them again will remove the favorite. All favorited scopes will appear on "
876 "your dash."
877 msgstr ""
878
879@@ -110,12 +110,12 @@
880 #. type: Plain text
881 #: content/pages/index.md:11
882 msgid "[Take me to the FAQ!]({filename}faq.md)"
883-msgstr ""
884+msgstr "[Take me to the FAQ!]({filename}faq.fr.md)"
885
886 #. type: Plain text
887 #: content/pages/index.md:12
888 msgid "[Get in touch]({filename}get-in-touch.md)"
889-msgstr ""
890+msgstr "[Get in touch]({filename}get-in-touch.fr.md)"
891
892 #. type: Plain text
893 #: content/pages/security.md:2
894@@ -186,8 +186,8 @@
895 #: content/pages/security.md:19
896 #, no-wrap
897 msgid ""
898-"Why do I have to type my PIN when using File Manager & Terminal (not default "
899-"apps)?"
900+"Why do I have to type my PIN when using File Manager & Terminal (not default"
901+" apps)?"
902 msgstr ""
903
904 #. type: Plain text
905@@ -247,6 +247,8 @@
906 "The music app let's you play music copied to the device. In addition, "
907 "[scopes]({filename}scopes.md) such as 7digital can also play music."
908 msgstr ""
909+"The music app let's you play music copied to the device. In addition, "
910+"[scopes]({filename}scopes.fr.md) such as 7digital can also play music."
911
912 #. !!QA
913 #: content/pages/basic.md:10
914@@ -257,8 +259,8 @@
915 #. type: Plain text
916 #: content/pages/basic.md:12
917 msgid ""
918-"The media player application will play videos copied to the device. You will "
919-"also find applications like youtube that give you streaming options."
920+"The media player application will play videos copied to the device. You will"
921+" also find applications like youtube that give you streaming options."
922 msgstr ""
923
924 #. !!QA
925@@ -284,8 +286,8 @@
926 #: content/pages/basic.md:18
927 msgid ""
928 "Press the Volume Up and Volume Down buttons at the same time until you see "
929-"the screen flashing. The screenshot will capture what is on your screen, and "
930-"you can see the resulting picture in the Gallery app or the Photos scope."
931+"the screen flashing. The screenshot will capture what is on your screen, and"
932+" you can see the resulting picture in the Gallery app or the Photos scope."
933 msgstr ""
934
935 #. !!QA
936@@ -297,8 +299,8 @@
937 #. type: Plain text
938 #: content/pages/basic.md:21
939 msgid ""
940-"If you've just taken a picture, you can see it easily by swiping to the left "
941-"from the right edge inside the camera app. Alternatively, use the gallery "
942+"If you've just taken a picture, you can see it easily by swiping to the left"
943+" from the right edge inside the camera app. Alternatively, use the gallery "
944 "app to find the picture."
945 msgstr ""
946
947@@ -429,8 +431,8 @@
948 #. type: Plain text
949 #: content/pages/settings.md:22
950 msgid ""
951-"You can set up some of your accounts from the scopes. Today scope allows you "
952-"to configure your Google and Fitbit account, while the Pictures scope lets "
953+"You can set up some of your accounts from the scopes. Today scope allows you"
954+" to configure your Google and Fitbit account, while the Pictures scope lets "
955 "you configure your flickr, Facebook and Instagram account. You can manage "
956 "all your accounts (including social media, email, etc) from the *System "
957 "Settings* app, under *Personal*, *Accounts*."
958@@ -475,8 +477,8 @@
959 #: content/pages/ui.md:4
960 #, no-wrap
961 msgid ""
962-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
963-"place!*\n"
964+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
965+" place!*\n"
966 msgstr ""
967
968 #. !!QA
969@@ -488,8 +490,8 @@
970 #. type: Plain text
971 #: content/pages/ui.md:9
972 msgid ""
973-"The dash contains a list of applications installed on the device, along with "
974-"presenting the scopes and store. The dash is the first thing you see when "
975+"The dash contains a list of applications installed on the device, along with"
976+" presenting the scopes and store. The dash is the first thing you see when "
977 "booting the phone. You can switch to it again at any time by swiping left "
978 "from the right screen edge."
979 msgstr ""
980@@ -519,7 +521,8 @@
981 "To pin a running app permanently to the launcher, long-press it to reveal "
982 "the context menu and choose the Pin to launcher option. You can do the same "
983 "to unpin apps. You can also move launcher icons around by long-pressing "
984-"them and dragging and dropping them to the position you'd like them to be in."
985+"them and dragging and dropping them to the position you'd like them to be "
986+"in."
987 msgstr ""
988
989 #. !!QA
990@@ -531,8 +534,8 @@
991 #. type: Plain text
992 #: content/pages/ui.md:19
993 msgid ""
994-"Indicators convey quick useful information about your device, like the time, "
995-"data connection, location, sound, and notifications. You can access the "
996+"Indicators convey quick useful information about your device, like the time,"
997+" data connection, location, sound, and notifications. You can access the "
998 "indicators at any time by swiping down from the top screen edge."
999 msgstr ""
1000
1001@@ -561,10 +564,10 @@
1002 #. type: Plain text
1003 #: content/pages/ui.md:26
1004 msgid ""
1005-"To close an application, slide your finger *slowly* left from the right edge "
1006-"of the screen. An application switcher will appear. Place your finger on the "
1007-"application preview you wish to close and swipe up or down. The application "
1008-"will disappear."
1009+"To close an application, slide your finger *slowly* left from the right edge"
1010+" of the screen. An application switcher will appear. Place your finger on "
1011+"the application preview you wish to close and swipe up or down. The "
1012+"application will disappear."
1013 msgstr ""
1014
1015 #. !!QA
1016@@ -576,8 +579,8 @@
1017 #. type: Plain text
1018 #: content/pages/ui.md:29
1019 msgid ""
1020-"For text that can be copied and pasted, press and hold the text in question. "
1021-"A menu will appear allowing you to cut, copy and paste."
1022+"For text that can be copied and pasted, press and hold the text in question."
1023+" A menu will appear allowing you to cut, copy and paste."
1024 msgstr ""
1025
1026 #. !!QA
1027@@ -663,15 +666,15 @@
1028 #: content/pages/ui.md:48
1029 #, no-wrap
1030 msgid ""
1031-"What is the round circle on the welcome screen for? What does it show? Can I "
1032-"configure it?"
1033+"What is the round circle on the welcome screen for? What does it show? Can I"
1034+" configure it?"
1035 msgstr ""
1036
1037 #. type: Plain text
1038 #: content/pages/ui.md:49
1039 msgid ""
1040-"The round circle is the infographic. It hows you recent phone activity, like "
1041-"the number of messages received or the number of songs played. You can "
1042+"The round circle is the infographic. It hows you recent phone activity, like"
1043+" the number of messages received or the number of songs played. You can "
1044 "disable it by launching the *Settings* app, navigating to *Security and "
1045 "privacy* and unticking *Stats on Welcome screen*."
1046 msgstr ""
1047@@ -717,37 +720,37 @@
1048 #: content/pages/faq.md:8
1049 #, no-wrap
1050 msgid "[First day tasks]({filename}basic.md)"
1051-msgstr ""
1052+msgstr "[First day tasks]({filename}basic.fr.md)"
1053
1054 #. type: Title ###
1055 #: content/pages/faq.md:9
1056 #, no-wrap
1057 msgid "[User Interface]({filename}ui.md)"
1058-msgstr ""
1059+msgstr "[User Interface]({filename}ui.fr.md)"
1060
1061 #. type: Title ###
1062 #: content/pages/faq.md:10
1063 #, no-wrap
1064 msgid "[Settings]({filename}settings.md)"
1065-msgstr ""
1066+msgstr "[Settings]({filename}settings.fr.md)"
1067
1068 #. type: Title ###
1069 #: content/pages/faq.md:11
1070 #, no-wrap
1071 msgid "[Apps]({filename}apps.md)"
1072-msgstr ""
1073+msgstr "[Apps]({filename}apps.fr.md)"
1074
1075 #. type: Title ###
1076 #: content/pages/faq.md:12
1077 #, no-wrap
1078 msgid "[Scopes]({filename}scopes.md)"
1079-msgstr ""
1080+msgstr "[Scopes]({filename}scopes.fr.md)"
1081
1082 #. type: Title ###
1083 #: content/pages/faq.md:13
1084 #, no-wrap
1085 msgid "[Security]({filename}security.md)"
1086-msgstr ""
1087+msgstr "[Security]({filename}security.fr.md)"
1088
1089 #. type: Plain text
1090 #: content/pages/apps.md:2
1091@@ -778,8 +781,8 @@
1092 #: content/pages/apps.md:12
1093 msgid ""
1094 "From the Apps scope, you can either tap on the “search” icon on the right "
1095-"and start searching by name, or you can go all the way down in the scope and "
1096-"tap on the Ubuntu Store icon."
1097+"and start searching by name, or you can go all the way down in the scope and"
1098+" tap on the Ubuntu Store icon."
1099 msgstr ""
1100
1101 #. !!QA
1102@@ -857,8 +860,8 @@
1103 #: content/pages/apps.md:32
1104 msgid ""
1105 "You can add music in multiple ways. If you have pre-existing music files, "
1106-"simply connect your phone to your pc via the usb cable. Next, copy the music "
1107-"you wish to listen to to the *Music* folder. Your music will appear in the "
1108+"simply connect your phone to your pc via the usb cable. Next, copy the music"
1109+" you wish to listen to to the *Music* folder. Your music will appear in the "
1110 "music app. Alternatively, you can acquire music directly using the device "
1111 "via a scope, such as 7digital or by downloading via the browser or another "
1112 "application."
1113@@ -870,11 +873,6 @@
1114 msgid "What music formats are supported?"
1115 msgstr ""
1116
1117-#. type: Plain text
1118-#: content/pages/apps.md:35
1119-msgid "The music app supports OGG, FLAG and MP3 formats."
1120-msgstr ""
1121-
1122 #. !!QA
1123 #: content/pages/apps.md:36
1124 #, no-wrap
1125@@ -903,11 +901,11 @@
1126 #. type: Plain text
1127 #: content/pages/apps.md:43
1128 msgid ""
1129-"The first time you open the Contacts app you’ll be asked if you want to sync "
1130-"contacts with your Google account. If you have answered “no” but change your "
1131-"mind later, you can do so by going to the Today scope, and setting up your "
1132-"Google account there. After that you can sync your contacts (and, if you "
1133-"want, calendar events as well)."
1134+"The first time you open the Contacts app you’ll be asked if you want to sync"
1135+" contacts with your Google account. If you have answered “no” but change "
1136+"your mind later, you can do so by going to the Today scope, and setting up "
1137+"your Google account there. After that you can sync your contacts (and, if "
1138+"you want, calendar events as well)."
1139 msgstr ""
1140
1141 #. type: Title ##
1142@@ -940,10 +938,10 @@
1143 #. type: Plain text
1144 #: content/pages/apps.md:51
1145 msgid ""
1146-"If you've just recorded a video, share it easily by swiping to the left from "
1147-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
1148-"find the video. Once loaded, select *Share* from the menu and choose how you "
1149-"wish to share your video."
1150+"If you've just recorded a video, share it easily by swiping to the left from"
1151+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
1152+" find the video. Once loaded, select *Share* from the menu and choose how "
1153+"you wish to share your video."
1154 msgstr ""
1155
1156 #. type: Title ##
1157@@ -974,8 +972,8 @@
1158 #. type: Plain text
1159 #: content/pages/apps.md:59
1160 msgid ""
1161-"Use the gallery app to select your picture. Select the *Edit* button next to "
1162-"the menu. Inside you'll find options to crop and rotate your picture."
1163+"Use the gallery app to select your picture. Select the *Edit* button next to"
1164+" the menu. Inside you'll find options to crop and rotate your picture."
1165 msgstr ""
1166
1167 #. !!QA
1168@@ -987,9 +985,9 @@
1169 #. type: Plain text
1170 #: content/pages/apps.md:62
1171 msgid ""
1172-"Select the Camera app from the launcher or apps scope. Select the video icon "
1173-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
1174-"additional options. Enjoy taking your video!"
1175+"Select the Camera app from the launcher or apps scope. Select the video icon"
1176+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
1177+" additional options. Enjoy taking your video!"
1178 msgstr ""
1179
1180 #. type: Title ##
1181@@ -1059,3 +1057,11 @@
1182 "Yes, although parts of the map may be missing and search is disabled while "
1183 "offline."
1184 msgstr ""
1185+
1186+#. type: Plain text
1187+#: content/pages/apps.md:35
1188+msgid "The music app supports OGG, FLAC and MP3 formats."
1189+msgstr ""
1190+
1191+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
1192+#~ msgstr ""
1193
1194=== modified file 'po/help.pot'
1195--- po/help.pot 2015-05-20 14:40:21 +0000
1196+++ po/help.pot 2015-06-04 07:56:20 +0000
1197@@ -7,7 +7,7 @@
1198 msgid ""
1199 msgstr ""
1200 "Project-Id-Version: PACKAGE VERSION\n"
1201-"POT-Creation-Date: 2015-05-20 16:39+0200\n"
1202+"POT-Creation-Date: 2015-06-04 09:48+0200\n"
1203 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
1204 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
1205 "Language-Team: LANGUAGE <LL@li.org>\n"
1206@@ -872,7 +872,7 @@
1207
1208 #. type: Plain text
1209 #: content/pages/apps.md:35
1210-msgid "The music app supports OGG, FLAG and MP3 formats."
1211+msgid "The music app supports OGG, FLAC and MP3 formats."
1212 msgstr ""
1213
1214 #. !!QA
1215
1216=== modified file 'po/it.po'
1217--- po/it.po 2015-05-22 05:13:33 +0000
1218+++ po/it.po 2015-06-04 07:56:20 +0000
1219@@ -2,7 +2,7 @@
1220 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1221 # This file is distributed under the same license as the ubuntu-devices-help package.
1222 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1223-#
1224+#
1225 msgid ""
1226 msgstr ""
1227 "Project-Id-Version: ubuntu-devices-help\n"
1228@@ -14,8 +14,8 @@
1229 "MIME-Version: 1.0\n"
1230 "Content-Type: text/plain; charset=UTF-8\n"
1231 "Content-Transfer-Encoding: 8bit\n"
1232+"X-Generator: Launchpad (build 17514)\n"
1233 "X-Launchpad-Export-Date: 2015-05-22 05:13+0000\n"
1234-"X-Generator: Launchpad (build 17514)\n"
1235
1236 #. type: Plain text
1237 #: content/pages/scopes.md:2
1238@@ -33,7 +33,7 @@
1239 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
1240 #: content/pages/apps.md:7
1241 msgid "[TOC]"
1242-msgstr ""
1243+msgstr "[TOC]"
1244
1245 #. !!QA
1246 #: content/pages/scopes.md:7
1247@@ -45,8 +45,8 @@
1248 #: content/pages/scopes.md:9
1249 msgid ""
1250 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
1251-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
1252-"them again will remove the favorite. All favorited scopes will appear on "
1253+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
1254+" them again will remove the favorite. All favorited scopes will appear on "
1255 "your dash."
1256 msgstr ""
1257
1258@@ -112,12 +112,12 @@
1259 #. type: Plain text
1260 #: content/pages/index.md:11
1261 msgid "[Take me to the FAQ!]({filename}faq.md)"
1262-msgstr ""
1263+msgstr "[Take me to the FAQ!]({filename}faq.it.md)"
1264
1265 #. type: Plain text
1266 #: content/pages/index.md:12
1267 msgid "[Get in touch]({filename}get-in-touch.md)"
1268-msgstr ""
1269+msgstr "[Get in touch]({filename}get-in-touch.it.md)"
1270
1271 #. type: Plain text
1272 #: content/pages/security.md:2
1273@@ -188,8 +188,8 @@
1274 #: content/pages/security.md:19
1275 #, no-wrap
1276 msgid ""
1277-"Why do I have to type my PIN when using File Manager & Terminal (not default "
1278-"apps)?"
1279+"Why do I have to type my PIN when using File Manager & Terminal (not default"
1280+" apps)?"
1281 msgstr ""
1282
1283 #. type: Plain text
1284@@ -249,6 +249,8 @@
1285 "The music app let's you play music copied to the device. In addition, "
1286 "[scopes]({filename}scopes.md) such as 7digital can also play music."
1287 msgstr ""
1288+"The music app let's you play music copied to the device. In addition, "
1289+"[scopes]({filename}scopes.it.md) such as 7digital can also play music."
1290
1291 #. !!QA
1292 #: content/pages/basic.md:10
1293@@ -259,8 +261,8 @@
1294 #. type: Plain text
1295 #: content/pages/basic.md:12
1296 msgid ""
1297-"The media player application will play videos copied to the device. You will "
1298-"also find applications like youtube that give you streaming options."
1299+"The media player application will play videos copied to the device. You will"
1300+" also find applications like youtube that give you streaming options."
1301 msgstr ""
1302
1303 #. !!QA
1304@@ -286,8 +288,8 @@
1305 #: content/pages/basic.md:18
1306 msgid ""
1307 "Press the Volume Up and Volume Down buttons at the same time until you see "
1308-"the screen flashing. The screenshot will capture what is on your screen, and "
1309-"you can see the resulting picture in the Gallery app or the Photos scope."
1310+"the screen flashing. The screenshot will capture what is on your screen, and"
1311+" you can see the resulting picture in the Gallery app or the Photos scope."
1312 msgstr ""
1313
1314 #. !!QA
1315@@ -299,8 +301,8 @@
1316 #. type: Plain text
1317 #: content/pages/basic.md:21
1318 msgid ""
1319-"If you've just taken a picture, you can see it easily by swiping to the left "
1320-"from the right edge inside the camera app. Alternatively, use the gallery "
1321+"If you've just taken a picture, you can see it easily by swiping to the left"
1322+" from the right edge inside the camera app. Alternatively, use the gallery "
1323 "app to find the picture."
1324 msgstr ""
1325
1326@@ -431,8 +433,8 @@
1327 #. type: Plain text
1328 #: content/pages/settings.md:22
1329 msgid ""
1330-"You can set up some of your accounts from the scopes. Today scope allows you "
1331-"to configure your Google and Fitbit account, while the Pictures scope lets "
1332+"You can set up some of your accounts from the scopes. Today scope allows you"
1333+" to configure your Google and Fitbit account, while the Pictures scope lets "
1334 "you configure your flickr, Facebook and Instagram account. You can manage "
1335 "all your accounts (including social media, email, etc) from the *System "
1336 "Settings* app, under *Personal*, *Accounts*."
1337@@ -477,8 +479,8 @@
1338 #: content/pages/ui.md:4
1339 #, no-wrap
1340 msgid ""
1341-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
1342-"place!*\n"
1343+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
1344+" place!*\n"
1345 msgstr ""
1346
1347 #. !!QA
1348@@ -490,8 +492,8 @@
1349 #. type: Plain text
1350 #: content/pages/ui.md:9
1351 msgid ""
1352-"The dash contains a list of applications installed on the device, along with "
1353-"presenting the scopes and store. The dash is the first thing you see when "
1354+"The dash contains a list of applications installed on the device, along with"
1355+" presenting the scopes and store. The dash is the first thing you see when "
1356 "booting the phone. You can switch to it again at any time by swiping left "
1357 "from the right screen edge."
1358 msgstr ""
1359@@ -521,7 +523,8 @@
1360 "To pin a running app permanently to the launcher, long-press it to reveal "
1361 "the context menu and choose the Pin to launcher option. You can do the same "
1362 "to unpin apps. You can also move launcher icons around by long-pressing "
1363-"them and dragging and dropping them to the position you'd like them to be in."
1364+"them and dragging and dropping them to the position you'd like them to be "
1365+"in."
1366 msgstr ""
1367
1368 #. !!QA
1369@@ -533,8 +536,8 @@
1370 #. type: Plain text
1371 #: content/pages/ui.md:19
1372 msgid ""
1373-"Indicators convey quick useful information about your device, like the time, "
1374-"data connection, location, sound, and notifications. You can access the "
1375+"Indicators convey quick useful information about your device, like the time,"
1376+" data connection, location, sound, and notifications. You can access the "
1377 "indicators at any time by swiping down from the top screen edge."
1378 msgstr ""
1379
1380@@ -563,10 +566,10 @@
1381 #. type: Plain text
1382 #: content/pages/ui.md:26
1383 msgid ""
1384-"To close an application, slide your finger *slowly* left from the right edge "
1385-"of the screen. An application switcher will appear. Place your finger on the "
1386-"application preview you wish to close and swipe up or down. The application "
1387-"will disappear."
1388+"To close an application, slide your finger *slowly* left from the right edge"
1389+" of the screen. An application switcher will appear. Place your finger on "
1390+"the application preview you wish to close and swipe up or down. The "
1391+"application will disappear."
1392 msgstr ""
1393
1394 #. !!QA
1395@@ -578,8 +581,8 @@
1396 #. type: Plain text
1397 #: content/pages/ui.md:29
1398 msgid ""
1399-"For text that can be copied and pasted, press and hold the text in question. "
1400-"A menu will appear allowing you to cut, copy and paste."
1401+"For text that can be copied and pasted, press and hold the text in question."
1402+" A menu will appear allowing you to cut, copy and paste."
1403 msgstr ""
1404
1405 #. !!QA
1406@@ -665,15 +668,15 @@
1407 #: content/pages/ui.md:48
1408 #, no-wrap
1409 msgid ""
1410-"What is the round circle on the welcome screen for? What does it show? Can I "
1411-"configure it?"
1412+"What is the round circle on the welcome screen for? What does it show? Can I"
1413+" configure it?"
1414 msgstr ""
1415
1416 #. type: Plain text
1417 #: content/pages/ui.md:49
1418 msgid ""
1419-"The round circle is the infographic. It hows you recent phone activity, like "
1420-"the number of messages received or the number of songs played. You can "
1421+"The round circle is the infographic. It hows you recent phone activity, like"
1422+" the number of messages received or the number of songs played. You can "
1423 "disable it by launching the *Settings* app, navigating to *Security and "
1424 "privacy* and unticking *Stats on Welcome screen*."
1425 msgstr ""
1426@@ -721,37 +724,37 @@
1427 #: content/pages/faq.md:8
1428 #, no-wrap
1429 msgid "[First day tasks]({filename}basic.md)"
1430-msgstr ""
1431+msgstr "[First day tasks]({filename}basic.it.md)"
1432
1433 #. type: Title ###
1434 #: content/pages/faq.md:9
1435 #, no-wrap
1436 msgid "[User Interface]({filename}ui.md)"
1437-msgstr ""
1438+msgstr "[User Interface]({filename}ui.it.md)"
1439
1440 #. type: Title ###
1441 #: content/pages/faq.md:10
1442 #, no-wrap
1443 msgid "[Settings]({filename}settings.md)"
1444-msgstr ""
1445+msgstr "[Settings]({filename}settings.it.md)"
1446
1447 #. type: Title ###
1448 #: content/pages/faq.md:11
1449 #, no-wrap
1450 msgid "[Apps]({filename}apps.md)"
1451-msgstr ""
1452+msgstr "[Apps]({filename}apps.it.md)"
1453
1454 #. type: Title ###
1455 #: content/pages/faq.md:12
1456 #, no-wrap
1457 msgid "[Scopes]({filename}scopes.md)"
1458-msgstr ""
1459+msgstr "[Scopes]({filename}scopes.it.md)"
1460
1461 #. type: Title ###
1462 #: content/pages/faq.md:13
1463 #, no-wrap
1464 msgid "[Security]({filename}security.md)"
1465-msgstr ""
1466+msgstr "[Security]({filename}security.it.md)"
1467
1468 #. type: Plain text
1469 #: content/pages/apps.md:2
1470@@ -782,8 +785,8 @@
1471 #: content/pages/apps.md:12
1472 msgid ""
1473 "From the Apps scope, you can either tap on the “search” icon on the right "
1474-"and start searching by name, or you can go all the way down in the scope and "
1475-"tap on the Ubuntu Store icon."
1476+"and start searching by name, or you can go all the way down in the scope and"
1477+" tap on the Ubuntu Store icon."
1478 msgstr ""
1479
1480 #. !!QA
1481@@ -861,8 +864,8 @@
1482 #: content/pages/apps.md:32
1483 msgid ""
1484 "You can add music in multiple ways. If you have pre-existing music files, "
1485-"simply connect your phone to your pc via the usb cable. Next, copy the music "
1486-"you wish to listen to to the *Music* folder. Your music will appear in the "
1487+"simply connect your phone to your pc via the usb cable. Next, copy the music"
1488+" you wish to listen to to the *Music* folder. Your music will appear in the "
1489 "music app. Alternatively, you can acquire music directly using the device "
1490 "via a scope, such as 7digital or by downloading via the browser or another "
1491 "application."
1492@@ -874,11 +877,6 @@
1493 msgid "What music formats are supported?"
1494 msgstr ""
1495
1496-#. type: Plain text
1497-#: content/pages/apps.md:35
1498-msgid "The music app supports OGG, FLAG and MP3 formats."
1499-msgstr ""
1500-
1501 #. !!QA
1502 #: content/pages/apps.md:36
1503 #, no-wrap
1504@@ -907,11 +905,11 @@
1505 #. type: Plain text
1506 #: content/pages/apps.md:43
1507 msgid ""
1508-"The first time you open the Contacts app you’ll be asked if you want to sync "
1509-"contacts with your Google account. If you have answered “no” but change your "
1510-"mind later, you can do so by going to the Today scope, and setting up your "
1511-"Google account there. After that you can sync your contacts (and, if you "
1512-"want, calendar events as well)."
1513+"The first time you open the Contacts app you’ll be asked if you want to sync"
1514+" contacts with your Google account. If you have answered “no” but change "
1515+"your mind later, you can do so by going to the Today scope, and setting up "
1516+"your Google account there. After that you can sync your contacts (and, if "
1517+"you want, calendar events as well)."
1518 msgstr ""
1519
1520 #. type: Title ##
1521@@ -944,10 +942,10 @@
1522 #. type: Plain text
1523 #: content/pages/apps.md:51
1524 msgid ""
1525-"If you've just recorded a video, share it easily by swiping to the left from "
1526-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
1527-"find the video. Once loaded, select *Share* from the menu and choose how you "
1528-"wish to share your video."
1529+"If you've just recorded a video, share it easily by swiping to the left from"
1530+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
1531+" find the video. Once loaded, select *Share* from the menu and choose how "
1532+"you wish to share your video."
1533 msgstr ""
1534
1535 #. type: Title ##
1536@@ -978,8 +976,8 @@
1537 #. type: Plain text
1538 #: content/pages/apps.md:59
1539 msgid ""
1540-"Use the gallery app to select your picture. Select the *Edit* button next to "
1541-"the menu. Inside you'll find options to crop and rotate your picture."
1542+"Use the gallery app to select your picture. Select the *Edit* button next to"
1543+" the menu. Inside you'll find options to crop and rotate your picture."
1544 msgstr ""
1545
1546 #. !!QA
1547@@ -991,9 +989,9 @@
1548 #. type: Plain text
1549 #: content/pages/apps.md:62
1550 msgid ""
1551-"Select the Camera app from the launcher or apps scope. Select the video icon "
1552-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
1553-"additional options. Enjoy taking your video!"
1554+"Select the Camera app from the launcher or apps scope. Select the video icon"
1555+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
1556+" additional options. Enjoy taking your video!"
1557 msgstr ""
1558
1559 #. type: Title ##
1560@@ -1063,3 +1061,11 @@
1561 "Yes, although parts of the map may be missing and search is disabled while "
1562 "offline."
1563 msgstr ""
1564+
1565+#. type: Plain text
1566+#: content/pages/apps.md:35
1567+msgid "The music app supports OGG, FLAC and MP3 formats."
1568+msgstr ""
1569+
1570+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
1571+#~ msgstr ""
1572
1573=== modified file 'po/pl.po'
1574--- po/pl.po 2015-05-22 05:13:33 +0000
1575+++ po/pl.po 2015-06-04 07:56:20 +0000
1576@@ -2,7 +2,7 @@
1577 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1578 # This file is distributed under the same license as the help-app package.
1579 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1580-#
1581+#
1582 msgid ""
1583 msgstr ""
1584 "Project-Id-Version: help-app\n"
1585@@ -14,8 +14,8 @@
1586 "MIME-Version: 1.0\n"
1587 "Content-Type: text/plain; charset=UTF-8\n"
1588 "Content-Transfer-Encoding: 8bit\n"
1589+"X-Generator: Launchpad (build 17514)\n"
1590 "X-Launchpad-Export-Date: 2015-05-22 05:13+0000\n"
1591-"X-Generator: Launchpad (build 17514)\n"
1592
1593 #. type: Plain text
1594 #: content/pages/scopes.md:2
1595@@ -33,7 +33,7 @@
1596 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
1597 #: content/pages/apps.md:7
1598 msgid "[TOC]"
1599-msgstr ""
1600+msgstr "[TOC]"
1601
1602 #. !!QA
1603 #: content/pages/scopes.md:7
1604@@ -45,8 +45,8 @@
1605 #: content/pages/scopes.md:9
1606 msgid ""
1607 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
1608-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
1609-"them again will remove the favorite. All favorited scopes will appear on "
1610+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
1611+" them again will remove the favorite. All favorited scopes will appear on "
1612 "your dash."
1613 msgstr ""
1614
1615@@ -110,12 +110,12 @@
1616 #. type: Plain text
1617 #: content/pages/index.md:11
1618 msgid "[Take me to the FAQ!]({filename}faq.md)"
1619-msgstr ""
1620+msgstr "[Take me to the FAQ!]({filename}faq.pl.md)"
1621
1622 #. type: Plain text
1623 #: content/pages/index.md:12
1624 msgid "[Get in touch]({filename}get-in-touch.md)"
1625-msgstr ""
1626+msgstr "[Get in touch]({filename}get-in-touch.pl.md)"
1627
1628 #. type: Plain text
1629 #: content/pages/security.md:2
1630@@ -186,8 +186,8 @@
1631 #: content/pages/security.md:19
1632 #, no-wrap
1633 msgid ""
1634-"Why do I have to type my PIN when using File Manager & Terminal (not default "
1635-"apps)?"
1636+"Why do I have to type my PIN when using File Manager & Terminal (not default"
1637+" apps)?"
1638 msgstr ""
1639
1640 #. type: Plain text
1641@@ -247,6 +247,8 @@
1642 "The music app let's you play music copied to the device. In addition, "
1643 "[scopes]({filename}scopes.md) such as 7digital can also play music."
1644 msgstr ""
1645+"The music app let's you play music copied to the device. In addition, "
1646+"[scopes]({filename}scopes.pl.md) such as 7digital can also play music."
1647
1648 #. !!QA
1649 #: content/pages/basic.md:10
1650@@ -257,8 +259,8 @@
1651 #. type: Plain text
1652 #: content/pages/basic.md:12
1653 msgid ""
1654-"The media player application will play videos copied to the device. You will "
1655-"also find applications like youtube that give you streaming options."
1656+"The media player application will play videos copied to the device. You will"
1657+" also find applications like youtube that give you streaming options."
1658 msgstr ""
1659
1660 #. !!QA
1661@@ -284,8 +286,8 @@
1662 #: content/pages/basic.md:18
1663 msgid ""
1664 "Press the Volume Up and Volume Down buttons at the same time until you see "
1665-"the screen flashing. The screenshot will capture what is on your screen, and "
1666-"you can see the resulting picture in the Gallery app or the Photos scope."
1667+"the screen flashing. The screenshot will capture what is on your screen, and"
1668+" you can see the resulting picture in the Gallery app or the Photos scope."
1669 msgstr ""
1670
1671 #. !!QA
1672@@ -297,8 +299,8 @@
1673 #. type: Plain text
1674 #: content/pages/basic.md:21
1675 msgid ""
1676-"If you've just taken a picture, you can see it easily by swiping to the left "
1677-"from the right edge inside the camera app. Alternatively, use the gallery "
1678+"If you've just taken a picture, you can see it easily by swiping to the left"
1679+" from the right edge inside the camera app. Alternatively, use the gallery "
1680 "app to find the picture."
1681 msgstr ""
1682
1683@@ -429,8 +431,8 @@
1684 #. type: Plain text
1685 #: content/pages/settings.md:22
1686 msgid ""
1687-"You can set up some of your accounts from the scopes. Today scope allows you "
1688-"to configure your Google and Fitbit account, while the Pictures scope lets "
1689+"You can set up some of your accounts from the scopes. Today scope allows you"
1690+" to configure your Google and Fitbit account, while the Pictures scope lets "
1691 "you configure your flickr, Facebook and Instagram account. You can manage "
1692 "all your accounts (including social media, email, etc) from the *System "
1693 "Settings* app, under *Personal*, *Accounts*."
1694@@ -475,8 +477,8 @@
1695 #: content/pages/ui.md:4
1696 #, no-wrap
1697 msgid ""
1698-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
1699-"place!*\n"
1700+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
1701+" place!*\n"
1702 msgstr ""
1703
1704 #. !!QA
1705@@ -488,8 +490,8 @@
1706 #. type: Plain text
1707 #: content/pages/ui.md:9
1708 msgid ""
1709-"The dash contains a list of applications installed on the device, along with "
1710-"presenting the scopes and store. The dash is the first thing you see when "
1711+"The dash contains a list of applications installed on the device, along with"
1712+" presenting the scopes and store. The dash is the first thing you see when "
1713 "booting the phone. You can switch to it again at any time by swiping left "
1714 "from the right screen edge."
1715 msgstr ""
1716@@ -519,7 +521,8 @@
1717 "To pin a running app permanently to the launcher, long-press it to reveal "
1718 "the context menu and choose the Pin to launcher option. You can do the same "
1719 "to unpin apps. You can also move launcher icons around by long-pressing "
1720-"them and dragging and dropping them to the position you'd like them to be in."
1721+"them and dragging and dropping them to the position you'd like them to be "
1722+"in."
1723 msgstr ""
1724
1725 #. !!QA
1726@@ -531,8 +534,8 @@
1727 #. type: Plain text
1728 #: content/pages/ui.md:19
1729 msgid ""
1730-"Indicators convey quick useful information about your device, like the time, "
1731-"data connection, location, sound, and notifications. You can access the "
1732+"Indicators convey quick useful information about your device, like the time,"
1733+" data connection, location, sound, and notifications. You can access the "
1734 "indicators at any time by swiping down from the top screen edge."
1735 msgstr ""
1736
1737@@ -561,10 +564,10 @@
1738 #. type: Plain text
1739 #: content/pages/ui.md:26
1740 msgid ""
1741-"To close an application, slide your finger *slowly* left from the right edge "
1742-"of the screen. An application switcher will appear. Place your finger on the "
1743-"application preview you wish to close and swipe up or down. The application "
1744-"will disappear."
1745+"To close an application, slide your finger *slowly* left from the right edge"
1746+" of the screen. An application switcher will appear. Place your finger on "
1747+"the application preview you wish to close and swipe up or down. The "
1748+"application will disappear."
1749 msgstr ""
1750
1751 #. !!QA
1752@@ -576,8 +579,8 @@
1753 #. type: Plain text
1754 #: content/pages/ui.md:29
1755 msgid ""
1756-"For text that can be copied and pasted, press and hold the text in question. "
1757-"A menu will appear allowing you to cut, copy and paste."
1758+"For text that can be copied and pasted, press and hold the text in question."
1759+" A menu will appear allowing you to cut, copy and paste."
1760 msgstr ""
1761
1762 #. !!QA
1763@@ -663,15 +666,15 @@
1764 #: content/pages/ui.md:48
1765 #, no-wrap
1766 msgid ""
1767-"What is the round circle on the welcome screen for? What does it show? Can I "
1768-"configure it?"
1769+"What is the round circle on the welcome screen for? What does it show? Can I"
1770+" configure it?"
1771 msgstr ""
1772
1773 #. type: Plain text
1774 #: content/pages/ui.md:49
1775 msgid ""
1776-"The round circle is the infographic. It hows you recent phone activity, like "
1777-"the number of messages received or the number of songs played. You can "
1778+"The round circle is the infographic. It hows you recent phone activity, like"
1779+" the number of messages received or the number of songs played. You can "
1780 "disable it by launching the *Settings* app, navigating to *Security and "
1781 "privacy* and unticking *Stats on Welcome screen*."
1782 msgstr ""
1783@@ -717,37 +720,37 @@
1784 #: content/pages/faq.md:8
1785 #, no-wrap
1786 msgid "[First day tasks]({filename}basic.md)"
1787-msgstr ""
1788+msgstr "[First day tasks]({filename}basic.pl.md)"
1789
1790 #. type: Title ###
1791 #: content/pages/faq.md:9
1792 #, no-wrap
1793 msgid "[User Interface]({filename}ui.md)"
1794-msgstr ""
1795+msgstr "[User Interface]({filename}ui.pl.md)"
1796
1797 #. type: Title ###
1798 #: content/pages/faq.md:10
1799 #, no-wrap
1800 msgid "[Settings]({filename}settings.md)"
1801-msgstr ""
1802+msgstr "[Settings]({filename}settings.pl.md)"
1803
1804 #. type: Title ###
1805 #: content/pages/faq.md:11
1806 #, no-wrap
1807 msgid "[Apps]({filename}apps.md)"
1808-msgstr ""
1809+msgstr "[Apps]({filename}apps.pl.md)"
1810
1811 #. type: Title ###
1812 #: content/pages/faq.md:12
1813 #, no-wrap
1814 msgid "[Scopes]({filename}scopes.md)"
1815-msgstr ""
1816+msgstr "[Scopes]({filename}scopes.pl.md)"
1817
1818 #. type: Title ###
1819 #: content/pages/faq.md:13
1820 #, no-wrap
1821 msgid "[Security]({filename}security.md)"
1822-msgstr ""
1823+msgstr "[Security]({filename}security.pl.md)"
1824
1825 #. type: Plain text
1826 #: content/pages/apps.md:2
1827@@ -778,8 +781,8 @@
1828 #: content/pages/apps.md:12
1829 msgid ""
1830 "From the Apps scope, you can either tap on the “search” icon on the right "
1831-"and start searching by name, or you can go all the way down in the scope and "
1832-"tap on the Ubuntu Store icon."
1833+"and start searching by name, or you can go all the way down in the scope and"
1834+" tap on the Ubuntu Store icon."
1835 msgstr ""
1836
1837 #. !!QA
1838@@ -857,8 +860,8 @@
1839 #: content/pages/apps.md:32
1840 msgid ""
1841 "You can add music in multiple ways. If you have pre-existing music files, "
1842-"simply connect your phone to your pc via the usb cable. Next, copy the music "
1843-"you wish to listen to to the *Music* folder. Your music will appear in the "
1844+"simply connect your phone to your pc via the usb cable. Next, copy the music"
1845+" you wish to listen to to the *Music* folder. Your music will appear in the "
1846 "music app. Alternatively, you can acquire music directly using the device "
1847 "via a scope, such as 7digital or by downloading via the browser or another "
1848 "application."
1849@@ -870,11 +873,6 @@
1850 msgid "What music formats are supported?"
1851 msgstr ""
1852
1853-#. type: Plain text
1854-#: content/pages/apps.md:35
1855-msgid "The music app supports OGG, FLAG and MP3 formats."
1856-msgstr ""
1857-
1858 #. !!QA
1859 #: content/pages/apps.md:36
1860 #, no-wrap
1861@@ -903,11 +901,11 @@
1862 #. type: Plain text
1863 #: content/pages/apps.md:43
1864 msgid ""
1865-"The first time you open the Contacts app you’ll be asked if you want to sync "
1866-"contacts with your Google account. If you have answered “no” but change your "
1867-"mind later, you can do so by going to the Today scope, and setting up your "
1868-"Google account there. After that you can sync your contacts (and, if you "
1869-"want, calendar events as well)."
1870+"The first time you open the Contacts app you’ll be asked if you want to sync"
1871+" contacts with your Google account. If you have answered “no” but change "
1872+"your mind later, you can do so by going to the Today scope, and setting up "
1873+"your Google account there. After that you can sync your contacts (and, if "
1874+"you want, calendar events as well)."
1875 msgstr ""
1876
1877 #. type: Title ##
1878@@ -940,10 +938,10 @@
1879 #. type: Plain text
1880 #: content/pages/apps.md:51
1881 msgid ""
1882-"If you've just recorded a video, share it easily by swiping to the left from "
1883-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
1884-"find the video. Once loaded, select *Share* from the menu and choose how you "
1885-"wish to share your video."
1886+"If you've just recorded a video, share it easily by swiping to the left from"
1887+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
1888+" find the video. Once loaded, select *Share* from the menu and choose how "
1889+"you wish to share your video."
1890 msgstr ""
1891
1892 #. type: Title ##
1893@@ -974,8 +972,8 @@
1894 #. type: Plain text
1895 #: content/pages/apps.md:59
1896 msgid ""
1897-"Use the gallery app to select your picture. Select the *Edit* button next to "
1898-"the menu. Inside you'll find options to crop and rotate your picture."
1899+"Use the gallery app to select your picture. Select the *Edit* button next to"
1900+" the menu. Inside you'll find options to crop and rotate your picture."
1901 msgstr ""
1902
1903 #. !!QA
1904@@ -987,9 +985,9 @@
1905 #. type: Plain text
1906 #: content/pages/apps.md:62
1907 msgid ""
1908-"Select the Camera app from the launcher or apps scope. Select the video icon "
1909-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
1910-"additional options. Enjoy taking your video!"
1911+"Select the Camera app from the launcher or apps scope. Select the video icon"
1912+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
1913+" additional options. Enjoy taking your video!"
1914 msgstr ""
1915
1916 #. type: Title ##
1917@@ -1059,3 +1057,11 @@
1918 "Yes, although parts of the map may be missing and search is disabled while "
1919 "offline."
1920 msgstr ""
1921+
1922+#. type: Plain text
1923+#: content/pages/apps.md:35
1924+msgid "The music app supports OGG, FLAC and MP3 formats."
1925+msgstr ""
1926+
1927+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
1928+#~ msgstr ""
1929
1930=== modified file 'po/pt.po'
1931--- po/pt.po 2015-05-22 05:13:33 +0000
1932+++ po/pt.po 2015-06-04 07:56:20 +0000
1933@@ -2,7 +2,7 @@
1934 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
1935 # This file is distributed under the same license as the ubuntu-devices-help package.
1936 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
1937-#
1938+#
1939 msgid ""
1940 msgstr ""
1941 "Project-Id-Version: ubuntu-devices-help\n"
1942@@ -14,8 +14,8 @@
1943 "MIME-Version: 1.0\n"
1944 "Content-Type: text/plain; charset=UTF-8\n"
1945 "Content-Transfer-Encoding: 8bit\n"
1946+"X-Generator: Launchpad (build 17514)\n"
1947 "X-Launchpad-Export-Date: 2015-05-22 05:13+0000\n"
1948-"X-Generator: Launchpad (build 17514)\n"
1949
1950 #. type: Plain text
1951 #: content/pages/scopes.md:2
1952@@ -33,7 +33,7 @@
1953 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
1954 #: content/pages/apps.md:7
1955 msgid "[TOC]"
1956-msgstr ""
1957+msgstr "[TOC]"
1958
1959 #. !!QA
1960 #: content/pages/scopes.md:7
1961@@ -45,8 +45,8 @@
1962 #: content/pages/scopes.md:9
1963 msgid ""
1964 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
1965-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
1966-"them again will remove the favorite. All favorited scopes will appear on "
1967+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
1968+" them again will remove the favorite. All favorited scopes will appear on "
1969 "your dash."
1970 msgstr ""
1971
1972@@ -112,12 +112,12 @@
1973 #. type: Plain text
1974 #: content/pages/index.md:11
1975 msgid "[Take me to the FAQ!]({filename}faq.md)"
1976-msgstr ""
1977+msgstr "[Take me to the FAQ!]({filename}faq.pt.md)"
1978
1979 #. type: Plain text
1980 #: content/pages/index.md:12
1981 msgid "[Get in touch]({filename}get-in-touch.md)"
1982-msgstr ""
1983+msgstr "[Get in touch]({filename}get-in-touch.pt.md)"
1984
1985 #. type: Plain text
1986 #: content/pages/security.md:2
1987@@ -188,8 +188,8 @@
1988 #: content/pages/security.md:19
1989 #, no-wrap
1990 msgid ""
1991-"Why do I have to type my PIN when using File Manager & Terminal (not default "
1992-"apps)?"
1993+"Why do I have to type my PIN when using File Manager & Terminal (not default"
1994+" apps)?"
1995 msgstr ""
1996
1997 #. type: Plain text
1998@@ -235,8 +235,7 @@
1999 #: content/pages/basic.md:4
2000 #, no-wrap
2001 msgid "*If you are wondering how to perform basic tasks, look here.*\n"
2002-msgstr ""
2003-"*Se está à procura de como fazer as tarefas básicas, procure aqui.*\n"
2004+msgstr "*Se está à procura de como fazer as tarefas básicas, procure aqui.*\n"
2005
2006 #. !!QA
2007 #: content/pages/basic.md:7
2008@@ -250,6 +249,8 @@
2009 "The music app let's you play music copied to the device. In addition, "
2010 "[scopes]({filename}scopes.md) such as 7digital can also play music."
2011 msgstr ""
2012+"The music app let's you play music copied to the device. In addition, "
2013+"[scopes]({filename}scopes.pt.md) such as 7digital can also play music."
2014
2015 #. !!QA
2016 #: content/pages/basic.md:10
2017@@ -260,8 +261,8 @@
2018 #. type: Plain text
2019 #: content/pages/basic.md:12
2020 msgid ""
2021-"The media player application will play videos copied to the device. You will "
2022-"also find applications like youtube that give you streaming options."
2023+"The media player application will play videos copied to the device. You will"
2024+" also find applications like youtube that give you streaming options."
2025 msgstr ""
2026
2027 #. !!QA
2028@@ -287,8 +288,8 @@
2029 #: content/pages/basic.md:18
2030 msgid ""
2031 "Press the Volume Up and Volume Down buttons at the same time until you see "
2032-"the screen flashing. The screenshot will capture what is on your screen, and "
2033-"you can see the resulting picture in the Gallery app or the Photos scope."
2034+"the screen flashing. The screenshot will capture what is on your screen, and"
2035+" you can see the resulting picture in the Gallery app or the Photos scope."
2036 msgstr ""
2037
2038 #. !!QA
2039@@ -300,8 +301,8 @@
2040 #. type: Plain text
2041 #: content/pages/basic.md:21
2042 msgid ""
2043-"If you've just taken a picture, you can see it easily by swiping to the left "
2044-"from the right edge inside the camera app. Alternatively, use the gallery "
2045+"If you've just taken a picture, you can see it easily by swiping to the left"
2046+" from the right edge inside the camera app. Alternatively, use the gallery "
2047 "app to find the picture."
2048 msgstr ""
2049
2050@@ -432,8 +433,8 @@
2051 #. type: Plain text
2052 #: content/pages/settings.md:22
2053 msgid ""
2054-"You can set up some of your accounts from the scopes. Today scope allows you "
2055-"to configure your Google and Fitbit account, while the Pictures scope lets "
2056+"You can set up some of your accounts from the scopes. Today scope allows you"
2057+" to configure your Google and Fitbit account, while the Pictures scope lets "
2058 "you configure your flickr, Facebook and Instagram account. You can manage "
2059 "all your accounts (including social media, email, etc) from the *System "
2060 "Settings* app, under *Personal*, *Accounts*."
2061@@ -478,8 +479,8 @@
2062 #: content/pages/ui.md:4
2063 #, no-wrap
2064 msgid ""
2065-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
2066-"place!*\n"
2067+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
2068+" place!*\n"
2069 msgstr ""
2070
2071 #. !!QA
2072@@ -491,8 +492,8 @@
2073 #. type: Plain text
2074 #: content/pages/ui.md:9
2075 msgid ""
2076-"The dash contains a list of applications installed on the device, along with "
2077-"presenting the scopes and store. The dash is the first thing you see when "
2078+"The dash contains a list of applications installed on the device, along with"
2079+" presenting the scopes and store. The dash is the first thing you see when "
2080 "booting the phone. You can switch to it again at any time by swiping left "
2081 "from the right screen edge."
2082 msgstr ""
2083@@ -522,7 +523,8 @@
2084 "To pin a running app permanently to the launcher, long-press it to reveal "
2085 "the context menu and choose the Pin to launcher option. You can do the same "
2086 "to unpin apps. You can also move launcher icons around by long-pressing "
2087-"them and dragging and dropping them to the position you'd like them to be in."
2088+"them and dragging and dropping them to the position you'd like them to be "
2089+"in."
2090 msgstr ""
2091
2092 #. !!QA
2093@@ -534,8 +536,8 @@
2094 #. type: Plain text
2095 #: content/pages/ui.md:19
2096 msgid ""
2097-"Indicators convey quick useful information about your device, like the time, "
2098-"data connection, location, sound, and notifications. You can access the "
2099+"Indicators convey quick useful information about your device, like the time,"
2100+" data connection, location, sound, and notifications. You can access the "
2101 "indicators at any time by swiping down from the top screen edge."
2102 msgstr ""
2103
2104@@ -564,10 +566,10 @@
2105 #. type: Plain text
2106 #: content/pages/ui.md:26
2107 msgid ""
2108-"To close an application, slide your finger *slowly* left from the right edge "
2109-"of the screen. An application switcher will appear. Place your finger on the "
2110-"application preview you wish to close and swipe up or down. The application "
2111-"will disappear."
2112+"To close an application, slide your finger *slowly* left from the right edge"
2113+" of the screen. An application switcher will appear. Place your finger on "
2114+"the application preview you wish to close and swipe up or down. The "
2115+"application will disappear."
2116 msgstr ""
2117
2118 #. !!QA
2119@@ -579,8 +581,8 @@
2120 #. type: Plain text
2121 #: content/pages/ui.md:29
2122 msgid ""
2123-"For text that can be copied and pasted, press and hold the text in question. "
2124-"A menu will appear allowing you to cut, copy and paste."
2125+"For text that can be copied and pasted, press and hold the text in question."
2126+" A menu will appear allowing you to cut, copy and paste."
2127 msgstr ""
2128
2129 #. !!QA
2130@@ -666,15 +668,15 @@
2131 #: content/pages/ui.md:48
2132 #, no-wrap
2133 msgid ""
2134-"What is the round circle on the welcome screen for? What does it show? Can I "
2135-"configure it?"
2136+"What is the round circle on the welcome screen for? What does it show? Can I"
2137+" configure it?"
2138 msgstr ""
2139
2140 #. type: Plain text
2141 #: content/pages/ui.md:49
2142 msgid ""
2143-"The round circle is the infographic. It hows you recent phone activity, like "
2144-"the number of messages received or the number of songs played. You can "
2145+"The round circle is the infographic. It hows you recent phone activity, like"
2146+" the number of messages received or the number of songs played. You can "
2147 "disable it by launching the *Settings* app, navigating to *Security and "
2148 "privacy* and unticking *Stats on Welcome screen*."
2149 msgstr ""
2150@@ -694,8 +696,7 @@
2151 "collaboratively-edited question and answer site for Ubuntu users and \n"
2152 "developers. 100% free, no registration required. \n"
2153 msgstr ""
2154-"O Ubuntu tem uma grande comunidade . Pode facilmente entrar em contacto com "
2155-"peritos e\n"
2156+"O Ubuntu tem uma grande comunidade . Pode facilmente entrar em contacto com peritos e\n"
2157 "outros entusiastas. Um bom modo de o fazer, particularmente se**tiver \n"
2158 "questões**, é através [AskUbuntu](http://www.askubuntu.com). É uma \n"
2159 " página de perguntas e respostas colaborativa para utilizadores Ubuntu e \n"
2160@@ -732,37 +733,37 @@
2161 #: content/pages/faq.md:8
2162 #, no-wrap
2163 msgid "[First day tasks]({filename}basic.md)"
2164-msgstr ""
2165+msgstr "[First day tasks]({filename}basic.pt.md)"
2166
2167 #. type: Title ###
2168 #: content/pages/faq.md:9
2169 #, no-wrap
2170 msgid "[User Interface]({filename}ui.md)"
2171-msgstr "[User Interface]({filename}ui.md)"
2172+msgstr "[User Interface]({filename}ui.pt.md)"
2173
2174 #. type: Title ###
2175 #: content/pages/faq.md:10
2176 #, no-wrap
2177 msgid "[Settings]({filename}settings.md)"
2178-msgstr "[Settings]({filename}settings.md)"
2179+msgstr "[Settings]({filename}settings.pt.md)"
2180
2181 #. type: Title ###
2182 #: content/pages/faq.md:11
2183 #, no-wrap
2184 msgid "[Apps]({filename}apps.md)"
2185-msgstr "[Apps]({filename}apps.md)"
2186+msgstr "[Apps]({filename}apps.pt.md)"
2187
2188 #. type: Title ###
2189 #: content/pages/faq.md:12
2190 #, no-wrap
2191 msgid "[Scopes]({filename}scopes.md)"
2192-msgstr "[Scopes]({filename}scopes.md)"
2193+msgstr "[Scopes]({filename}scopes.pt.md)"
2194
2195 #. type: Title ###
2196 #: content/pages/faq.md:13
2197 #, no-wrap
2198 msgid "[Security]({filename}security.md)"
2199-msgstr "[Security]({filename}security.md)"
2200+msgstr "[Security]({filename}security.pt.md)"
2201
2202 #. type: Plain text
2203 #: content/pages/apps.md:2
2204@@ -776,8 +777,7 @@
2205 "*Are you looking for a good way to do X and can't find it in the app\n"
2206 "store? Want some suggestions to solve a particular problem?*\n"
2207 msgstr ""
2208-"*Está à procura de uma maneira para fazer bem X e não consegue encontrar na "
2209-"loja de\n"
2210+"*Está à procura de uma maneira para fazer bem X e não consegue encontrar na loja de\n"
2211 "aplicações? Quer alguma sugestão de como resolver um problema particular?*\n"
2212
2213 #. type: Title ##
2214@@ -796,8 +796,8 @@
2215 #: content/pages/apps.md:12
2216 msgid ""
2217 "From the Apps scope, you can either tap on the “search” icon on the right "
2218-"and start searching by name, or you can go all the way down in the scope and "
2219-"tap on the Ubuntu Store icon."
2220+"and start searching by name, or you can go all the way down in the scope and"
2221+" tap on the Ubuntu Store icon."
2222 msgstr ""
2223
2224 #. !!QA
2225@@ -875,8 +875,8 @@
2226 #: content/pages/apps.md:32
2227 msgid ""
2228 "You can add music in multiple ways. If you have pre-existing music files, "
2229-"simply connect your phone to your pc via the usb cable. Next, copy the music "
2230-"you wish to listen to to the *Music* folder. Your music will appear in the "
2231+"simply connect your phone to your pc via the usb cable. Next, copy the music"
2232+" you wish to listen to to the *Music* folder. Your music will appear in the "
2233 "music app. Alternatively, you can acquire music directly using the device "
2234 "via a scope, such as 7digital or by downloading via the browser or another "
2235 "application."
2236@@ -888,11 +888,6 @@
2237 msgid "What music formats are supported?"
2238 msgstr ""
2239
2240-#. type: Plain text
2241-#: content/pages/apps.md:35
2242-msgid "The music app supports OGG, FLAG and MP3 formats."
2243-msgstr ""
2244-
2245 #. !!QA
2246 #: content/pages/apps.md:36
2247 #, no-wrap
2248@@ -921,11 +916,11 @@
2249 #. type: Plain text
2250 #: content/pages/apps.md:43
2251 msgid ""
2252-"The first time you open the Contacts app you’ll be asked if you want to sync "
2253-"contacts with your Google account. If you have answered “no” but change your "
2254-"mind later, you can do so by going to the Today scope, and setting up your "
2255-"Google account there. After that you can sync your contacts (and, if you "
2256-"want, calendar events as well)."
2257+"The first time you open the Contacts app you’ll be asked if you want to sync"
2258+" contacts with your Google account. If you have answered “no” but change "
2259+"your mind later, you can do so by going to the Today scope, and setting up "
2260+"your Google account there. After that you can sync your contacts (and, if "
2261+"you want, calendar events as well)."
2262 msgstr ""
2263
2264 #. type: Title ##
2265@@ -958,10 +953,10 @@
2266 #. type: Plain text
2267 #: content/pages/apps.md:51
2268 msgid ""
2269-"If you've just recorded a video, share it easily by swiping to the left from "
2270-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
2271-"find the video. Once loaded, select *Share* from the menu and choose how you "
2272-"wish to share your video."
2273+"If you've just recorded a video, share it easily by swiping to the left from"
2274+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
2275+" find the video. Once loaded, select *Share* from the menu and choose how "
2276+"you wish to share your video."
2277 msgstr ""
2278
2279 #. type: Title ##
2280@@ -992,8 +987,8 @@
2281 #. type: Plain text
2282 #: content/pages/apps.md:59
2283 msgid ""
2284-"Use the gallery app to select your picture. Select the *Edit* button next to "
2285-"the menu. Inside you'll find options to crop and rotate your picture."
2286+"Use the gallery app to select your picture. Select the *Edit* button next to"
2287+" the menu. Inside you'll find options to crop and rotate your picture."
2288 msgstr ""
2289
2290 #. !!QA
2291@@ -1005,9 +1000,9 @@
2292 #. type: Plain text
2293 #: content/pages/apps.md:62
2294 msgid ""
2295-"Select the Camera app from the launcher or apps scope. Select the video icon "
2296-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
2297-"additional options. Enjoy taking your video!"
2298+"Select the Camera app from the launcher or apps scope. Select the video icon"
2299+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
2300+" additional options. Enjoy taking your video!"
2301 msgstr ""
2302
2303 #. type: Title ##
2304@@ -1077,3 +1072,11 @@
2305 "Yes, although parts of the map may be missing and search is disabled while "
2306 "offline."
2307 msgstr ""
2308+
2309+#. type: Plain text
2310+#: content/pages/apps.md:35
2311+msgid "The music app supports OGG, FLAC and MP3 formats."
2312+msgstr ""
2313+
2314+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
2315+#~ msgstr ""
2316
2317=== modified file 'po/ro.po'
2318--- po/ro.po 2015-05-22 05:13:33 +0000
2319+++ po/ro.po 2015-06-04 07:56:20 +0000
2320@@ -2,7 +2,7 @@
2321 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
2322 # This file is distributed under the same license as the ubuntu-devices-help package.
2323 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
2324-#
2325+#
2326 msgid ""
2327 msgstr ""
2328 "Project-Id-Version: ubuntu-devices-help\n"
2329@@ -14,8 +14,8 @@
2330 "MIME-Version: 1.0\n"
2331 "Content-Type: text/plain; charset=UTF-8\n"
2332 "Content-Transfer-Encoding: 8bit\n"
2333+"X-Generator: Launchpad (build 17514)\n"
2334 "X-Launchpad-Export-Date: 2015-05-22 05:13+0000\n"
2335-"X-Generator: Launchpad (build 17514)\n"
2336
2337 #. type: Plain text
2338 #: content/pages/scopes.md:2
2339@@ -33,7 +33,7 @@
2340 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
2341 #: content/pages/apps.md:7
2342 msgid "[TOC]"
2343-msgstr ""
2344+msgstr "[TOC]"
2345
2346 #. !!QA
2347 #: content/pages/scopes.md:7
2348@@ -45,8 +45,8 @@
2349 #: content/pages/scopes.md:9
2350 msgid ""
2351 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
2352-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
2353-"them again will remove the favorite. All favorited scopes will appear on "
2354+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
2355+" them again will remove the favorite. All favorited scopes will appear on "
2356 "your dash."
2357 msgstr ""
2358
2359@@ -110,12 +110,12 @@
2360 #. type: Plain text
2361 #: content/pages/index.md:11
2362 msgid "[Take me to the FAQ!]({filename}faq.md)"
2363-msgstr ""
2364+msgstr "[Take me to the FAQ!]({filename}faq.ro.md)"
2365
2366 #. type: Plain text
2367 #: content/pages/index.md:12
2368 msgid "[Get in touch]({filename}get-in-touch.md)"
2369-msgstr ""
2370+msgstr "[Get in touch]({filename}get-in-touch.ro.md)"
2371
2372 #. type: Plain text
2373 #: content/pages/security.md:2
2374@@ -186,8 +186,8 @@
2375 #: content/pages/security.md:19
2376 #, no-wrap
2377 msgid ""
2378-"Why do I have to type my PIN when using File Manager & Terminal (not default "
2379-"apps)?"
2380+"Why do I have to type my PIN when using File Manager & Terminal (not default"
2381+" apps)?"
2382 msgstr ""
2383
2384 #. type: Plain text
2385@@ -247,6 +247,8 @@
2386 "The music app let's you play music copied to the device. In addition, "
2387 "[scopes]({filename}scopes.md) such as 7digital can also play music."
2388 msgstr ""
2389+"The music app let's you play music copied to the device. In addition, "
2390+"[scopes]({filename}scopes.ro.md) such as 7digital can also play music."
2391
2392 #. !!QA
2393 #: content/pages/basic.md:10
2394@@ -257,8 +259,8 @@
2395 #. type: Plain text
2396 #: content/pages/basic.md:12
2397 msgid ""
2398-"The media player application will play videos copied to the device. You will "
2399-"also find applications like youtube that give you streaming options."
2400+"The media player application will play videos copied to the device. You will"
2401+" also find applications like youtube that give you streaming options."
2402 msgstr ""
2403
2404 #. !!QA
2405@@ -284,8 +286,8 @@
2406 #: content/pages/basic.md:18
2407 msgid ""
2408 "Press the Volume Up and Volume Down buttons at the same time until you see "
2409-"the screen flashing. The screenshot will capture what is on your screen, and "
2410-"you can see the resulting picture in the Gallery app or the Photos scope."
2411+"the screen flashing. The screenshot will capture what is on your screen, and"
2412+" you can see the resulting picture in the Gallery app or the Photos scope."
2413 msgstr ""
2414
2415 #. !!QA
2416@@ -297,8 +299,8 @@
2417 #. type: Plain text
2418 #: content/pages/basic.md:21
2419 msgid ""
2420-"If you've just taken a picture, you can see it easily by swiping to the left "
2421-"from the right edge inside the camera app. Alternatively, use the gallery "
2422+"If you've just taken a picture, you can see it easily by swiping to the left"
2423+" from the right edge inside the camera app. Alternatively, use the gallery "
2424 "app to find the picture."
2425 msgstr ""
2426
2427@@ -429,8 +431,8 @@
2428 #. type: Plain text
2429 #: content/pages/settings.md:22
2430 msgid ""
2431-"You can set up some of your accounts from the scopes. Today scope allows you "
2432-"to configure your Google and Fitbit account, while the Pictures scope lets "
2433+"You can set up some of your accounts from the scopes. Today scope allows you"
2434+" to configure your Google and Fitbit account, while the Pictures scope lets "
2435 "you configure your flickr, Facebook and Instagram account. You can manage "
2436 "all your accounts (including social media, email, etc) from the *System "
2437 "Settings* app, under *Personal*, *Accounts*."
2438@@ -475,8 +477,8 @@
2439 #: content/pages/ui.md:4
2440 #, no-wrap
2441 msgid ""
2442-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
2443-"place!*\n"
2444+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
2445+" place!*\n"
2446 msgstr ""
2447
2448 #. !!QA
2449@@ -488,8 +490,8 @@
2450 #. type: Plain text
2451 #: content/pages/ui.md:9
2452 msgid ""
2453-"The dash contains a list of applications installed on the device, along with "
2454-"presenting the scopes and store. The dash is the first thing you see when "
2455+"The dash contains a list of applications installed on the device, along with"
2456+" presenting the scopes and store. The dash is the first thing you see when "
2457 "booting the phone. You can switch to it again at any time by swiping left "
2458 "from the right screen edge."
2459 msgstr ""
2460@@ -519,7 +521,8 @@
2461 "To pin a running app permanently to the launcher, long-press it to reveal "
2462 "the context menu and choose the Pin to launcher option. You can do the same "
2463 "to unpin apps. You can also move launcher icons around by long-pressing "
2464-"them and dragging and dropping them to the position you'd like them to be in."
2465+"them and dragging and dropping them to the position you'd like them to be "
2466+"in."
2467 msgstr ""
2468
2469 #. !!QA
2470@@ -531,8 +534,8 @@
2471 #. type: Plain text
2472 #: content/pages/ui.md:19
2473 msgid ""
2474-"Indicators convey quick useful information about your device, like the time, "
2475-"data connection, location, sound, and notifications. You can access the "
2476+"Indicators convey quick useful information about your device, like the time,"
2477+" data connection, location, sound, and notifications. You can access the "
2478 "indicators at any time by swiping down from the top screen edge."
2479 msgstr ""
2480
2481@@ -561,10 +564,10 @@
2482 #. type: Plain text
2483 #: content/pages/ui.md:26
2484 msgid ""
2485-"To close an application, slide your finger *slowly* left from the right edge "
2486-"of the screen. An application switcher will appear. Place your finger on the "
2487-"application preview you wish to close and swipe up or down. The application "
2488-"will disappear."
2489+"To close an application, slide your finger *slowly* left from the right edge"
2490+" of the screen. An application switcher will appear. Place your finger on "
2491+"the application preview you wish to close and swipe up or down. The "
2492+"application will disappear."
2493 msgstr ""
2494
2495 #. !!QA
2496@@ -576,8 +579,8 @@
2497 #. type: Plain text
2498 #: content/pages/ui.md:29
2499 msgid ""
2500-"For text that can be copied and pasted, press and hold the text in question. "
2501-"A menu will appear allowing you to cut, copy and paste."
2502+"For text that can be copied and pasted, press and hold the text in question."
2503+" A menu will appear allowing you to cut, copy and paste."
2504 msgstr ""
2505
2506 #. !!QA
2507@@ -663,15 +666,15 @@
2508 #: content/pages/ui.md:48
2509 #, no-wrap
2510 msgid ""
2511-"What is the round circle on the welcome screen for? What does it show? Can I "
2512-"configure it?"
2513+"What is the round circle on the welcome screen for? What does it show? Can I"
2514+" configure it?"
2515 msgstr ""
2516
2517 #. type: Plain text
2518 #: content/pages/ui.md:49
2519 msgid ""
2520-"The round circle is the infographic. It hows you recent phone activity, like "
2521-"the number of messages received or the number of songs played. You can "
2522+"The round circle is the infographic. It hows you recent phone activity, like"
2523+" the number of messages received or the number of songs played. You can "
2524 "disable it by launching the *Settings* app, navigating to *Security and "
2525 "privacy* and unticking *Stats on Welcome screen*."
2526 msgstr ""
2527@@ -717,37 +720,37 @@
2528 #: content/pages/faq.md:8
2529 #, no-wrap
2530 msgid "[First day tasks]({filename}basic.md)"
2531-msgstr ""
2532+msgstr "[First day tasks]({filename}basic.ro.md)"
2533
2534 #. type: Title ###
2535 #: content/pages/faq.md:9
2536 #, no-wrap
2537 msgid "[User Interface]({filename}ui.md)"
2538-msgstr ""
2539+msgstr "[User Interface]({filename}ui.ro.md)"
2540
2541 #. type: Title ###
2542 #: content/pages/faq.md:10
2543 #, no-wrap
2544 msgid "[Settings]({filename}settings.md)"
2545-msgstr ""
2546+msgstr "[Settings]({filename}settings.ro.md)"
2547
2548 #. type: Title ###
2549 #: content/pages/faq.md:11
2550 #, no-wrap
2551 msgid "[Apps]({filename}apps.md)"
2552-msgstr ""
2553+msgstr "[Apps]({filename}apps.ro.md)"
2554
2555 #. type: Title ###
2556 #: content/pages/faq.md:12
2557 #, no-wrap
2558 msgid "[Scopes]({filename}scopes.md)"
2559-msgstr ""
2560+msgstr "[Scopes]({filename}scopes.ro.md)"
2561
2562 #. type: Title ###
2563 #: content/pages/faq.md:13
2564 #, no-wrap
2565 msgid "[Security]({filename}security.md)"
2566-msgstr ""
2567+msgstr "[Security]({filename}security.ro.md)"
2568
2569 #. type: Plain text
2570 #: content/pages/apps.md:2
2571@@ -778,8 +781,8 @@
2572 #: content/pages/apps.md:12
2573 msgid ""
2574 "From the Apps scope, you can either tap on the “search” icon on the right "
2575-"and start searching by name, or you can go all the way down in the scope and "
2576-"tap on the Ubuntu Store icon."
2577+"and start searching by name, or you can go all the way down in the scope and"
2578+" tap on the Ubuntu Store icon."
2579 msgstr ""
2580
2581 #. !!QA
2582@@ -857,8 +860,8 @@
2583 #: content/pages/apps.md:32
2584 msgid ""
2585 "You can add music in multiple ways. If you have pre-existing music files, "
2586-"simply connect your phone to your pc via the usb cable. Next, copy the music "
2587-"you wish to listen to to the *Music* folder. Your music will appear in the "
2588+"simply connect your phone to your pc via the usb cable. Next, copy the music"
2589+" you wish to listen to to the *Music* folder. Your music will appear in the "
2590 "music app. Alternatively, you can acquire music directly using the device "
2591 "via a scope, such as 7digital or by downloading via the browser or another "
2592 "application."
2593@@ -870,11 +873,6 @@
2594 msgid "What music formats are supported?"
2595 msgstr ""
2596
2597-#. type: Plain text
2598-#: content/pages/apps.md:35
2599-msgid "The music app supports OGG, FLAG and MP3 formats."
2600-msgstr ""
2601-
2602 #. !!QA
2603 #: content/pages/apps.md:36
2604 #, no-wrap
2605@@ -903,11 +901,11 @@
2606 #. type: Plain text
2607 #: content/pages/apps.md:43
2608 msgid ""
2609-"The first time you open the Contacts app you’ll be asked if you want to sync "
2610-"contacts with your Google account. If you have answered “no” but change your "
2611-"mind later, you can do so by going to the Today scope, and setting up your "
2612-"Google account there. After that you can sync your contacts (and, if you "
2613-"want, calendar events as well)."
2614+"The first time you open the Contacts app you’ll be asked if you want to sync"
2615+" contacts with your Google account. If you have answered “no” but change "
2616+"your mind later, you can do so by going to the Today scope, and setting up "
2617+"your Google account there. After that you can sync your contacts (and, if "
2618+"you want, calendar events as well)."
2619 msgstr ""
2620
2621 #. type: Title ##
2622@@ -940,10 +938,10 @@
2623 #. type: Plain text
2624 #: content/pages/apps.md:51
2625 msgid ""
2626-"If you've just recorded a video, share it easily by swiping to the left from "
2627-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
2628-"find the video. Once loaded, select *Share* from the menu and choose how you "
2629-"wish to share your video."
2630+"If you've just recorded a video, share it easily by swiping to the left from"
2631+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
2632+" find the video. Once loaded, select *Share* from the menu and choose how "
2633+"you wish to share your video."
2634 msgstr ""
2635
2636 #. type: Title ##
2637@@ -974,8 +972,8 @@
2638 #. type: Plain text
2639 #: content/pages/apps.md:59
2640 msgid ""
2641-"Use the gallery app to select your picture. Select the *Edit* button next to "
2642-"the menu. Inside you'll find options to crop and rotate your picture."
2643+"Use the gallery app to select your picture. Select the *Edit* button next to"
2644+" the menu. Inside you'll find options to crop and rotate your picture."
2645 msgstr ""
2646
2647 #. !!QA
2648@@ -987,9 +985,9 @@
2649 #. type: Plain text
2650 #: content/pages/apps.md:62
2651 msgid ""
2652-"Select the Camera app from the launcher or apps scope. Select the video icon "
2653-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
2654-"additional options. Enjoy taking your video!"
2655+"Select the Camera app from the launcher or apps scope. Select the video icon"
2656+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
2657+" additional options. Enjoy taking your video!"
2658 msgstr ""
2659
2660 #. type: Title ##
2661@@ -1059,3 +1057,11 @@
2662 "Yes, although parts of the map may be missing and search is disabled while "
2663 "offline."
2664 msgstr ""
2665+
2666+#. type: Plain text
2667+#: content/pages/apps.md:35
2668+msgid "The music app supports OGG, FLAC and MP3 formats."
2669+msgstr ""
2670+
2671+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
2672+#~ msgstr ""
2673
2674=== modified file 'po/ru.po'
2675--- po/ru.po 2015-05-22 05:13:33 +0000
2676+++ po/ru.po 2015-06-04 07:56:20 +0000
2677@@ -2,7 +2,7 @@
2678 # Copyright (c) 2015 Rosetta Contributors and Canonical Ltd 2015
2679 # This file is distributed under the same license as the help-app package.
2680 # FIRST AUTHOR <EMAIL@ADDRESS>, 2015.
2681-#
2682+#
2683 msgid ""
2684 msgstr ""
2685 "Project-Id-Version: help-app\n"
2686@@ -14,8 +14,8 @@
2687 "MIME-Version: 1.0\n"
2688 "Content-Type: text/plain; charset=UTF-8\n"
2689 "Content-Transfer-Encoding: 8bit\n"
2690+"X-Generator: Launchpad (build 17514)\n"
2691 "X-Launchpad-Export-Date: 2015-05-22 05:13+0000\n"
2692-"X-Generator: Launchpad (build 17514)\n"
2693
2694 #. type: Plain text
2695 #: content/pages/scopes.md:2
2696@@ -33,7 +33,7 @@
2697 #: content/pages/basic.md:6 content/pages/settings.md:6 content/pages/ui.md:6
2698 #: content/pages/apps.md:7
2699 msgid "[TOC]"
2700-msgstr ""
2701+msgstr "[TOC]"
2702
2703 #. !!QA
2704 #: content/pages/scopes.md:7
2705@@ -45,8 +45,8 @@
2706 #: content/pages/scopes.md:9
2707 msgid ""
2708 "Swipe up from the bottom edge of the dash to reveal a scopes manager. "
2709-"Favorite scopes you wish to appear on your dash by selecting them. Selecting "
2710-"them again will remove the favorite. All favorited scopes will appear on "
2711+"Favorite scopes you wish to appear on your dash by selecting them. Selecting"
2712+" them again will remove the favorite. All favorited scopes will appear on "
2713 "your dash."
2714 msgstr ""
2715
2716@@ -110,12 +110,12 @@
2717 #. type: Plain text
2718 #: content/pages/index.md:11
2719 msgid "[Take me to the FAQ!]({filename}faq.md)"
2720-msgstr ""
2721+msgstr "[Take me to the FAQ!]({filename}faq.ru.md)"
2722
2723 #. type: Plain text
2724 #: content/pages/index.md:12
2725 msgid "[Get in touch]({filename}get-in-touch.md)"
2726-msgstr ""
2727+msgstr "[Get in touch]({filename}get-in-touch.ru.md)"
2728
2729 #. type: Plain text
2730 #: content/pages/security.md:2
2731@@ -186,8 +186,8 @@
2732 #: content/pages/security.md:19
2733 #, no-wrap
2734 msgid ""
2735-"Why do I have to type my PIN when using File Manager & Terminal (not default "
2736-"apps)?"
2737+"Why do I have to type my PIN when using File Manager & Terminal (not default"
2738+" apps)?"
2739 msgstr ""
2740
2741 #. type: Plain text
2742@@ -247,6 +247,8 @@
2743 "The music app let's you play music copied to the device. In addition, "
2744 "[scopes]({filename}scopes.md) such as 7digital can also play music."
2745 msgstr ""
2746+"The music app let's you play music copied to the device. In addition, "
2747+"[scopes]({filename}scopes.ru.md) such as 7digital can also play music."
2748
2749 #. !!QA
2750 #: content/pages/basic.md:10
2751@@ -257,8 +259,8 @@
2752 #. type: Plain text
2753 #: content/pages/basic.md:12
2754 msgid ""
2755-"The media player application will play videos copied to the device. You will "
2756-"also find applications like youtube that give you streaming options."
2757+"The media player application will play videos copied to the device. You will"
2758+" also find applications like youtube that give you streaming options."
2759 msgstr ""
2760
2761 #. !!QA
2762@@ -284,8 +286,8 @@
2763 #: content/pages/basic.md:18
2764 msgid ""
2765 "Press the Volume Up and Volume Down buttons at the same time until you see "
2766-"the screen flashing. The screenshot will capture what is on your screen, and "
2767-"you can see the resulting picture in the Gallery app or the Photos scope."
2768+"the screen flashing. The screenshot will capture what is on your screen, and"
2769+" you can see the resulting picture in the Gallery app or the Photos scope."
2770 msgstr ""
2771
2772 #. !!QA
2773@@ -297,8 +299,8 @@
2774 #. type: Plain text
2775 #: content/pages/basic.md:21
2776 msgid ""
2777-"If you've just taken a picture, you can see it easily by swiping to the left "
2778-"from the right edge inside the camera app. Alternatively, use the gallery "
2779+"If you've just taken a picture, you can see it easily by swiping to the left"
2780+" from the right edge inside the camera app. Alternatively, use the gallery "
2781 "app to find the picture."
2782 msgstr ""
2783
2784@@ -429,8 +431,8 @@
2785 #. type: Plain text
2786 #: content/pages/settings.md:22
2787 msgid ""
2788-"You can set up some of your accounts from the scopes. Today scope allows you "
2789-"to configure your Google and Fitbit account, while the Pictures scope lets "
2790+"You can set up some of your accounts from the scopes. Today scope allows you"
2791+" to configure your Google and Fitbit account, while the Pictures scope lets "
2792 "you configure your flickr, Facebook and Instagram account. You can manage "
2793 "all your accounts (including social media, email, etc) from the *System "
2794 "Settings* app, under *Personal*, *Accounts*."
2795@@ -475,8 +477,8 @@
2796 #: content/pages/ui.md:4
2797 #, no-wrap
2798 msgid ""
2799-"*Are you wondering about the dash, scopes, swiping? You've come to the right "
2800-"place!*\n"
2801+"*Are you wondering about the dash, scopes, swiping? You've come to the right"
2802+" place!*\n"
2803 msgstr ""
2804
2805 #. !!QA
2806@@ -488,8 +490,8 @@
2807 #. type: Plain text
2808 #: content/pages/ui.md:9
2809 msgid ""
2810-"The dash contains a list of applications installed on the device, along with "
2811-"presenting the scopes and store. The dash is the first thing you see when "
2812+"The dash contains a list of applications installed on the device, along with"
2813+" presenting the scopes and store. The dash is the first thing you see when "
2814 "booting the phone. You can switch to it again at any time by swiping left "
2815 "from the right screen edge."
2816 msgstr ""
2817@@ -519,7 +521,8 @@
2818 "To pin a running app permanently to the launcher, long-press it to reveal "
2819 "the context menu and choose the Pin to launcher option. You can do the same "
2820 "to unpin apps. You can also move launcher icons around by long-pressing "
2821-"them and dragging and dropping them to the position you'd like them to be in."
2822+"them and dragging and dropping them to the position you'd like them to be "
2823+"in."
2824 msgstr ""
2825
2826 #. !!QA
2827@@ -531,8 +534,8 @@
2828 #. type: Plain text
2829 #: content/pages/ui.md:19
2830 msgid ""
2831-"Indicators convey quick useful information about your device, like the time, "
2832-"data connection, location, sound, and notifications. You can access the "
2833+"Indicators convey quick useful information about your device, like the time,"
2834+" data connection, location, sound, and notifications. You can access the "
2835 "indicators at any time by swiping down from the top screen edge."
2836 msgstr ""
2837
2838@@ -561,10 +564,10 @@
2839 #. type: Plain text
2840 #: content/pages/ui.md:26
2841 msgid ""
2842-"To close an application, slide your finger *slowly* left from the right edge "
2843-"of the screen. An application switcher will appear. Place your finger on the "
2844-"application preview you wish to close and swipe up or down. The application "
2845-"will disappear."
2846+"To close an application, slide your finger *slowly* left from the right edge"
2847+" of the screen. An application switcher will appear. Place your finger on "
2848+"the application preview you wish to close and swipe up or down. The "
2849+"application will disappear."
2850 msgstr ""
2851
2852 #. !!QA
2853@@ -576,8 +579,8 @@
2854 #. type: Plain text
2855 #: content/pages/ui.md:29
2856 msgid ""
2857-"For text that can be copied and pasted, press and hold the text in question. "
2858-"A menu will appear allowing you to cut, copy and paste."
2859+"For text that can be copied and pasted, press and hold the text in question."
2860+" A menu will appear allowing you to cut, copy and paste."
2861 msgstr ""
2862
2863 #. !!QA
2864@@ -663,15 +666,15 @@
2865 #: content/pages/ui.md:48
2866 #, no-wrap
2867 msgid ""
2868-"What is the round circle on the welcome screen for? What does it show? Can I "
2869-"configure it?"
2870+"What is the round circle on the welcome screen for? What does it show? Can I"
2871+" configure it?"
2872 msgstr ""
2873
2874 #. type: Plain text
2875 #: content/pages/ui.md:49
2876 msgid ""
2877-"The round circle is the infographic. It hows you recent phone activity, like "
2878-"the number of messages received or the number of songs played. You can "
2879+"The round circle is the infographic. It hows you recent phone activity, like"
2880+" the number of messages received or the number of songs played. You can "
2881 "disable it by launching the *Settings* app, navigating to *Security and "
2882 "privacy* and unticking *Stats on Welcome screen*."
2883 msgstr ""
2884@@ -717,37 +720,37 @@
2885 #: content/pages/faq.md:8
2886 #, no-wrap
2887 msgid "[First day tasks]({filename}basic.md)"
2888-msgstr ""
2889+msgstr "[First day tasks]({filename}basic.ru.md)"
2890
2891 #. type: Title ###
2892 #: content/pages/faq.md:9
2893 #, no-wrap
2894 msgid "[User Interface]({filename}ui.md)"
2895-msgstr ""
2896+msgstr "[User Interface]({filename}ui.ru.md)"
2897
2898 #. type: Title ###
2899 #: content/pages/faq.md:10
2900 #, no-wrap
2901 msgid "[Settings]({filename}settings.md)"
2902-msgstr ""
2903+msgstr "[Settings]({filename}settings.ru.md)"
2904
2905 #. type: Title ###
2906 #: content/pages/faq.md:11
2907 #, no-wrap
2908 msgid "[Apps]({filename}apps.md)"
2909-msgstr ""
2910+msgstr "[Apps]({filename}apps.ru.md)"
2911
2912 #. type: Title ###
2913 #: content/pages/faq.md:12
2914 #, no-wrap
2915 msgid "[Scopes]({filename}scopes.md)"
2916-msgstr ""
2917+msgstr "[Scopes]({filename}scopes.ru.md)"
2918
2919 #. type: Title ###
2920 #: content/pages/faq.md:13
2921 #, no-wrap
2922 msgid "[Security]({filename}security.md)"
2923-msgstr ""
2924+msgstr "[Security]({filename}security.ru.md)"
2925
2926 #. type: Plain text
2927 #: content/pages/apps.md:2
2928@@ -778,8 +781,8 @@
2929 #: content/pages/apps.md:12
2930 msgid ""
2931 "From the Apps scope, you can either tap on the “search” icon on the right "
2932-"and start searching by name, or you can go all the way down in the scope and "
2933-"tap on the Ubuntu Store icon."
2934+"and start searching by name, or you can go all the way down in the scope and"
2935+" tap on the Ubuntu Store icon."
2936 msgstr ""
2937
2938 #. !!QA
2939@@ -857,8 +860,8 @@
2940 #: content/pages/apps.md:32
2941 msgid ""
2942 "You can add music in multiple ways. If you have pre-existing music files, "
2943-"simply connect your phone to your pc via the usb cable. Next, copy the music "
2944-"you wish to listen to to the *Music* folder. Your music will appear in the "
2945+"simply connect your phone to your pc via the usb cable. Next, copy the music"
2946+" you wish to listen to to the *Music* folder. Your music will appear in the "
2947 "music app. Alternatively, you can acquire music directly using the device "
2948 "via a scope, such as 7digital or by downloading via the browser or another "
2949 "application."
2950@@ -870,11 +873,6 @@
2951 msgid "What music formats are supported?"
2952 msgstr ""
2953
2954-#. type: Plain text
2955-#: content/pages/apps.md:35
2956-msgid "The music app supports OGG, FLAG and MP3 formats."
2957-msgstr ""
2958-
2959 #. !!QA
2960 #: content/pages/apps.md:36
2961 #, no-wrap
2962@@ -903,11 +901,11 @@
2963 #. type: Plain text
2964 #: content/pages/apps.md:43
2965 msgid ""
2966-"The first time you open the Contacts app you’ll be asked if you want to sync "
2967-"contacts with your Google account. If you have answered “no” but change your "
2968-"mind later, you can do so by going to the Today scope, and setting up your "
2969-"Google account there. After that you can sync your contacts (and, if you "
2970-"want, calendar events as well)."
2971+"The first time you open the Contacts app you’ll be asked if you want to sync"
2972+" contacts with your Google account. If you have answered “no” but change "
2973+"your mind later, you can do so by going to the Today scope, and setting up "
2974+"your Google account there. After that you can sync your contacts (and, if "
2975+"you want, calendar events as well)."
2976 msgstr ""
2977
2978 #. type: Title ##
2979@@ -940,10 +938,10 @@
2980 #. type: Plain text
2981 #: content/pages/apps.md:51
2982 msgid ""
2983-"If you've just recorded a video, share it easily by swiping to the left from "
2984-"the right edge inside the Camera app. Alternatively, use the Gallery app to "
2985-"find the video. Once loaded, select *Share* from the menu and choose how you "
2986-"wish to share your video."
2987+"If you've just recorded a video, share it easily by swiping to the left from"
2988+" the right edge inside the Camera app. Alternatively, use the Gallery app to"
2989+" find the video. Once loaded, select *Share* from the menu and choose how "
2990+"you wish to share your video."
2991 msgstr ""
2992
2993 #. type: Title ##
2994@@ -974,8 +972,8 @@
2995 #. type: Plain text
2996 #: content/pages/apps.md:59
2997 msgid ""
2998-"Use the gallery app to select your picture. Select the *Edit* button next to "
2999-"the menu. Inside you'll find options to crop and rotate your picture."
3000+"Use the gallery app to select your picture. Select the *Edit* button next to"
3001+" the menu. Inside you'll find options to crop and rotate your picture."
3002 msgstr ""
3003
3004 #. !!QA
3005@@ -987,9 +985,9 @@
3006 #. type: Plain text
3007 #: content/pages/apps.md:62
3008 msgid ""
3009-"Select the Camera app from the launcher or apps scope. Select the video icon "
3010-"on the bottom of the screen. Swipe up from the bottom edge of the phone for "
3011-"additional options. Enjoy taking your video!"
3012+"Select the Camera app from the launcher or apps scope. Select the video icon"
3013+" on the bottom of the screen. Swipe up from the bottom edge of the phone for"
3014+" additional options. Enjoy taking your video!"
3015 msgstr ""
3016
3017 #. type: Title ##
3018@@ -1059,3 +1057,11 @@
3019 "Yes, although parts of the map may be missing and search is disabled while "
3020 "offline."
3021 msgstr ""
3022+
3023+#. type: Plain text
3024+#: content/pages/apps.md:35
3025+msgid "The music app supports OGG, FLAC and MP3 formats."
3026+msgstr ""
3027+
3028+#~ msgid "The music app supports OGG, FLAG and MP3 formats."
3029+#~ msgstr ""

Subscribers

People subscribed via source and target branches