Merge lp:nuvola-player/releases-1.x into lp:nuvola-player/2.5.x
- releases-1.x
- Merge into trunk
Proposed by
Jiří Janoušek
Status: | Rejected |
---|---|
Rejected by: | Jiří Janoušek |
Proposed branch: | lp:nuvola-player/releases-1.x |
Merge into: | lp:nuvola-player/2.5.x |
Diff against target: |
4527 lines (+3115/-182) (has conflicts) 23 files modified
CHANGELOG (+119/-32) README (+26/-0) README.Fedora (+4/-0) README.Ubuntu (+16/-0) libfenryxo/connection.vala (+20/-0) man/nuvolaplayer.1.xml (+1/-2) src/core/application.vala (+5/-0) src/core/service.vala (+554/-0) src/core/settings.vala (+31/-0) src/gui/actions.vala (+85/-0) src/gui/preferences.vala (+38/-0) src/gui/windows.vala (+71/-14) src/plugins/media_keys.vala (+6/-0) src/plugins/trayicon.vala (+37/-0) translations/LINGUAS (+11/-2) translations/el.po (+453/-0) translations/hu.po (+447/-0) translations/ms.po (+86/-47) translations/nl.po (+22/-2) translations/pt_BR.po (+95/-65) translations/sq.po (+425/-0) translations/zh_CN.po (+432/-0) wscript (+131/-18) Text conflict in CHANGELOG Text conflict in README Text conflict in README.Fedora Text conflict in README.Ubuntu Text conflict in libfenryxo/connection.vala Text conflict in src/core/application.vala Text conflict in src/core/service.vala Text conflict in src/core/settings.vala Text conflict in src/gui/actions.vala Text conflict in src/gui/preferences.vala Text conflict in src/gui/windows.vala Text conflict in src/plugins/media_keys.vala Text conflict in src/plugins/trayicon.vala Text conflict in translations/LINGUAS Text conflict in translations/ms.po Text conflict in translations/nl.po Path conflict: vapi/libsoup-2.4-for-vala-gte-0.15.vapi / vapi/libsoup-cache-2.4-vala-0.15.vapi Text conflict in wscript |
To merge this branch: | bzr merge lp:nuvola-player/releases-1.x |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Jiří Janoušek | Disapprove | ||
Review via email: mp+110546@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
Unmerged revisions
- 231. By Jiří Janoušek
-
[trunk:351] Removed link to blueprints, bug tracker will be used for feature requests.
- 230. By Jiří Janoušek
-
Implemented blacklist for services. Default blacklist includes Pandora and Rdio if WebKitGTK+ 1.8 is detected.
- 229. By Jiří Janoušek
-
[trunk:350] Updated copyright and credits.
- 228. By Jiří Janoušek
-
[trunk:349] Added service support for Amazon Cloud Player by Michael Mims.
- 227. By Jiří Janoušek
-
[trunk:348] Album art is saved by a hash of the URI to avoid name conflicts. Patch by Michael Mims. LP:987464.
- 226. By Jiří Janoušek
-
1.0.6~unstable
- 225. By Jiří Janoušek
-
Release 1.0.5
- 224. By Jiří Janoušek
-
Updated changelog.
- 223. By Jiří Janoušek
-
Modified workaround for WebKit rendering bug: changed default window size, added ui_state.conf options bug958154_window_w and bug958154_window_h. LP:958154
- 222. By Jiří Janoušek
-
Let's start 1.0.5~unstable
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'CHANGELOG' | |||
2 | --- CHANGELOG 2012-02-18 10:58:29 +0000 | |||
3 | +++ CHANGELOG 2012-06-15 15:20:27 +0000 | |||
4 | @@ -5,38 +5,125 @@ | |||
5 | 5 | tray icon and notifications). It also remembers last session | 5 | tray icon and notifications). It also remembers last session |
6 | 6 | and the current view (album, genre list, ...). | 6 | and the current view (album, genre list, ...). |
7 | 7 | 7 | ||
40 | 8 | 8 | <<<<<<< TREE | |
41 | 9 | === 1.0.2 - February 13, 2012 === | 9 | |
42 | 10 | 10 | === 1.0.2 - February 13, 2012 === | |
43 | 11 | Bug fix release. Changes since 1.0.1: | 11 | |
44 | 12 | 12 | Bug fix release. Changes since 1.0.1: | |
45 | 13 | * Updated link to development changelog | 13 | |
46 | 14 | * Track GNOME/XFCE session to quit properly. Fixes lp:909430 | 14 | * Updated link to development changelog |
47 | 15 | * Cache is no longer flushed to disk, only dumped. | 15 | * Track GNOME/XFCE session to quit properly. Fixes lp:909430 |
48 | 16 | * Executable rsvg-convert is used instead of rsvg to generate PNG images | 16 | * Cache is no longer flushed to disk, only dumped. |
49 | 17 | from SVG source images | 17 | * Executable rsvg-convert is used instead of rsvg to generate PNG images |
50 | 18 | * Fixed Google Music sandbox pattern. Fixes lp:928535 | 18 | from SVG source images |
51 | 19 | * Updated field "maintainer_link" of services' metadata. | 19 | * Fixed Google Music sandbox pattern. Fixes lp:928535 |
52 | 20 | * Updated translations. | 20 | * Updated field "maintainer_link" of services' metadata. |
53 | 21 | 21 | * Updated translations. | |
54 | 22 | === 1.0.1 - January 4, 2012 == | 22 | |
55 | 23 | 23 | === 1.0.1 - January 4, 2012 == | |
56 | 24 | Bug fix release with patches from Debian Mentors review process. Changes since 1.0.0: | 24 | |
57 | 25 | 25 | Bug fix release with patches from Debian Mentors review process. Changes since 1.0.0: | |
58 | 26 | * Removed build flags --with-unity-quick-list, --with-browser-cache | 26 | |
59 | 27 | and --deprecated-ppa. | 27 | * Removed build flags --with-unity-quick-list, --with-browser-cache |
60 | 28 | * PNG files are generated from source SVG files. New build dependency: rsvg | 28 | and --deprecated-ppa. |
61 | 29 | * Removed deprecated Encoding field in desktop file | 29 | * PNG files are generated from source SVG files. New build dependency: rsvg |
62 | 30 | * Clean-up and fixed typo | 30 | * Removed deprecated Encoding field in desktop file |
63 | 31 | * VAPI for Gee shipped with Nuvola Player is used only for libgee < 0.6 | 31 | * Clean-up and fixed typo |
64 | 32 | * Unsupported MPRIS properties are not exported. | 32 | * VAPI for Gee shipped with Nuvola Player is used only for libgee < 0.6 |
65 | 33 | * Crash dialog has option to disable crash dialog. | 33 | * Unsupported MPRIS properties are not exported. |
66 | 34 | * Updated translations. | 34 | * Crash dialog has option to disable crash dialog. |
67 | 35 | 35 | * Updated translations. | |
68 | 36 | 36 | ||
69 | 37 | === 1.0 - December 23, 2011 === | 37 | |
70 | 38 | 38 | === 1.0 - December 23, 2011 === | |
71 | 39 | Feature release. Changes since 0.3.2: | 39 | |
72 | 40 | Feature release. Changes since 0.3.2: | ||
73 | 41 | ======= | ||
74 | 42 | === 1.0.5 - April 4, 2012 === | ||
75 | 43 | |||
76 | 44 | Nuvola Player 1.0.5 contains modified workaround for bug[1][2] present | ||
77 | 45 | in the latest stable WebKitGTK release (1.8) that causes some Flash-dependent | ||
78 | 46 | pages are not rendered properly, do not update and are unresponsive to user | ||
79 | 47 | actions. Unfortunately, this bug affects also Google Play, Grooveshark | ||
80 | 48 | and Pandora Radio and makes them unusable in Nuvola Player. | ||
81 | 49 | |||
82 | 50 | The latest stable Nuvola Player release 1.0.5 contains simple workaround | ||
83 | 51 | that sets window size to magic values that worked during my tests. However, | ||
84 | 52 | these values may be dependent on user settings, e.g. GTK theme, window manager, | ||
85 | 53 | font sizes, whatever. If the default workaround does not work for you, you can | ||
86 | 54 | try to set your own magic values: | ||
87 | 55 | |||
88 | 56 | 1) Quit Nuvola Player (hiding the window is not enough). | ||
89 | 57 | 2) Open or create file .config/nuvolaplayer/ui_state.conf | ||
90 | 58 | 3) Append following lines: | ||
91 | 59 | bug958154_window_w = 1010 | ||
92 | 60 | bug958154_window_h = 534 | ||
93 | 61 | 5) Replace “1010” with your magic window width and “534” with your magic window | ||
94 | 62 | height. | ||
95 | 63 | 4) Save the file | ||
96 | 64 | 5) Launch Nuvola Player | ||
97 | 65 | 6) If the values don’t work, go to 1. | ||
98 | 66 | |||
99 | 67 | If you are affected by that bug, I encourage you to add some “heat” | ||
100 | 68 | to the Ubuntu bug[2] or upstream bug[1]. | ||
101 | 69 | |||
102 | 70 | [1] https://bugs.webkit.org/show_bug.cgi?id=81450 | ||
103 | 71 | [2] https://bugs.launchpad.net/webkit/+bug/973719 | ||
104 | 72 | |||
105 | 73 | === 1.0.4 - March 31, 2012 === | ||
106 | 74 | |||
107 | 75 | Bug fix release. Changes since 1.0.3: | ||
108 | 76 | |||
109 | 77 | * Fall back to classic key bindings manager if GNOME Settings Daemon | ||
110 | 78 | is present, but doesn't handle multimedia keys. LP:940504 | ||
111 | 79 | * Added workaround for WebKitGTK 1.8 rendering bug. LP:958154 | ||
112 | 80 | * Added integration of Rdio by Stefan Lohmaier. | ||
113 | 81 | * Added integration of Pandora Radio by Adam Wolfe Gordon. | ||
114 | 82 | * Updated translations. | ||
115 | 83 | |||
116 | 84 | === 1.0.3 - March 17, 2012 === | ||
117 | 85 | |||
118 | 86 | Bug fix release. Changes since 1.0.2: | ||
119 | 87 | |||
120 | 88 | * Fixed Menu and MenuItem conflicts in namespace GLib/Gtk (GNOME 3.3). | ||
121 | 89 | Patch by Vincent Untz. LP:940456 | ||
122 | 90 | * Compatibility with Valac 0.15. Patch by Vincent Untz. LP:940456 | ||
123 | 91 | * Added option to disable usage of space key in keybindings. LP:934182. | ||
124 | 92 | * Google Music is now a part of Google Play. Fixes LP:948760 | ||
125 | 93 | * Updated translations. | ||
126 | 94 | |||
127 | 95 | === 1.0.2 - February 13, 2012 === | ||
128 | 96 | |||
129 | 97 | Bug fix release. Changes since 1.0.1: | ||
130 | 98 | |||
131 | 99 | * Updated link to development changelog | ||
132 | 100 | * Track GNOME/XFCE session to quit properly. Fixes lp:909430 | ||
133 | 101 | * Cache is no longer flushed to disk, only dumped. | ||
134 | 102 | * Executable rsvg-convert is used instead of rsvg to generate PNG images | ||
135 | 103 | from SVG source images | ||
136 | 104 | * Fixed Google Music sandbox pattern. Fixes lp:928535 | ||
137 | 105 | * Updated field "maintainer_link" of services' metadata. | ||
138 | 106 | * Updated translations. | ||
139 | 107 | |||
140 | 108 | === 1.0.1 - January 4, 2012 == | ||
141 | 109 | |||
142 | 110 | Bug fix release with patches from Debian Mentors review process. Changes since 1.0.0: | ||
143 | 111 | |||
144 | 112 | * Removed build flags --with-unity-quick-list, --with-browser-cache | ||
145 | 113 | and --deprecated-ppa. | ||
146 | 114 | * PNG files are generated from source SVG files. New build dependency: rsvg | ||
147 | 115 | * Removed deprecated Encoding field in desktop file | ||
148 | 116 | * Clean-up and fixed typo | ||
149 | 117 | * VAPI for Gee shipped with Nuvola Player is used only for libgee < 0.6 | ||
150 | 118 | * Unsupported MPRIS properties are not exported. | ||
151 | 119 | * Crash dialog has option to disable crash dialog. | ||
152 | 120 | * Updated translations. | ||
153 | 121 | |||
154 | 122 | |||
155 | 123 | === 1.0 - December 23, 2011 === | ||
156 | 124 | |||
157 | 125 | Feature release. Changes since 0.3.2: | ||
158 | 126 | >>>>>>> MERGE-SOURCE | ||
159 | 40 | 127 | ||
160 | 41 | * The core has been rewritten to supports multiple services and all service-specific data | 128 | * The core has been rewritten to supports multiple services and all service-specific data |
161 | 42 | are stored in separate files outside the core of the application and are loaded | 129 | are stored in separate files outside the core of the application and are loaded |
162 | 43 | 130 | ||
163 | === modified file 'README' | |||
164 | --- README 2012-03-26 20:58:21 +0000 | |||
165 | +++ README 2012-06-15 15:20:27 +0000 | |||
166 | @@ -46,6 +46,7 @@ | |||
167 | 46 | 46 | ||
168 | 47 | libglib (>= 2.26), libgee (>= 0.5), libsoup (>= 2.30), | 47 | libglib (>= 2.26), libgee (>= 0.5), libsoup (>= 2.30), |
169 | 48 | libgtk (>= 2.20), libwebkitgtk (>= 1.2), python (>= 2.6), valac (>= 0.12), | 48 | libgtk (>= 2.20), libwebkitgtk (>= 1.2), python (>= 2.6), valac (>= 0.12), |
170 | 49 | <<<<<<< TREE | ||
171 | 49 | libnotify (>= 0.4), libx11, libunique (>= 0.9), intltool, librsvg-bin, | 50 | libnotify (>= 0.4), libx11, libunique (>= 0.9), intltool, librsvg-bin, |
172 | 50 | json-glib-1.0 (>= 0.7) | 51 | json-glib-1.0 (>= 0.7) |
173 | 51 | 52 | ||
174 | @@ -59,6 +60,24 @@ | |||
175 | 59 | 60 | ||
176 | 60 | python-scour | 61 | python-scour |
177 | 61 | enables optimization of SVG icon (reduced size) | 62 | enables optimization of SVG icon (reduced size) |
178 | 63 | ======= | ||
179 | 64 | libnotify (>= 0.4), libx11, libunique (>= 0.9), intltool, librsvg-bin | ||
180 | 65 | |||
181 | 66 | |||
182 | 67 | There are some optional dependencies: | ||
183 | 68 | libsoup >= 2.34 | ||
184 | 69 | enables browser cache for remote objects (images, etc.) | ||
185 | 70 | |||
186 | 71 | libunity, libdbusmenu-glib | ||
187 | 72 | enables integration with Unity Quick List | ||
188 | 73 | |||
189 | 74 | libindicate, libdbusmenu-glib | ||
190 | 75 | needed for integration with Maverick version of Ubuntu Sound menu, | ||
191 | 76 | see --with-indicator-sound-maverick build flag | ||
192 | 77 | |||
193 | 78 | python-scour | ||
194 | 79 | enables optimization of SVG icon (reduced size) | ||
195 | 80 | >>>>>>> MERGE-SOURCE | ||
196 | 62 | 81 | ||
197 | 63 | 3) Clean the build environment | 82 | 3) Clean the build environment |
198 | 64 | 83 | ||
199 | @@ -71,6 +90,13 @@ | |||
200 | 71 | distribution should already contain standalone version of Waf. To trigger configure | 90 | distribution should already contain standalone version of Waf. To trigger configure |
201 | 72 | process, run command `./waf configure`. There are a few configuration options: | 91 | process, run command `./waf configure`. There are a few configuration options: |
202 | 73 | 92 | ||
203 | 93 | <<<<<<< TREE | ||
204 | 94 | ======= | ||
205 | 95 | --with-indicator-sound-maverick | ||
206 | 96 | Include support for Ubuntu Maverick version of Sound indicator | ||
207 | 97 | Requires: libindicate, libdbusmenu-glib | ||
208 | 98 | |||
209 | 99 | >>>>>>> MERGE-SOURCE | ||
210 | 74 | --without-glib-dbus | 100 | --without-glib-dbus |
211 | 75 | Allows building with GLib < 2.26, but without following fratures: | 101 | Allows building with GLib < 2.26, but without following fratures: |
212 | 76 | * multimedia keys | 102 | * multimedia keys |
213 | 77 | 103 | ||
214 | === modified file 'README.Fedora' | |||
215 | --- README.Fedora 2012-02-12 14:40:38 +0000 | |||
216 | +++ README.Fedora 2012-06-15 15:20:27 +0000 | |||
217 | @@ -11,7 +11,11 @@ | |||
218 | 11 | 11 | ||
219 | 12 | # yum install gcc glib2-devel libgee-devel libsoup-devel \ | 12 | # yum install gcc glib2-devel libgee-devel libsoup-devel \ |
220 | 13 | gtk2-devel webkitgtk-devel python vala libnotify-devel \ | 13 | gtk2-devel webkitgtk-devel python vala libnotify-devel \ |
221 | 14 | <<<<<<< TREE | ||
222 | 14 | libX11-devel unique-devel intltool librsvg2 libjson-glib-devel | 15 | libX11-devel unique-devel intltool librsvg2 libjson-glib-devel |
223 | 16 | ======= | ||
224 | 17 | libX11-devel unique-devel intltool librsvg2 | ||
225 | 18 | >>>>>>> MERGE-SOURCE | ||
226 | 15 | 19 | ||
227 | 16 | 2.) Compilation | 20 | 2.) Compilation |
228 | 17 | 21 | ||
229 | 18 | 22 | ||
230 | === modified file 'README.Ubuntu' | |||
231 | --- README.Ubuntu 2012-03-26 20:58:21 +0000 | |||
232 | +++ README.Ubuntu 2012-06-15 15:20:27 +0000 | |||
233 | @@ -31,7 +31,11 @@ | |||
234 | 31 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ | 31 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ |
235 | 32 | libgtk2.0-dev libwebkitgtk-dev python valac libnotify-dev \ | 32 | libgtk2.0-dev libwebkitgtk-dev python valac libnotify-dev \ |
236 | 33 | libx11-dev libunique-dev libdbusmenu-glib-dev libunity-dev \ | 33 | libx11-dev libunique-dev libdbusmenu-glib-dev libunity-dev \ |
237 | 34 | <<<<<<< TREE | ||
238 | 34 | intltool librsvg2-bin python-scour libjson-glib-dev | 35 | intltool librsvg2-bin python-scour libjson-glib-dev |
239 | 36 | ======= | ||
240 | 37 | intltool librsvg2-bin python-scour | ||
241 | 38 | >>>>>>> MERGE-SOURCE | ||
242 | 35 | 39 | ||
243 | 36 | 2.) Compilation | 40 | 2.) Compilation |
244 | 37 | 41 | ||
245 | @@ -57,7 +61,11 @@ | |||
246 | 57 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ | 61 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ |
247 | 58 | libgtk2.0-dev libwebkitgtk-dev python valac libnotify-dev \ | 62 | libgtk2.0-dev libwebkitgtk-dev python valac libnotify-dev \ |
248 | 59 | libx11-dev libunique-dev libdbusmenu-glib-dev libunity-dev \ | 63 | libx11-dev libunique-dev libdbusmenu-glib-dev libunity-dev \ |
249 | 64 | <<<<<<< TREE | ||
250 | 60 | intltool librsvg2-bin libjson-glib-dev | 65 | intltool librsvg2-bin libjson-glib-dev |
251 | 66 | ======= | ||
252 | 67 | intltool librsvg2-bin | ||
253 | 68 | >>>>>>> MERGE-SOURCE | ||
254 | 61 | 69 | ||
255 | 62 | 2.) Compilation | 70 | 2.) Compilation |
256 | 63 | 71 | ||
257 | @@ -86,7 +94,11 @@ | |||
258 | 86 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ | 94 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ |
259 | 87 | libgtk2.0-dev libwebkit-dev python valac libnotify-dev \ | 95 | libgtk2.0-dev libwebkit-dev python valac libnotify-dev \ |
260 | 88 | libx11-dev libunique-dev libdbusmenu-glib-dev libindicate-dev \ | 96 | libx11-dev libunique-dev libdbusmenu-glib-dev libindicate-dev \ |
261 | 97 | <<<<<<< TREE | ||
262 | 89 | intltool librsvg2-bin libjson-glib-dev | 98 | intltool librsvg2-bin libjson-glib-dev |
263 | 99 | ======= | ||
264 | 100 | intltool librsvg2-bin | ||
265 | 101 | >>>>>>> MERGE-SOURCE | ||
266 | 90 | 102 | ||
267 | 91 | 2.) Compilation | 103 | 2.) Compilation |
268 | 92 | 104 | ||
269 | @@ -113,7 +125,11 @@ | |||
270 | 113 | # apt-get update | 125 | # apt-get update |
271 | 114 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ | 126 | # apt-get install libglib2.0-dev libgee-dev libsoup2.4-dev \ |
272 | 115 | libgtk2.0-dev libwebkit-dev python valac libnotify-dev \ | 127 | libgtk2.0-dev libwebkit-dev python valac libnotify-dev \ |
273 | 128 | <<<<<<< TREE | ||
274 | 116 | libx11-dev libunique-dev intltool librsvg2-bin libjson-glib-dev | 129 | libx11-dev libunique-dev intltool librsvg2-bin libjson-glib-dev |
275 | 130 | ======= | ||
276 | 131 | libx11-dev libunique-dev intltool librsvg2-bin | ||
277 | 132 | >>>>>>> MERGE-SOURCE | ||
278 | 117 | 133 | ||
279 | 118 | 2.) Compilation | 134 | 2.) Compilation |
280 | 119 | 135 | ||
281 | 120 | 136 | ||
282 | === modified file 'data/nuvolaplayer/ui/actions_mode_both.xml' | |||
283 | === modified file 'data/nuvolaplayer/ui/actions_mode_menubar.xml' | |||
284 | === modified file 'data/nuvolaplayer/ui/actions_mode_toolbar.xml' | |||
285 | === modified file 'libfenryxo/app.vala' | |||
286 | === modified file 'libfenryxo/config.vala' | |||
287 | === modified file 'libfenryxo/connection.vala' | |||
288 | --- libfenryxo/connection.vala 2012-05-04 23:30:07 +0000 | |||
289 | +++ libfenryxo/connection.vala 2012-06-15 15:20:27 +0000 | |||
290 | @@ -22,6 +22,7 @@ | |||
291 | 22 | using Soup; | 22 | using Soup; |
292 | 23 | using Fenryxo.Path; | 23 | using Fenryxo.Path; |
293 | 24 | using Fenryxo.Logger; | 24 | using Fenryxo.Logger; |
294 | 25 | <<<<<<< TREE | ||
295 | 25 | using Fenryxo.System; | 26 | using Fenryxo.System; |
296 | 26 | 27 | ||
297 | 27 | 28 | ||
298 | @@ -30,6 +31,9 @@ | |||
299 | 30 | private extern void soup_session_add_feature_by_type(Soup.Session session, GLib.Type feature_type); | 31 | private extern void soup_session_add_feature_by_type(Soup.Session session, GLib.Type feature_type); |
300 | 31 | //~ private extern void soup_session_remove_feature(Soup.Session session, Soup.SessionFeature feature); | 32 | //~ private extern void soup_session_remove_feature(Soup.Session session, Soup.SessionFeature feature); |
301 | 32 | private extern void soup_session_remove_feature_by_type(Soup.Session session, GLib.Type feature_type); | 33 | private extern void soup_session_remove_feature_by_type(Soup.Session session, GLib.Type feature_type); |
302 | 34 | ======= | ||
303 | 35 | using Fenryxo.System; | ||
304 | 36 | >>>>>>> MERGE-SOURCE | ||
305 | 33 | 37 | ||
306 | 34 | namespace Fenryxo{ | 38 | namespace Fenryxo{ |
307 | 35 | 39 | ||
308 | @@ -204,7 +208,15 @@ | |||
309 | 204 | 208 | ||
310 | 205 | weak SessionFeature? feature = this.session.get_feature(typeof(CookieJarText)); | 209 | weak SessionFeature? feature = this.session.get_feature(typeof(CookieJarText)); |
311 | 206 | if(feature != null) this.session.remove_feature(feature); | 210 | if(feature != null) this.session.remove_feature(feature); |
312 | 211 | <<<<<<< TREE | ||
313 | 207 | soup_session_add_feature(session, new CookieJarText(file.get_path(), false)); | 212 | soup_session_add_feature(session, new CookieJarText(file.get_path(), false)); |
314 | 213 | ======= | ||
315 | 214 | #if VALAC_0_15 | ||
316 | 215 | session.add_feature(new CookieJarText(file.get_path(), false)); | ||
317 | 216 | #else | ||
318 | 217 | session.add_feature = new CookieJarText(file.get_path(), false); | ||
319 | 218 | #endif | ||
320 | 219 | >>>>>>> MERGE-SOURCE | ||
321 | 208 | } | 220 | } |
322 | 209 | 221 | ||
323 | 210 | #if LIBSOUP_CACHE | 222 | #if LIBSOUP_CACHE |
324 | @@ -246,7 +258,15 @@ | |||
325 | 246 | } | 258 | } |
326 | 247 | 259 | ||
327 | 248 | if(add_cache){ | 260 | if(add_cache){ |
328 | 261 | <<<<<<< TREE | ||
329 | 249 | soup_session_add_feature(session, (owned) cache); | 262 | soup_session_add_feature(session, (owned) cache); |
330 | 263 | ======= | ||
331 | 264 | #if VALAC_0_15 | ||
332 | 265 | session.add_feature((owned) cache); | ||
333 | 266 | #else | ||
334 | 267 | session.add_feature = (owned) cache; | ||
335 | 268 | #endif | ||
336 | 269 | >>>>>>> MERGE-SOURCE | ||
337 | 250 | } | 270 | } |
338 | 251 | } | 271 | } |
339 | 252 | 272 | ||
340 | 253 | 273 | ||
341 | === modified file 'libfenryxo/system.vala' | |||
342 | === modified file 'man/nuvolaplayer.1.xml' | |||
343 | --- man/nuvolaplayer.1.xml 2011-12-18 13:36:09 +0000 | |||
344 | +++ man/nuvolaplayer.1.xml 2012-06-15 15:20:27 +0000 | |||
345 | @@ -155,8 +155,7 @@ | |||
346 | 155 | <command>&dhpackage;</command> command.</para> | 155 | <command>&dhpackage;</command> command.</para> |
347 | 156 | <para><emphasis>Nuvola Player</emphasis> runs web interface of cloud music service | 156 | <para><emphasis>Nuvola Player</emphasis> runs web interface of cloud music service |
348 | 157 | in its own window and provides integration with a Linux desktop (system tray, | 157 | in its own window and provides integration with a Linux desktop (system tray, |
351 | 158 | Ubuntu sound menu, dock menu and notifications). Currently supported services are | 158 | Ubuntu sound menu, dock menu and notifications). |
350 | 159 | Google Music, Grooveshark, Hype Machine and 8tracks. | ||
352 | 160 | </para> | 159 | </para> |
353 | 161 | </refsect1> | 160 | </refsect1> |
354 | 162 | <refsect1 id="options"> | 161 | <refsect1 id="options"> |
355 | 163 | 162 | ||
356 | === modified file 'src/core/application.vala' | |||
357 | --- src/core/application.vala 2012-03-26 20:15:15 +0000 | |||
358 | +++ src/core/application.vala 2012-06-15 15:20:27 +0000 | |||
359 | @@ -116,11 +116,16 @@ | |||
360 | 116 | public override void run(){ | 116 | public override void run(){ |
361 | 117 | this.check_crashed(); | 117 | this.check_crashed(); |
362 | 118 | this.init_connection(); | 118 | this.init_connection(); |
363 | 119 | <<<<<<< TREE | ||
364 | 119 | this.set_up_page_cache(); | 120 | this.set_up_page_cache(); |
365 | 120 | ui_actions = new UIActions(this); | 121 | ui_actions = new UIActions(this); |
366 | 121 | view = new MainView(this); | 122 | view = new MainView(this); |
367 | 122 | 123 | ||
368 | 123 | this.player = new Player(this, this.storage); | 124 | this.player = new Player(this, this.storage); |
369 | 125 | ======= | ||
370 | 126 | WebKit.set_cache_model(WebKit.CacheModel.DOCUMENT_VIEWER); | ||
371 | 127 | this.frame = new MainView(this); | ||
372 | 128 | >>>>>>> MERGE-SOURCE | ||
373 | 124 | this.main_window = new MainWindow(this); | 129 | this.main_window = new MainWindow(this); |
374 | 125 | this.main_window.close_action.connect(this.on_close_action); | 130 | this.main_window.close_action.connect(this.on_close_action); |
375 | 126 | /* Show page title as window title */ | 131 | /* Show page title as window title */ |
376 | 127 | 132 | ||
377 | === modified file 'src/core/service.vala' | |||
378 | --- src/core/service.vala 2012-03-24 22:35:45 +0000 | |||
379 | +++ src/core/service.vala 2012-06-15 15:20:27 +0000 | |||
380 | @@ -272,6 +272,7 @@ | |||
381 | 272 | public static const string CONFIG_PREFIX = "service"; | 272 | public static const string CONFIG_PREFIX = "service"; |
382 | 273 | 273 | ||
383 | 274 | [Description(nick = "service identifier", blurb = "Unique identitier of service")] | 274 | [Description(nick = "service identifier", blurb = "Unique identitier of service")] |
384 | 275 | <<<<<<< TREE | ||
385 | 275 | public string id{ | 276 | public string id{ |
386 | 276 | get; | 277 | get; |
387 | 277 | private set; | 278 | private set; |
388 | @@ -366,7 +367,34 @@ | |||
389 | 366 | 367 | ||
390 | 367 | /** | 368 | /** |
391 | 368 | * Loads new service integration | 369 | * Loads new service integration |
392 | 370 | ======= | ||
393 | 371 | public string? id {get; private set; } | ||
394 | 372 | |||
395 | 373 | [Description(nick = "service name", blurb = "Full name of the service")] | ||
396 | 374 | public string? name {get; private set; } | ||
397 | 375 | |||
398 | 376 | //== Fields ==// | ||
399 | 377 | |||
400 | 378 | /** | ||
401 | 379 | * URI of file with selector template | ||
402 | 380 | */ | ||
403 | 381 | private string selector_uri = "file:///"; | ||
404 | 382 | private Application app; | ||
405 | 383 | private MainView frame; | ||
406 | 384 | /* main page of the web interface for music playback */ | ||
407 | 385 | private string home_url; | ||
408 | 386 | private string? prev_id = null; | ||
409 | 387 | private Storage storage; | ||
410 | 388 | private Regex? sandbox; | ||
411 | 389 | private bool skip_selector = false; | ||
412 | 390 | private File? selector_template; | ||
413 | 391 | private string[] blacklist; | ||
414 | 392 | |||
415 | 393 | /** | ||
416 | 394 | * Creates new Service. | ||
417 | 395 | >>>>>>> MERGE-SOURCE | ||
418 | 369 | * | 396 | * |
419 | 397 | <<<<<<< TREE | ||
420 | 370 | * @param id service id | 398 | * @param id service id |
421 | 371 | * @param version version of service integration | 399 | * @param version version of service integration |
422 | 372 | * @param integration integration script | 400 | * @param integration integration script |
423 | @@ -389,6 +417,87 @@ | |||
424 | 389 | "Empty 'sandbox_pattern' entry"); | 417 | "Empty 'sandbox_pattern' entry"); |
425 | 390 | } | 418 | } |
426 | 391 | 419 | ||
427 | 420 | ======= | ||
428 | 421 | * @param app main application obejct | ||
429 | 422 | * @param view the main webview | ||
430 | 423 | * @param storage storage wrapper | ||
431 | 424 | */ | ||
432 | 425 | public Service(Application app, MainView view, Storage storage){ | ||
433 | 426 | this.app = app; | ||
434 | 427 | this.frame = view; | ||
435 | 428 | this.storage = storage; | ||
436 | 429 | |||
437 | 430 | /* Look for selector template file. If found, store its uri. */ | ||
438 | 431 | this.selector_template = get_data_file(APPNAME + "/" + SELECTOR_TEMPLATE_PATH); | ||
439 | 432 | if(this.selector_template != null) this.selector_uri = this.selector_template.get_uri(); | ||
440 | 433 | |||
441 | 434 | if(WebKit.MAJOR_VERSION == 1 | ||
442 | 435 | && (WebKit.MINOR_VERSION == 7 || WebKit.MINOR_VERSION == 8)){ | ||
443 | 436 | blacklist = this.app.config.array("bug958154_blacklist"); | ||
444 | 437 | if(blacklist.length == 0){ | ||
445 | 438 | // Default blacklist for for LP:958154 | ||
446 | 439 | blacklist = {"pandora", "rdio", "googlemusic"}; | ||
447 | 440 | } | ||
448 | 441 | } | ||
449 | 442 | else{ | ||
450 | 443 | blacklist = this.app.config.array("services_blacklist"); | ||
451 | 444 | if(blacklist.length == 0){ | ||
452 | 445 | // Default blacklist | ||
453 | 446 | blacklist = {"googlemusic"}; | ||
454 | 447 | } | ||
455 | 448 | } | ||
456 | 449 | |||
457 | 450 | /* Load service from the last session or show service selector */ | ||
458 | 451 | var service = this.app.ui_state[CONFIG_PREFIX] ?? ""; | ||
459 | 452 | if(!(service in Service.list_services(blacklist))){ | ||
460 | 453 | service = null; | ||
461 | 454 | } | ||
462 | 455 | this.replace(service); | ||
463 | 456 | |||
464 | 457 | /* handle new page and new window requests to apply URL sandbox */ | ||
465 | 458 | this.frame.navigation_policy_decision_requested.connect(this.on_new_page); | ||
466 | 459 | this.frame.new_window_policy_decision_requested.connect(this.on_new_window); | ||
467 | 460 | |||
468 | 461 | /* Install service to newly created JavaScript environment | ||
469 | 462 | * and load scripts when page is loaded */ | ||
470 | 463 | this.frame.window_object_cleared.connect(this.install_service); | ||
471 | 464 | this.frame.document_load_finished.connect(this.on_frame_loaded); | ||
472 | 465 | } | ||
473 | 466 | |||
474 | 467 | //==== Public methods ====// | ||
475 | 468 | |||
476 | 469 | /** | ||
477 | 470 | * Disconnect service frowm view's signals | ||
478 | 471 | */ | ||
479 | 472 | public void disconnect_from_view(){ | ||
480 | 473 | this.frame.navigation_policy_decision_requested.disconnect(this.on_new_page); | ||
481 | 474 | this.frame.new_window_policy_decision_requested.disconnect(this.on_new_window); | ||
482 | 475 | this.frame.document_load_finished.disconnect(this.on_frame_loaded); | ||
483 | 476 | this.frame.window_object_cleared.disconnect(this.install_service); | ||
484 | 477 | } | ||
485 | 478 | |||
486 | 479 | /** | ||
487 | 480 | * Loads service interface or service selector | ||
488 | 481 | */ | ||
489 | 482 | public void load(){ | ||
490 | 483 | if(this.id == null){ | ||
491 | 484 | this.show_selector(); | ||
492 | 485 | return; | ||
493 | 486 | } | ||
494 | 487 | |||
495 | 488 | var uri = this.app.ui_state[CONFIG_PREFIX + "." + this.id + ".last_uri"] ?? this.home_url; | ||
496 | 489 | |||
497 | 490 | log_debug("Starting web interface for %s: %s", this.id, uri); | ||
498 | 491 | this.frame.open(uri); | ||
499 | 492 | this.prev_id = null; | ||
500 | 493 | this.service_loaded(this.id); | ||
501 | 494 | } | ||
502 | 495 | |||
503 | 496 | /** | ||
504 | 497 | * Shows service selector | ||
505 | 498 | */ | ||
506 | 499 | public void switch_service(){ | ||
507 | 500 | >>>>>>> MERGE-SOURCE | ||
508 | 392 | try{ | 501 | try{ |
509 | 393 | sandbox = new Regex(sandbox_pattern, | 502 | sandbox = new Regex(sandbox_pattern, |
510 | 394 | RegexCompileFlags.CASELESS | RegexCompileFlags.ANCHORED); | 503 | RegexCompileFlags.CASELESS | RegexCompileFlags.ANCHORED); |
511 | @@ -701,6 +810,451 @@ | |||
512 | 701 | //~ log_debug(@"Data changed: %s, %s, %s, %s, $playback_state, $can_prev, $can_next, $can_thumbs_up, $can_thumbs_down, $can_favorite", | 810 | //~ log_debug(@"Data changed: %s, %s, %s, %s, $playback_state, $can_prev, $can_next, $can_thumbs_up, $can_thumbs_down, $can_favorite", |
513 | 702 | //~ song ?? "null", artist ?? "null", album ?? "null", art_uri ?? "null"); | 811 | //~ song ?? "null", artist ?? "null", album ?? "null", art_uri ?? "null"); |
514 | 703 | } | 812 | } |
515 | 813 | <<<<<<< TREE | ||
516 | 814 | ======= | ||
517 | 815 | |||
518 | 816 | /** | ||
519 | 817 | * Emitted when service selector is shown | ||
520 | 818 | */ | ||
521 | 819 | public signal void selector_shown(); | ||
522 | 820 | |||
523 | 821 | /** | ||
524 | 822 | * Emitted if new service is loaded | ||
525 | 823 | * | ||
526 | 824 | * @param id service identifier | ||
527 | 825 | */ | ||
528 | 826 | public signal void service_loaded(string id); | ||
529 | 827 | |||
530 | 828 | //==== Private methods ====// | ||
531 | 829 | |||
532 | 830 | /** | ||
533 | 831 | * Replaces current service with new service or service selector. | ||
534 | 832 | * Service selector is shown is id is null or service has invalid | ||
535 | 833 | * metadata. | ||
536 | 834 | * | ||
537 | 835 | * @param id service identifier | ||
538 | 836 | */ | ||
539 | 837 | private void replace(string? id){ | ||
540 | 838 | Regex? sandbox = null; | ||
541 | 839 | string name = null; | ||
542 | 840 | string home_page = null; | ||
543 | 841 | |||
544 | 842 | if(id != null && read_metadata(id, out name, out home_page, | ||
545 | 843 | out sandbox, null, null, null)){ | ||
546 | 844 | this.id = id; | ||
547 | 845 | this.name = (owned)name; | ||
548 | 846 | this.home_url = (owned)home_page; | ||
549 | 847 | this.sandbox = sandbox; | ||
550 | 848 | return; | ||
551 | 849 | } | ||
552 | 850 | |||
553 | 851 | this.id = null; | ||
554 | 852 | this.show_selector(); | ||
555 | 853 | } | ||
556 | 854 | |||
557 | 855 | /** | ||
558 | 856 | * Create and show service selector | ||
559 | 857 | */ | ||
560 | 858 | private void show_selector(){ | ||
561 | 859 | // HTML string containing links to services and description | ||
562 | 860 | string items = ""; | ||
563 | 861 | string name; | ||
564 | 862 | foreach(string service in list_services(blacklist)){ | ||
565 | 863 | if(!read_metadata(service, out name, null, null, null, null, null)) continue; | ||
566 | 864 | items += SELECTOR_ITEM_TEMPLATE.printf( | ||
567 | 865 | service, name, | ||
568 | 866 | /// Shown in Service selector if service doesn't provide description | ||
569 | 867 | get_description(service) ?? _("No description provided for this service.")); | ||
570 | 868 | |||
571 | 869 | } | ||
572 | 870 | /// Shown as heading in Service selector | ||
573 | 871 | string subheading = _("Select cloud music service"); | ||
574 | 872 | |||
575 | 873 | string cancel_button; | ||
576 | 874 | if(this.prev_id != null){ | ||
577 | 875 | cancel_button = "<a class=\"cancel\" href=\"nuvola:%1$s\">%2$s</a>" | ||
578 | 876 | /// Shown as label of Cancel button in Service selector | ||
579 | 877 | .printf(this.prev_id, _("Cancel")); | ||
580 | 878 | } | ||
581 | 879 | else{ | ||
582 | 880 | cancel_button = ""; | ||
583 | 881 | } | ||
584 | 882 | |||
585 | 883 | // unowned string is used to avoid copying of SELECTOR_FALLBACK | ||
586 | 884 | // TODO: check the C code if it really works! | ||
587 | 885 | unowned string template; | ||
588 | 886 | string external_template; | ||
589 | 887 | |||
590 | 888 | if(selector_template == null){ | ||
591 | 889 | log_warning("Unable to find selector template '%s'", | ||
592 | 890 | SELECTOR_TEMPLATE_PATH); | ||
593 | 891 | template = SELECTOR_FALLBACK; | ||
594 | 892 | } | ||
595 | 893 | else{ | ||
596 | 894 | try{ | ||
597 | 895 | external_template = read_file(selector_template); | ||
598 | 896 | template = external_template; | ||
599 | 897 | } | ||
600 | 898 | catch(Error e){ | ||
601 | 899 | log_critical("Unable to load selector template '%s': %s", | ||
602 | 900 | selector_template.get_path(), e.message); | ||
603 | 901 | template = SELECTOR_FALLBACK; | ||
604 | 902 | } | ||
605 | 903 | |||
606 | 904 | } | ||
607 | 905 | |||
608 | 906 | this.skip_selector = true; // Used to break loop | ||
609 | 907 | |||
610 | 908 | this.frame.load_string( | ||
611 | 909 | template.printf(DISPLAY_NAME, subheading, cancel_button, items), | ||
612 | 910 | "text/html", "utf-8", selector_uri); | ||
613 | 911 | this.selector_shown(); | ||
614 | 912 | } | ||
615 | 913 | |||
616 | 914 | /** | ||
617 | 915 | * Decide whether open page in main view or in the default browser | ||
618 | 916 | */ | ||
619 | 917 | private bool on_new_page(WebFrame frame, NetworkRequest req, | ||
620 | 918 | WebNavigationAction action, WebPolicyDecision decision){ | ||
621 | 919 | if(frame != this.frame.get_main_frame()){ | ||
622 | 920 | // don't care about pages in <iframe> elements | ||
623 | 921 | return false; | ||
624 | 922 | } | ||
625 | 923 | |||
626 | 924 | string uri = req.get_uri(); | ||
627 | 925 | log_debug("New page request: URI: %s, frame URI: %s", | ||
628 | 926 | uri, frame.get_uri() ?? "null"); | ||
629 | 927 | |||
630 | 928 | |||
631 | 929 | if(this.id == null){ | ||
632 | 930 | // Behavior specific for service selector | ||
633 | 931 | if(uri == selector_uri){ | ||
634 | 932 | // Request to navigate to service selector | ||
635 | 933 | if(this.skip_selector){ | ||
636 | 934 | // this.show_selector() caused the new page request | ||
637 | 935 | this.skip_selector = false; | ||
638 | 936 | } | ||
639 | 937 | else{ | ||
640 | 938 | // reload button has been pressed | ||
641 | 939 | this.show_selector(); | ||
642 | 940 | } | ||
643 | 941 | return false; | ||
644 | 942 | } | ||
645 | 943 | else if(uri.has_prefix("nuvola:")){ | ||
646 | 944 | // Special prefix used in service selector | ||
647 | 945 | // to navigate to service | ||
648 | 946 | decision.ignore(); | ||
649 | 947 | var service = uri.substring(7); | ||
650 | 948 | this.app.ui_state[CONFIG_PREFIX] = service; | ||
651 | 949 | this.replace(service); | ||
652 | 950 | this.load(); | ||
653 | 951 | return true; | ||
654 | 952 | } | ||
655 | 953 | |||
656 | 954 | // Other pages (links to Wikipedia, etc.) | ||
657 | 955 | // are opened in default browser | ||
658 | 956 | open_uri_with_fallback(uri); | ||
659 | 957 | decision.ignore(); | ||
660 | 958 | return true; | ||
661 | 959 | } | ||
662 | 960 | |||
663 | 961 | |||
664 | 962 | |||
665 | 963 | /* Open Flash install page in default browser */ | ||
666 | 964 | if(uri.has_prefix("http://get.adobe.com/flashplayer")){ | ||
667 | 965 | open_uri_with_fallback(uri); | ||
668 | 966 | decision.ignore(); | ||
669 | 967 | return true; | ||
670 | 968 | } | ||
671 | 969 | |||
672 | 970 | // If page doesn't match sandbox, open it in default browser | ||
673 | 971 | if(!this.sandbox.match(uri)){ | ||
674 | 972 | open_uri_with_fallback(uri); | ||
675 | 973 | decision.ignore(); | ||
676 | 974 | return true; | ||
677 | 975 | } | ||
678 | 976 | |||
679 | 977 | this.app.ui_state[CONFIG_PREFIX + "." + this.id + ".last_uri"] = (owned) uri; | ||
680 | 978 | try{ | ||
681 | 979 | this.app.ui_state.save(); | ||
682 | 980 | } | ||
683 | 981 | catch(Error e){ | ||
684 | 982 | log_warning("Unable to save UI state: %s", e.message); | ||
685 | 983 | } | ||
686 | 984 | |||
687 | 985 | return false; | ||
688 | 986 | } | ||
689 | 987 | |||
690 | 988 | /** | ||
691 | 989 | * Open new window in the default web browser | ||
692 | 990 | */ | ||
693 | 991 | private bool on_new_window(WebFrame frame, NetworkRequest req, | ||
694 | 992 | WebNavigationAction action, WebPolicyDecision decision){ | ||
695 | 993 | unowned string uri = req.get_uri(); | ||
696 | 994 | log_debug("New window request: %s", uri); | ||
697 | 995 | |||
698 | 996 | if(this.sandbox.match(uri)){ | ||
699 | 997 | // Oh wait! This page belongs to the main wiew! | ||
700 | 998 | this.frame.open(uri); | ||
701 | 999 | } | ||
702 | 1000 | else{ | ||
703 | 1001 | open_uri_with_fallback(uri); | ||
704 | 1002 | } | ||
705 | 1003 | decision.ignore(); | ||
706 | 1004 | return true; | ||
707 | 1005 | } | ||
708 | 1006 | |||
709 | 1007 | /** | ||
710 | 1008 | * Installs JavaScript API binded to this service | ||
711 | 1009 | */ | ||
712 | 1010 | private void install_service(WebKit.WebFrame frame, void* context, void* window_object){ | ||
713 | 1011 | if(frame != this.frame.get_main_frame()) return; | ||
714 | 1012 | log_debug("Installing service to the new window object"); | ||
715 | 1013 | JSApi.install_service(context, window_object, this); | ||
716 | 1014 | this.frame.execute_script("window._Nuvola.log = window.console.log;"); | ||
717 | 1015 | } | ||
718 | 1016 | |||
719 | 1017 | /** | ||
720 | 1018 | * Executes scripts when frame is loaded. | ||
721 | 1019 | */ | ||
722 | 1020 | private void on_frame_loaded(WebFrame frame){ | ||
723 | 1021 | if(id == null) return; | ||
724 | 1022 | unowned string uri = frame.get_uri(); | ||
725 | 1023 | if(uri == null || frame != this.frame.get_main_frame()) return; | ||
726 | 1024 | this.load_scripts(); | ||
727 | 1025 | } | ||
728 | 1026 | |||
729 | 1027 | /** | ||
730 | 1028 | * Loads scripts for service view */ | ||
731 | 1029 | private void load_scripts(){ | ||
732 | 1030 | this.frame.load_script(SERVICES_DIRNAME + "/" + MAIN_SCRIPT_FILENAME); | ||
733 | 1031 | this.frame.load_script(SERVICES_DIRNAME + "/" | ||
734 | 1032 | + this.id + "/" + INTEGRATION_FILENAME); | ||
735 | 1033 | #if USERSCRIPTS_ENABLED | ||
736 | 1034 | this.frame.load_user_scripts(this.id); | ||
737 | 1035 | #endif | ||
738 | 1036 | } | ||
739 | 1037 | |||
740 | 1038 | |||
741 | 1039 | //== Static public fields ==// | ||
742 | 1040 | |||
743 | 1041 | /** | ||
744 | 1042 | * Prefix used for service configuration options. | ||
745 | 1043 | */ | ||
746 | 1044 | public static const string CONFIG_PREFIX = "service"; | ||
747 | 1045 | |||
748 | 1046 | //== Static private fields ==// | ||
749 | 1047 | |||
750 | 1048 | /** | ||
751 | 1049 | * Name of directory with service integrations. | ||
752 | 1050 | */ | ||
753 | 1051 | private static const string SERVICES_DIRNAME = "services"; | ||
754 | 1052 | |||
755 | 1053 | /** | ||
756 | 1054 | * Name of file with metadata. | ||
757 | 1055 | */ | ||
758 | 1056 | private static const string METADATA_FILENAME = "metadata.conf"; | ||
759 | 1057 | |||
760 | 1058 | /** | ||
761 | 1059 | * Name of file with service description in HTML. | ||
762 | 1060 | */ | ||
763 | 1061 | private static const string DESCRIPTION_FILENAME = "description.html"; | ||
764 | 1062 | |||
765 | 1063 | /** | ||
766 | 1064 | * Name of file with integration script. | ||
767 | 1065 | */ | ||
768 | 1066 | private static const string INTEGRATION_FILENAME = "integration.js"; | ||
769 | 1067 | |||
770 | 1068 | /** | ||
771 | 1069 | * Name of file with main script | ||
772 | 1070 | */ | ||
773 | 1071 | private static const string MAIN_SCRIPT_FILENAME = "main.js"; | ||
774 | 1072 | |||
775 | 1073 | /** | ||
776 | 1074 | * Path to file with HTML template for service selector. | ||
777 | 1075 | * Relative to Nuvola's data directory. | ||
778 | 1076 | */ | ||
779 | 1077 | private static const string SELECTOR_TEMPLATE_PATH = "selector/template.html"; | ||
780 | 1078 | |||
781 | 1079 | /** | ||
782 | 1080 | * Regular expression to check validity of service identifier | ||
783 | 1081 | */ | ||
784 | 1082 | private static Regex id_regex; | ||
785 | 1083 | |||
786 | 1084 | |||
787 | 1085 | //== Static public functions ==// | ||
788 | 1086 | |||
789 | 1087 | /** | ||
790 | 1088 | * Lists available services | ||
791 | 1089 | * | ||
792 | 1090 | * Note: use read_metadata() function to check if metadata file is valid | ||
793 | 1091 | * | ||
794 | 1092 | * @return array with identifiers of available services | ||
795 | 1093 | */ | ||
796 | 1094 | public static string[] list_services(string[] blacklist){ | ||
797 | 1095 | string[] result = {}; | ||
798 | 1096 | FileInfo file_info; | ||
799 | 1097 | foreach(weak File dir in get_data_dirs(APPNAME + "/" + SERVICES_DIRNAME)){ | ||
800 | 1098 | try{ | ||
801 | 1099 | var enumerator = dir.enumerate_children(FILE_ATTRIBUTE_STANDARD_NAME, 0); | ||
802 | 1100 | while((file_info = enumerator.next_file()) != null){ | ||
803 | 1101 | string name = file_info.get_name(); | ||
804 | 1102 | if(!check_id(name)) continue; | ||
805 | 1103 | if(name in result) continue; | ||
806 | 1104 | if(name in blacklist){ | ||
807 | 1105 | log_warning("Service %s is blacklisted.", name); | ||
808 | 1106 | continue; | ||
809 | 1107 | } | ||
810 | 1108 | var item = dir.get_child(name); | ||
811 | 1109 | if(item.query_file_type(0) != FileType.DIRECTORY) continue; | ||
812 | 1110 | if(item.get_child(INTEGRATION_FILENAME).query_file_type(0) != FileType.REGULAR) continue; | ||
813 | 1111 | if(item.get_child(METADATA_FILENAME).query_file_type(0) != FileType.REGULAR) continue; | ||
814 | 1112 | if(item.get_child(DESCRIPTION_FILENAME).query_file_type(0) != FileType.REGULAR) continue; | ||
815 | 1113 | |||
816 | 1114 | result += name; | ||
817 | 1115 | } | ||
818 | 1116 | } | ||
819 | 1117 | catch(Error e){ | ||
820 | 1118 | continue; // Not a directory? | ||
821 | 1119 | } | ||
822 | 1120 | } | ||
823 | 1121 | return result; | ||
824 | 1122 | } | ||
825 | 1123 | |||
826 | 1124 | /** | ||
827 | 1125 | * Loads description for service. Description is in HTML format. | ||
828 | 1126 | * | ||
829 | 1127 | * @param service Service id | ||
830 | 1128 | * @return description or null on failure | ||
831 | 1129 | */ | ||
832 | 1130 | public static string? get_description(string service){ | ||
833 | 1131 | var file = get_data_file(APPNAME + "/" + SERVICES_DIRNAME + "/" | ||
834 | 1132 | + service + "/" + DESCRIPTION_FILENAME); | ||
835 | 1133 | if(file == null){ | ||
836 | 1134 | log_warning("Unable to find description for service '%s'", service); | ||
837 | 1135 | return null; | ||
838 | 1136 | } | ||
839 | 1137 | try{ | ||
840 | 1138 | return read_file(file); | ||
841 | 1139 | } | ||
842 | 1140 | catch(Error e){ | ||
843 | 1141 | log_critical("Unable to read description file '%s': %s", | ||
844 | 1142 | file.get_path(), e.message); | ||
845 | 1143 | return null; | ||
846 | 1144 | } | ||
847 | 1145 | } | ||
848 | 1146 | |||
849 | 1147 | /** | ||
850 | 1148 | * Reads service integration metadata | ||
851 | 1149 | * | ||
852 | 1150 | * @param service_id service identifier | ||
853 | 1151 | * @param name name of the service | ||
854 | 1152 | * @param home_page main page of the web interface for music playback | ||
855 | 1153 | * @param sandbox pages not matching this regular expression will be opened in the default web browser | ||
856 | 1154 | * @param version version of the integration | ||
857 | 1155 | * @param maintainer_name name of the maintainer of the service integration | ||
858 | 1156 | * @param maintainer_link link to page with contact to maintainer | ||
859 | 1157 | * @return true if all metadata have been succesfully obtained, otherwise false | ||
860 | 1158 | */ | ||
861 | 1159 | public static bool read_metadata(string service_id, out string name, | ||
862 | 1160 | out string home_page, out Regex sandbox, out int version, | ||
863 | 1161 | out string maintainer_name, out string maintainer_link | ||
864 | 1162 | ){ | ||
865 | 1163 | var file = get_data_file(APPNAME + "/" | ||
866 | 1164 | + SERVICES_DIRNAME + "/" + service_id + "/" + METADATA_FILENAME); | ||
867 | 1165 | return read_metadata_from_file(file, out name, | ||
868 | 1166 | out home_page, out sandbox, out version, | ||
869 | 1167 | out maintainer_name, out maintainer_link); | ||
870 | 1168 | } | ||
871 | 1169 | |||
872 | 1170 | /** | ||
873 | 1171 | * Reads service integration metadata from file. | ||
874 | 1172 | * | ||
875 | 1173 | * @param metadata file with metadata | ||
876 | 1174 | * @param name name of the service (not id) | ||
877 | 1175 | * @param home_page main page of the web interface for music playback | ||
878 | 1176 | * @param sandbox pages not matching this regular expression will be opened in the default web browser | ||
879 | 1177 | * @param version version of the integration | ||
880 | 1178 | * @param maintainer_name name of the maintainer of the service integration | ||
881 | 1179 | * @param maintainer_link link to page with contact to maintainer | ||
882 | 1180 | * @return true if all metadata have been succesfully obtained, otherwise false | ||
883 | 1181 | */ | ||
884 | 1182 | public static bool read_metadata_from_file(File metadata, out string name, | ||
885 | 1183 | out string home_page, out Regex sandbox, out int version, | ||
886 | 1184 | out string maintainer_name, out string maintainer_link | ||
887 | 1185 | ){ | ||
888 | 1186 | bool valid = true; | ||
889 | 1187 | var map = new MapFile(metadata, true); | ||
890 | 1188 | name = map["name"] ?? ""; | ||
891 | 1189 | if(name == ""){ | ||
892 | 1190 | log_warning("Empty 'name' in %s", metadata.get_path()); | ||
893 | 1191 | valid = false; | ||
894 | 1192 | } | ||
895 | 1193 | |||
896 | 1194 | var sandbox_pattern = map["sandbox_pattern"] ?? ""; | ||
897 | 1195 | if(sandbox_pattern == ""){ | ||
898 | 1196 | log_warning("Empty 'sandbox_pattern' in %s", metadata.get_path()); | ||
899 | 1197 | valid = false; | ||
900 | 1198 | } | ||
901 | 1199 | |||
902 | 1200 | try{ | ||
903 | 1201 | sandbox = new Regex(sandbox_pattern, | ||
904 | 1202 | RegexCompileFlags.CASELESS | RegexCompileFlags.ANCHORED); | ||
905 | 1203 | log_debug("Valid 'sandbox_pattern = %s' in %s.", sandbox_pattern, metadata.get_path()); | ||
906 | 1204 | } | ||
907 | 1205 | catch(RegexError e){ | ||
908 | 1206 | log_warning("Invalid 'sandbox_pattern' in %s: %s", metadata.get_path(), e.message); | ||
909 | 1207 | sandbox = null; | ||
910 | 1208 | valid = false; | ||
911 | 1209 | } | ||
912 | 1210 | |||
913 | 1211 | maintainer_name = map["maintainer_name"] ?? ""; | ||
914 | 1212 | if(maintainer_name == ""){ | ||
915 | 1213 | log_warning("Empty 'maintainer_name' in %s", metadata.get_path()); | ||
916 | 1214 | valid = false; | ||
917 | 1215 | } | ||
918 | 1216 | |||
919 | 1217 | home_page = map["home_page"] ?? ""; | ||
920 | 1218 | if(!home_page.has_prefix("http://") | ||
921 | 1219 | && !home_page.has_prefix("https://")){ | ||
922 | 1220 | log_warning("Empty or invalid 'home_page' in %s", metadata.get_path()); | ||
923 | 1221 | valid = false; | ||
924 | 1222 | } | ||
925 | 1223 | |||
926 | 1224 | maintainer_link = map["maintainer_link"] ?? ""; | ||
927 | 1225 | if(!maintainer_link.has_prefix("http://") | ||
928 | 1226 | && !maintainer_link.has_prefix("https://")){ | ||
929 | 1227 | log_warning("Empty or invalid 'maintainer_link' in %s", metadata.get_path()); | ||
930 | 1228 | valid = false; | ||
931 | 1229 | } | ||
932 | 1230 | |||
933 | 1231 | version = map.get_int("version", 0); | ||
934 | 1232 | if(version <= 0){ | ||
935 | 1233 | log_warning("Invalid 'version' in %s", metadata.get_path()); | ||
936 | 1234 | valid = false; | ||
937 | 1235 | } | ||
938 | 1236 | |||
939 | 1237 | return valid; | ||
940 | 1238 | } | ||
941 | 1239 | |||
942 | 1240 | /** | ||
943 | 1241 | * Check if the service identifier is valid | ||
944 | 1242 | * | ||
945 | 1243 | * @param id service identifier | ||
946 | 1244 | * @return true if id is valid | ||
947 | 1245 | */ | ||
948 | 1246 | public static bool check_id(string id){ | ||
949 | 1247 | if(id_regex == null){ | ||
950 | 1248 | try{ | ||
951 | 1249 | id_regex = new Regex("^\\w+$"); | ||
952 | 1250 | } | ||
953 | 1251 | catch(RegexError e){ | ||
954 | 1252 | log_error("Unable to compile regular expression /^\\w+$/."); | ||
955 | 1253 | } | ||
956 | 1254 | } | ||
957 | 1255 | return id_regex.match(id); | ||
958 | 1256 | } | ||
959 | 1257 | >>>>>>> MERGE-SOURCE | ||
960 | 704 | } | 1258 | } |
961 | 705 | 1259 | ||
962 | 706 | 1260 | ||
963 | 707 | 1261 | ||
964 | === modified file 'src/core/settings.vala' | |||
965 | --- src/core/settings.vala 2012-03-03 21:44:20 +0000 | |||
966 | +++ src/core/settings.vala 2012-06-15 15:20:27 +0000 | |||
967 | @@ -38,6 +38,7 @@ | |||
968 | 38 | private const string NOTIFICATIONS = "notifications"; | 38 | private const string NOTIFICATIONS = "notifications"; |
969 | 39 | private const string DOCK_MANAGER = "dock_manager"; | 39 | private const string DOCK_MANAGER = "dock_manager"; |
970 | 40 | private const string UNITY_QUICK_LIST = "unity_quick_list"; | 40 | private const string UNITY_QUICK_LIST = "unity_quick_list"; |
971 | 41 | <<<<<<< TREE | ||
972 | 41 | private const string PAGE_CACHE = "page_cache"; | 42 | private const string PAGE_CACHE = "page_cache"; |
973 | 42 | private const string DATA_CACHE = "data_cache"; | 43 | private const string DATA_CACHE = "data_cache"; |
974 | 43 | private const string DATA_CACHE_SIZE = "data_cache_size"; | 44 | private const string DATA_CACHE_SIZE = "data_cache_size"; |
975 | @@ -45,6 +46,10 @@ | |||
976 | 45 | private const string WEB_PLUGINS = "web_plugins"; | 46 | private const string WEB_PLUGINS = "web_plugins"; |
977 | 46 | private const string SPACE_KEY = "space_key"; | 47 | private const string SPACE_KEY = "space_key"; |
978 | 47 | private const string SONG_LYRICS = "song_lyrics"; | 48 | private const string SONG_LYRICS = "song_lyrics"; |
979 | 49 | ======= | ||
980 | 50 | #endif | ||
981 | 51 | private const string SPACE_KEY = "space_key"; | ||
982 | 52 | >>>>>>> MERGE-SOURCE | ||
983 | 48 | } | 53 | } |
984 | 49 | 54 | ||
985 | 50 | 55 | ||
986 | @@ -75,6 +80,7 @@ | |||
987 | 75 | public abstract bool dock_manager{ get; set; } | 80 | public abstract bool dock_manager{ get; set; } |
988 | 76 | [Description(nick = "Unity Quick List", blurb = "Enables or disables dynamic quick list of Unity Launcher.")] | 81 | [Description(nick = "Unity Quick List", blurb = "Enables or disables dynamic quick list of Unity Launcher.")] |
989 | 77 | public abstract bool unity_quick_list{ get; set; } | 82 | public abstract bool unity_quick_list{ get; set; } |
990 | 83 | <<<<<<< TREE | ||
991 | 78 | [Description(nick = "Auto play", blurb = "Whether automatically start playback (if possible).")] | 84 | [Description(nick = "Auto play", blurb = "Whether automatically start playback (if possible).")] |
992 | 79 | public abstract bool auto_play{ get; set; } | 85 | public abstract bool auto_play{ get; set; } |
993 | 80 | [Description(nick = "Web plugins", blurb = "Whether web plugins are enabled.")] | 86 | [Description(nick = "Web plugins", blurb = "Whether web plugins are enabled.")] |
994 | @@ -89,6 +95,11 @@ | |||
995 | 89 | public abstract bool space_key{ get; set; } | 95 | public abstract bool space_key{ get; set; } |
996 | 90 | [Description(nick = "Fetch song lyrics", blurb = "Whether it is allowed to fetch song lyrics.")] | 96 | [Description(nick = "Fetch song lyrics", blurb = "Whether it is allowed to fetch song lyrics.")] |
997 | 91 | public abstract bool song_lyrics{ get; set; } | 97 | public abstract bool song_lyrics{ get; set; } |
998 | 98 | ======= | ||
999 | 99 | #endif | ||
1000 | 100 | [Description(nick = "Use space key", blurb = "Whether it is allowed to use space key in keybindings.")] | ||
1001 | 101 | public abstract bool space_key{ get; set; } | ||
1002 | 102 | >>>>>>> MERGE-SOURCE | ||
1003 | 92 | } | 103 | } |
1004 | 93 | 104 | ||
1005 | 94 | /** | 105 | /** |
1006 | @@ -210,6 +221,7 @@ | |||
1007 | 210 | 221 | ||
1008 | 211 | public bool unity_quick_list{ | 222 | public bool unity_quick_list{ |
1009 | 212 | get{ | 223 | get{ |
1010 | 224 | <<<<<<< TREE | ||
1011 | 213 | return get_bool(UNITY_QUICK_LIST, true); | 225 | return get_bool(UNITY_QUICK_LIST, true); |
1012 | 214 | } | 226 | } |
1013 | 215 | set{ | 227 | set{ |
1014 | @@ -285,5 +297,24 @@ | |||
1015 | 285 | set_bool(SONG_LYRICS, value); | 297 | set_bool(SONG_LYRICS, value); |
1016 | 286 | } | 298 | } |
1017 | 287 | } | 299 | } |
1018 | 300 | ======= | ||
1019 | 301 | return this.get_bool(UNITY_QUICK_LIST, true); | ||
1020 | 302 | } | ||
1021 | 303 | set{ | ||
1022 | 304 | this.set_bool(UNITY_QUICK_LIST, value); | ||
1023 | 305 | } | ||
1024 | 306 | } | ||
1025 | 307 | #endif | ||
1026 | 308 | |||
1027 | 309 | public bool space_key{ | ||
1028 | 310 | get{ | ||
1029 | 311 | return get_bool(SPACE_KEY, true); | ||
1030 | 312 | } | ||
1031 | 313 | |||
1032 | 314 | set{ | ||
1033 | 315 | set_bool(SPACE_KEY, value); | ||
1034 | 316 | } | ||
1035 | 317 | } | ||
1036 | 318 | >>>>>>> MERGE-SOURCE | ||
1037 | 288 | } | 319 | } |
1038 | 289 | } | 320 | } |
1039 | 290 | 321 | ||
1040 | === modified file 'src/core/storage.vala' | |||
1041 | === modified file 'src/gui/actions.vala' | |||
1042 | --- src/gui/actions.vala 2012-03-01 20:54:53 +0000 | |||
1043 | +++ src/gui/actions.vala 2012-06-15 15:20:27 +0000 | |||
1044 | @@ -31,6 +31,7 @@ | |||
1045 | 31 | TOOLBAR; | 31 | TOOLBAR; |
1046 | 32 | } | 32 | } |
1047 | 33 | 33 | ||
1048 | 34 | <<<<<<< TREE | ||
1049 | 34 | public class UIActions : Gtk.UIManager{ | 35 | public class UIActions : Gtk.UIManager{ |
1050 | 35 | private weak Application app; | 36 | private weak Application app; |
1051 | 36 | public UIActionsMode mode{ | 37 | public UIActionsMode mode{ |
1052 | @@ -43,6 +44,25 @@ | |||
1053 | 43 | 44 | ||
1054 | 44 | private bool _has_data_cache = true; | 45 | private bool _has_data_cache = true; |
1055 | 45 | public bool has_data_cache{ | 46 | public bool has_data_cache{ |
1056 | 47 | ======= | ||
1057 | 48 | public class Actions : GLib.Object{ | ||
1058 | 49 | private Application app; | ||
1059 | 50 | private Player player; | ||
1060 | 51 | private MainView frame; | ||
1061 | 52 | private ActionsMode mode = ActionsMode.MENUBAR; | ||
1062 | 53 | public Toolbar toolbar; | ||
1063 | 54 | public MenuBar menubar; | ||
1064 | 55 | private Gtk.Menu? menu; | ||
1065 | 56 | private Gtk.Action pp_action; | ||
1066 | 57 | private Gtk.Action action_next; | ||
1067 | 58 | private Gtk.Action action_prev; | ||
1068 | 59 | public Gtk.ActionGroup actions { get; private set;} | ||
1069 | 60 | private static Gtk.ActionEntry[] normal_entries; | ||
1070 | 61 | private static RadioActionEntry[] radio_entries; | ||
1071 | 62 | private Gtk.Window window; | ||
1072 | 63 | private bool _enable_navigation = true; | ||
1073 | 64 | public bool enable_navigation{ | ||
1074 | 65 | >>>>>>> MERGE-SOURCE | ||
1075 | 46 | get{ | 66 | get{ |
1076 | 47 | return this._has_data_cache; | 67 | return this._has_data_cache; |
1077 | 48 | } | 68 | } |
1078 | @@ -66,10 +86,37 @@ | |||
1079 | 66 | create_actions(); | 86 | create_actions(); |
1080 | 67 | insert_action_group(actions, 0); | 87 | insert_action_group(actions, 0); |
1081 | 68 | 88 | ||
1082 | 89 | app.config.notify["space-key"].connect_after(() => { | ||
1083 | 90 | uint key; | ||
1084 | 91 | Gdk.ModifierType mods; | ||
1085 | 92 | Gtk.accelerator_parse(get_pp_accel(), out key, out mods); | ||
1086 | 93 | Gtk.AccelMap.change_entry( | ||
1087 | 94 | "<Actions>/nuvola/toggle-play", key, mods, false); | ||
1088 | 95 | }); | ||
1089 | 69 | } | 96 | } |
1090 | 70 | 97 | ||
1091 | 98 | <<<<<<< TREE | ||
1092 | 71 | 99 | ||
1093 | 72 | private void create_actions(){ | 100 | private void create_actions(){ |
1094 | 101 | ======= | ||
1095 | 102 | public void set_mode(ActionsMode mode){ | ||
1096 | 103 | if(this.mode == mode) return; | ||
1097 | 104 | this.mode = mode; | ||
1098 | 105 | this.create(); | ||
1099 | 106 | } | ||
1100 | 107 | |||
1101 | 108 | private string get_pp_accel(){ | ||
1102 | 109 | return app.config.space_key ? "<ctrl>space" : "<ctrl>P"; | ||
1103 | 110 | } | ||
1104 | 111 | |||
1105 | 112 | private void update_navigation(){ | ||
1106 | 113 | this.actions.get_action("home").sensitive = this._enable_navigation; | ||
1107 | 114 | this.actions.get_action("back").sensitive = this._enable_navigation && this.frame.can_go_back(); | ||
1108 | 115 | this.actions.get_action("forward").sensitive = this._enable_navigation && this.frame.can_go_forward(); | ||
1109 | 116 | } | ||
1110 | 117 | |||
1111 | 118 | private void create(){ | ||
1112 | 119 | >>>>>>> MERGE-SOURCE | ||
1113 | 73 | /* | 120 | /* |
1114 | 74 | * NOTE: Vala supports easy creation of constant array of struct: | 121 | * NOTE: Vala supports easy creation of constant array of struct: |
1115 | 75 | 122 | ||
1116 | @@ -89,6 +136,13 @@ | |||
1117 | 89 | int i = 0; | 136 | int i = 0; |
1118 | 90 | 137 | ||
1119 | 91 | /* Normal items. Name, stock id, label, accelerator, tooltip, callback */ | 138 | /* Normal items. Name, stock id, label, accelerator, tooltip, callback */ |
1120 | 139 | <<<<<<< TREE | ||
1121 | 140 | ======= | ||
1122 | 141 | normal_entries = new Gtk.ActionEntry[29]; | ||
1123 | 142 | int i = 0; | ||
1124 | 143 | void* self = this; | ||
1125 | 144 | |||
1126 | 145 | >>>>>>> MERGE-SOURCE | ||
1127 | 92 | // Service | 146 | // Service |
1128 | 93 | /// Menu Service | 147 | /// Menu Service |
1129 | 94 | normal_entries[i++] = {"service", null, _("_Service"), null, null, null}; | 148 | normal_entries[i++] = {"service", null, _("_Service"), null, null, null}; |
1130 | @@ -99,6 +153,11 @@ | |||
1131 | 99 | // Control | 153 | // Control |
1132 | 100 | /// Menu Control | 154 | /// Menu Control |
1133 | 101 | normal_entries[i++] = {"control", null, _("_Control"), null, null, null}; | 155 | normal_entries[i++] = {"control", null, _("_Control"), null, null, null}; |
1134 | 156 | <<<<<<< TREE | ||
1135 | 157 | ======= | ||
1136 | 158 | normal_entries[i++] = {"prev", Stock.MEDIA_PREVIOUS, null, "<alt>Left", null, this.cb}; | ||
1137 | 159 | normal_entries[i++] = {"next", Stock.MEDIA_NEXT, null, "<alt>Right", null, this.cb}; | ||
1138 | 160 | >>>>>>> MERGE-SOURCE | ||
1139 | 102 | 161 | ||
1140 | 103 | // View | 162 | // View |
1141 | 104 | /// Menu View | 163 | /// Menu View |
1142 | @@ -158,6 +217,7 @@ | |||
1143 | 158 | action = new Gtk.Action("website", _("About release %s").printf(RELEASE), null, Gtk.Stock.INFO); | 217 | action = new Gtk.Action("website", _("About release %s").printf(RELEASE), null, Gtk.Stock.INFO); |
1144 | 159 | action.activate.connect(this.cb); | 218 | action.activate.connect(this.cb); |
1145 | 160 | actions.add_action(action); | 219 | actions.add_action(action); |
1146 | 220 | <<<<<<< TREE | ||
1147 | 161 | } | 221 | } |
1148 | 162 | 222 | ||
1149 | 163 | 223 | ||
1150 | @@ -172,6 +232,19 @@ | |||
1151 | 172 | ui_merge_id = 0; | 232 | ui_merge_id = 0; |
1152 | 173 | } | 233 | } |
1153 | 174 | 234 | ||
1154 | 235 | ======= | ||
1155 | 236 | |||
1156 | 237 | var manager = new UIManager(); | ||
1157 | 238 | |||
1158 | 239 | Gtk.Action play_pause_action; | ||
1159 | 240 | play_pause_action = new Gtk.Action("toggle-play", null, null, Gtk.Stock.MEDIA_PLAY); | ||
1160 | 241 | play_pause_action.activate.connect(this.cb); | ||
1161 | 242 | actions.add_action_with_accel(play_pause_action, get_pp_accel()); | ||
1162 | 243 | |||
1163 | 244 | manager.insert_action_group(actions, 0); | ||
1164 | 245 | var accels = manager.get_accel_group(); | ||
1165 | 246 | window.add_accel_group(accels); | ||
1166 | 247 | >>>>>>> MERGE-SOURCE | ||
1167 | 175 | string ui_file; | 248 | string ui_file; |
1168 | 176 | switch(this.mode){ | 249 | switch(this.mode){ |
1169 | 177 | case UIActionsMode.BOTH: ui_file = "/ui/actions_mode_both.xml"; break; | 250 | case UIActionsMode.BOTH: ui_file = "/ui/actions_mode_both.xml"; break; |
1170 | @@ -198,6 +271,7 @@ | |||
1171 | 198 | add_ui_request(); | 271 | add_ui_request(); |
1172 | 199 | 272 | ||
1173 | 200 | switch(this.mode){ | 273 | switch(this.mode){ |
1174 | 274 | <<<<<<< TREE | ||
1175 | 201 | case UIActionsMode.BOTH: | 275 | case UIActionsMode.BOTH: |
1176 | 202 | menubar = get_widget("/menubar") as Gtk.MenuBar; | 276 | menubar = get_widget("/menubar") as Gtk.MenuBar; |
1177 | 203 | toolbar = get_widget("/toolbar") as Gtk.Toolbar; | 277 | toolbar = get_widget("/toolbar") as Gtk.Toolbar; |
1178 | @@ -213,6 +287,17 @@ | |||
1179 | 213 | var nuvola_item = get_widget("/menubar/nuvola") as Gtk.MenuItem; | 287 | var nuvola_item = get_widget("/menubar/nuvola") as Gtk.MenuItem; |
1180 | 214 | menubar.remove(nuvola_item); | 288 | menubar.remove(nuvola_item); |
1181 | 215 | menubar = null; | 289 | menubar = null; |
1182 | 290 | ======= | ||
1183 | 291 | case ActionsMode.BOTH: | ||
1184 | 292 | this.menubar.show_all(); | ||
1185 | 293 | this.toolbar.show_all(); | ||
1186 | 294 | break; | ||
1187 | 295 | case ActionsMode.TOOLBAR: | ||
1188 | 296 | this.menubar.hide(); | ||
1189 | 297 | this.toolbar.show_all(); | ||
1190 | 298 | var nuvola_item = manager.get_widget("/menubar/nuvola") as Gtk.MenuItem; | ||
1191 | 299 | this.menubar.remove(nuvola_item); | ||
1192 | 300 | >>>>>>> MERGE-SOURCE | ||
1193 | 216 | this.menu = nuvola_item.submenu; | 301 | this.menu = nuvola_item.submenu; |
1194 | 217 | nuvola_item.submenu = null; | 302 | nuvola_item.submenu = null; |
1195 | 218 | toolbar = get_widget("/toolbar") as Gtk.Toolbar; | 303 | toolbar = get_widget("/toolbar") as Gtk.Toolbar; |
1196 | 219 | 304 | ||
1197 | === modified file 'src/gui/preferences.vala' | |||
1198 | --- src/gui/preferences.vala 2012-03-26 20:22:28 +0000 | |||
1199 | +++ src/gui/preferences.vala 2012-06-15 15:20:27 +0000 | |||
1200 | @@ -155,6 +155,7 @@ | |||
1201 | 155 | this.hide_window_buttons[2].toggled.connect(this.hide_window_toggled); | 155 | this.hide_window_buttons[2].toggled.connect(this.hide_window_toggled); |
1202 | 156 | 156 | ||
1203 | 157 | /// Settings dialog - tab General | 157 | /// Settings dialog - tab General |
1204 | 158 | <<<<<<< TREE | ||
1205 | 158 | var space_key = new Gtk.CheckButton.with_label(_("Enable keybindings with Space key.")); | 159 | var space_key = new Gtk.CheckButton.with_label(_("Enable keybindings with Space key.")); |
1206 | 159 | space_key.active = app.config.space_key; | 160 | space_key.active = app.config.space_key; |
1207 | 160 | space_key.toggled.connect(() => { | 161 | space_key.toggled.connect(() => { |
1208 | @@ -163,6 +164,43 @@ | |||
1209 | 163 | box.pack_start(space_key, false, false, 10); | 164 | box.pack_start(space_key, false, false, 10); |
1210 | 164 | 165 | ||
1211 | 165 | 166 | ||
1212 | 167 | ======= | ||
1213 | 168 | label = new Label(_("Show tray icon")); | ||
1214 | 169 | label.xalign = 0.0f; | ||
1215 | 170 | box.pack_start(label, false, false, 10); | ||
1216 | 171 | this.tray_buttons = new RadioButton[3]; | ||
1217 | 172 | /// Settings dialog - tab General, always show tray icon | ||
1218 | 173 | this.tray_buttons[0] = new RadioButton.with_label(null, _("Always")); | ||
1219 | 174 | box.pack_start(this.tray_buttons[0], false, false, 0); | ||
1220 | 175 | /// Settings dialog - tab General, show tray icon if needed | ||
1221 | 176 | this.tray_buttons[1] = new RadioButton.with_label(this.tray_buttons[0].get_group(), _("If needed")); | ||
1222 | 177 | box.pack_start(this.tray_buttons[1], false, false, 0); | ||
1223 | 178 | /// Settings dialog - tab General, never show tray icon | ||
1224 | 179 | this.tray_buttons[2] = new RadioButton.with_label(this.tray_buttons[0].get_group(), _("Never")); | ||
1225 | 180 | box.pack_start(this.tray_buttons[2], false, false, 0); | ||
1226 | 181 | |||
1227 | 182 | |||
1228 | 183 | switch(this.app.config.tray_icon){ | ||
1229 | 184 | case TrayIconMode.ALWAYS: this.tray_buttons[0].active = true; break; | ||
1230 | 185 | case TrayIconMode.NEVER: this.tray_buttons[2].active = true; break; | ||
1231 | 186 | default: this.tray_buttons[1].active = true; break; | ||
1232 | 187 | } | ||
1233 | 188 | |||
1234 | 189 | this.tray_buttons[0].toggled.connect(this.tray_toggled); | ||
1235 | 190 | this.tray_buttons[1].toggled.connect(this.tray_toggled); | ||
1236 | 191 | this.tray_buttons[2].toggled.connect(this.tray_toggled); | ||
1237 | 192 | |||
1238 | 193 | var space_key = new Gtk.CheckButton.with_label(_("Enable keybindings with Space key.")); | ||
1239 | 194 | space_key.active = app.config.space_key; | ||
1240 | 195 | space_key.toggled.connect(() => { | ||
1241 | 196 | app.config.space_key = space_key.active; | ||
1242 | 197 | }); | ||
1243 | 198 | box.pack_start(space_key, false, false, 10); | ||
1244 | 199 | |||
1245 | 200 | |||
1246 | 201 | |||
1247 | 202 | |||
1248 | 203 | >>>>>>> MERGE-SOURCE | ||
1249 | 166 | box = new Gtk.VBox(false, 2); | 204 | box = new Gtk.VBox(false, 2); |
1250 | 167 | box.border_width = 10; | 205 | box.border_width = 10; |
1251 | 168 | /// Settings dialog tab | 206 | /// Settings dialog tab |
1252 | 169 | 207 | ||
1253 | === modified file 'src/gui/windows.vala' | |||
1254 | --- src/gui/windows.vala 2012-04-26 19:38:00 +0000 | |||
1255 | +++ src/gui/windows.vala 2012-06-15 15:20:27 +0000 | |||
1256 | @@ -69,8 +69,13 @@ | |||
1257 | 69 | 69 | ||
1258 | 70 | if(DEV_CHANNEL == "unstable"){ | 70 | if(DEV_CHANNEL == "unstable"){ |
1259 | 71 | /// Warning for unstable builds, %1$s = version, %2$s and %3$s = links | 71 | /// Warning for unstable builds, %1$s = version, %2$s and %3$s = links |
1260 | 72 | <<<<<<< TREE | ||
1261 | 72 | var dev_label = new Gtk.Label(_("You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in <a href='%4$s'>stable and beta builds</a>.</i>") | 73 | var dev_label = new Gtk.Label(_("You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in <a href='%4$s'>stable and beta builds</a>.</i>") |
1262 | 73 | .printf(app.version, "http://goo.gl/SvtXK", "http://l.fenryxo.cz/nuvolachangelog", "http://projects.fenryxo.cz/Nuvola_Player/Download/")); | 74 | .printf(app.version, "http://goo.gl/SvtXK", "http://l.fenryxo.cz/nuvolachangelog", "http://projects.fenryxo.cz/Nuvola_Player/Download/")); |
1263 | 75 | ======= | ||
1264 | 76 | var dev_label = new Label(_("You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in <a href='%4$s'>stable and beta builds</a>.</i>") | ||
1265 | 77 | .printf(app.version, "http://goo.gl/SvtXK", "http://l.fenryxo.cz/nuvolachangelog", "http://projects.fenryxo.cz/Nuvola_Player/Download/")); | ||
1266 | 78 | >>>>>>> MERGE-SOURCE | ||
1267 | 74 | dev_label.selectable = true; | 79 | dev_label.selectable = true; |
1268 | 75 | dev_label.use_markup = true; | 80 | dev_label.use_markup = true; |
1269 | 76 | dev_label.can_focus = false; | 81 | dev_label.can_focus = false; |
1270 | @@ -110,25 +115,41 @@ | |||
1271 | 110 | 115 | ||
1272 | 111 | base.add(this.box); | 116 | base.add(this.box); |
1273 | 112 | this.box.show_all(); | 117 | this.box.show_all(); |
1274 | 113 | |||
1275 | 114 | 118 | ||
1276 | 115 | /* Restore last window state */ | ||
1277 | 116 | int w = 0; | 119 | int w = 0; |
1278 | 117 | int h = 0; | 120 | int h = 0; |
1284 | 118 | var opt_w = this.app.ui_state["window_w"]; | 121 | string? opt_w; |
1285 | 119 | if(opt_w != null) w = int.parse(opt_w); | 122 | string? opt_h; |
1281 | 120 | var opt_h = this.app.ui_state["window_h"]; | ||
1282 | 121 | if(opt_h != null) h = int.parse(opt_h); | ||
1283 | 122 | this.set_default_size(w > 0 ? w: 1010, h > 0 ? h : 600); | ||
1286 | 123 | 123 | ||
1291 | 124 | var opt_x = this.app.ui_state["window_x"]; | 124 | if(WebKit.MAJOR_VERSION == 1 |
1292 | 125 | var opt_y = this.app.ui_state["window_y"]; | 125 | && (WebKit.MINOR_VERSION == 7 || WebKit.MINOR_VERSION == 8)){ |
1293 | 126 | if(opt_x != null && opt_y != null){ | 126 | // Workaround for LP:958154 |
1294 | 127 | this.move(int.parse(opt_x), int.parse(opt_y)); | 127 | opt_w = this.app.ui_state["bug958154_window_w"]; |
1295 | 128 | if(opt_w != null) w = int.parse(opt_w); | ||
1296 | 129 | opt_h = this.app.ui_state["bug958154_window_h"]; | ||
1297 | 130 | if(opt_h != null) h = int.parse(opt_h); | ||
1298 | 131 | w = w > 0 ? w: 1010; | ||
1299 | 132 | h = h > 0 ? h : 534; | ||
1300 | 133 | log_warning("Bug 958154 window size: %d×%d", w, h); | ||
1301 | 134 | this.set_default_size(w, h); | ||
1302 | 128 | } | 135 | } |
1306 | 129 | 136 | else{ | |
1307 | 130 | if(this.app.ui_state.get_bool("window_maximized", false)){ | 137 | /* Restore last window state */ |
1308 | 131 | this.maximize(); | 138 | opt_w = this.app.ui_state["window_w"]; |
1309 | 139 | if(opt_w != null) w = int.parse(opt_w); | ||
1310 | 140 | opt_h = this.app.ui_state["window_h"]; | ||
1311 | 141 | if(opt_h != null) h = int.parse(opt_h); | ||
1312 | 142 | this.set_default_size(w > 0 ? w: 1010, h > 0 ? h : 600); | ||
1313 | 143 | |||
1314 | 144 | var opt_x = this.app.ui_state["window_x"]; | ||
1315 | 145 | var opt_y = this.app.ui_state["window_y"]; | ||
1316 | 146 | if(opt_x != null && opt_y != null){ | ||
1317 | 147 | this.move(int.parse(opt_x), int.parse(opt_y)); | ||
1318 | 148 | } | ||
1319 | 149 | |||
1320 | 150 | if(this.app.ui_state.get_bool("window_maximized", false)){ | ||
1321 | 151 | this.maximize(); | ||
1322 | 152 | } | ||
1323 | 132 | } | 153 | } |
1324 | 133 | 154 | ||
1325 | 134 | 155 | ||
1326 | @@ -253,11 +274,19 @@ | |||
1327 | 253 | } | 274 | } |
1328 | 254 | 275 | ||
1329 | 255 | public class CrashDialog: Gtk.Dialog{ | 276 | public class CrashDialog: Gtk.Dialog{ |
1330 | 277 | <<<<<<< TREE | ||
1331 | 256 | public Gtk.CheckButton reset_config; | 278 | public Gtk.CheckButton reset_config; |
1332 | 257 | public Gtk.CheckButton reset_ui_state; | 279 | public Gtk.CheckButton reset_ui_state; |
1333 | 258 | public Gtk.CheckButton purge_cookies; | 280 | public Gtk.CheckButton purge_cookies; |
1334 | 259 | public Gtk.CheckButton? disable_proxy; | 281 | public Gtk.CheckButton? disable_proxy; |
1335 | 260 | public Gtk.CheckButton disable_check; | 282 | public Gtk.CheckButton disable_check; |
1336 | 283 | ======= | ||
1337 | 284 | public CheckButton reset_config; | ||
1338 | 285 | public CheckButton reset_ui_state; | ||
1339 | 286 | public CheckButton purge_cookies; | ||
1340 | 287 | public CheckButton? disable_proxy; | ||
1341 | 288 | public CheckButton disable_check; | ||
1342 | 289 | >>>>>>> MERGE-SOURCE | ||
1343 | 261 | 290 | ||
1344 | 262 | #if LIBSOUP_CACHE | 291 | #if LIBSOUP_CACHE |
1345 | 263 | public Gtk.CheckButton purge_browser; | 292 | public Gtk.CheckButton purge_browser; |
1346 | @@ -335,6 +364,7 @@ | |||
1347 | 335 | label.use_markup = true; | 364 | label.use_markup = true; |
1348 | 336 | label.wrap_mode = Pango.WrapMode.WORD; | 365 | label.wrap_mode = Pango.WrapMode.WORD; |
1349 | 337 | label.wrap = true; | 366 | label.wrap = true; |
1350 | 367 | <<<<<<< TREE | ||
1351 | 338 | label.justify = Gtk.Justification.FILL; | 368 | label.justify = Gtk.Justification.FILL; |
1352 | 339 | 369 | ||
1353 | 340 | content.pack_start(label, true, true, 0); | 370 | content.pack_start(label, true, true, 0); |
1354 | @@ -360,6 +390,33 @@ | |||
1355 | 360 | /// Crash dialog | 390 | /// Crash dialog |
1356 | 361 | this.disable_check = new Gtk.CheckButton.with_label(_("Do not show crash dialog again.")); | 391 | this.disable_check = new Gtk.CheckButton.with_label(_("Do not show crash dialog again.")); |
1357 | 362 | box.pack_start(this.disable_check, false, false, 0); | 392 | box.pack_start(this.disable_check, false, false, 0); |
1358 | 393 | ======= | ||
1359 | 394 | label.justify = Justification.FILL; | ||
1360 | 395 | |||
1361 | 396 | content.pack_start(label, true, true, 0); | ||
1362 | 397 | |||
1363 | 398 | label = new Label( | ||
1364 | 399 | /// Crash dialog | ||
1365 | 400 | _("Another cause may be session/login manager, if it doesn't notify Nuvola Player to quit properly when user is about to logout.") | ||
1366 | 401 | ); | ||
1367 | 402 | label.xalign = 0; | ||
1368 | 403 | label.xpad = 15; | ||
1369 | 404 | label.ypad = 0; | ||
1370 | 405 | label.use_markup = true; | ||
1371 | 406 | label.wrap_mode = Pango.WrapMode.WORD; | ||
1372 | 407 | label.wrap = true; | ||
1373 | 408 | label.justify = Justification.FILL; | ||
1374 | 409 | |||
1375 | 410 | content.pack_start(label, true, true, 0); | ||
1376 | 411 | |||
1377 | 412 | box = new VBox(false, 0); | ||
1378 | 413 | box.border_width = 15; | ||
1379 | 414 | content.pack_start(box, false, false, 0); | ||
1380 | 415 | |||
1381 | 416 | /// Crash dialog | ||
1382 | 417 | this.disable_check = new CheckButton.with_label(_("Do not show crash dialog again.")); | ||
1383 | 418 | box.pack_start(this.disable_check, false, false, 0); | ||
1384 | 419 | >>>>>>> MERGE-SOURCE | ||
1385 | 363 | content.show_all(); | 420 | content.show_all(); |
1386 | 364 | 421 | ||
1387 | 365 | } | 422 | } |
1388 | 366 | 423 | ||
1389 | === modified file 'src/plugins/media_keys.vala' | |||
1390 | --- src/plugins/media_keys.vala 2012-03-24 22:48:53 +0000 | |||
1391 | +++ src/plugins/media_keys.vala 2012-06-15 15:20:27 +0000 | |||
1392 | @@ -169,8 +169,14 @@ | |||
1393 | 169 | this.media_keys = Bus.get_proxy_sync(BusType.SESSION, | 169 | this.media_keys = Bus.get_proxy_sync(BusType.SESSION, |
1394 | 170 | "org.gnome.SettingsDaemon", | 170 | "org.gnome.SettingsDaemon", |
1395 | 171 | "/org/gnome/SettingsDaemon/MediaKeys"); | 171 | "/org/gnome/SettingsDaemon/MediaKeys"); |
1396 | 172 | <<<<<<< TREE | ||
1397 | 172 | /* Vala includes "return false" if DBus method call fails! */ | 173 | /* Vala includes "return false" if DBus method call fails! */ |
1398 | 173 | this.media_keys.grab_media_player_keys(app.app_name, 0); | 174 | this.media_keys.grab_media_player_keys(app.app_name, 0); |
1399 | 175 | ======= | ||
1400 | 176 | |||
1401 | 177 | /* Vala includes "return false" if DBus method call fails! */ | ||
1402 | 178 | this.media_keys.grab_media_player_keys(this.app_name, 0); | ||
1403 | 179 | >>>>>>> MERGE-SOURCE | ||
1404 | 174 | this.media_keys.media_player_key_pressed.connect(this.on_media_key_pressed); | 180 | this.media_keys.media_player_key_pressed.connect(this.on_media_key_pressed); |
1405 | 175 | return true; | 181 | return true; |
1406 | 176 | 182 | ||
1407 | 177 | 183 | ||
1408 | === modified file 'src/plugins/mpris.vala' | |||
1409 | === modified file 'src/plugins/trayicon.vala' | |||
1410 | --- src/plugins/trayicon.vala 2012-02-19 17:19:24 +0000 | |||
1411 | +++ src/plugins/trayicon.vala 2012-06-15 15:20:27 +0000 | |||
1412 | @@ -55,6 +55,7 @@ | |||
1413 | 55 | * | 55 | * |
1414 | 56 | * The tray icon is shown only if Ubuntu Sound menu is not detected. | 56 | * The tray icon is shown only if Ubuntu Sound menu is not detected. |
1415 | 57 | */ | 57 | */ |
1416 | 58 | <<<<<<< TREE | ||
1417 | 58 | public class Plugin: Object, Nuvola.Plugin{ | 59 | public class Plugin: Object, Nuvola.Plugin{ |
1418 | 59 | private string id = "trayicon"; | 60 | private string id = "trayicon"; |
1419 | 60 | private weak Nuvola.Application app; | 61 | private weak Nuvola.Application app; |
1420 | @@ -65,6 +66,42 @@ | |||
1421 | 65 | public string get_id(){ | 66 | public string get_id(){ |
1422 | 66 | return id; | 67 | return id; |
1423 | 67 | } | 68 | } |
1424 | 69 | ======= | ||
1425 | 70 | public class TrayIcon: BaseHelper{ | ||
1426 | 71 | [Description(nick = "Availibility of hide action.", blurb = "If true the main window can be hidden to a tray icon or Ubuntu Sound menu.")] | ||
1427 | 72 | public bool can_hide{ | ||
1428 | 73 | get{ | ||
1429 | 74 | #if GLIB_DBUS | ||
1430 | 75 | return this.ubuntu_sound_menu.visible || this.icon != null; | ||
1431 | 76 | #else | ||
1432 | 77 | return this.icon != null; | ||
1433 | 78 | #endif | ||
1434 | 79 | |||
1435 | 80 | } | ||
1436 | 81 | } | ||
1437 | 82 | |||
1438 | 83 | private TrayIconMode _mode; | ||
1439 | 84 | [Description(nick = "TrayIcon mode.", blurb = "Specifies visibility ob the tray icon")] | ||
1440 | 85 | public TrayIconMode mode{ | ||
1441 | 86 | get{ | ||
1442 | 87 | return this._mode; | ||
1443 | 88 | } | ||
1444 | 89 | set{ | ||
1445 | 90 | this._mode = value; | ||
1446 | 91 | this.update(); | ||
1447 | 92 | } | ||
1448 | 93 | } | ||
1449 | 94 | |||
1450 | 95 | private Gtk.Menu? menu; | ||
1451 | 96 | private StatusIcon? icon; | ||
1452 | 97 | #if GLIB_DBUS | ||
1453 | 98 | private UbuntuSoundMenu ubuntu_sound_menu; | ||
1454 | 99 | // It will be set to false if Ubuntu Sound Menu is not found | ||
1455 | 100 | private bool icon_needed = false; | ||
1456 | 101 | #else | ||
1457 | 102 | private bool icon_needed = true; | ||
1458 | 103 | #endif | ||
1459 | 104 | >>>>>>> MERGE-SOURCE | ||
1460 | 68 | 105 | ||
1461 | 69 | /** | 106 | /** |
1462 | 70 | * Loads Tray icon | 107 | * Loads Tray icon |
1463 | 71 | 108 | ||
1464 | === modified file 'translations/LINGUAS' | |||
1465 | --- translations/LINGUAS 2012-02-13 19:25:11 +0000 | |||
1466 | +++ translations/LINGUAS 2012-06-15 15:20:27 +0000 | |||
1467 | @@ -3,11 +3,13 @@ | |||
1468 | 3 | ca@valencia | 3 | ca@valencia |
1469 | 4 | cs | 4 | cs |
1470 | 5 | de | 5 | de |
1471 | 6 | el | ||
1472 | 6 | en_GB | 7 | en_GB |
1473 | 7 | es | 8 | es |
1474 | 8 | et | 9 | et |
1475 | 9 | fi | 10 | fi |
1476 | 10 | fr | 11 | fr |
1477 | 12 | hu | ||
1478 | 11 | ia | 13 | ia |
1479 | 12 | it | 14 | it |
1480 | 13 | ja | 15 | ja |
1481 | @@ -19,6 +21,13 @@ | |||
1482 | 19 | pt | 21 | pt |
1483 | 20 | ru | 22 | ru |
1484 | 21 | sl | 23 | sl |
1485 | 24 | sq | ||
1486 | 22 | sv | 25 | sv |
1489 | 23 | te | 26 | <<<<<<< TREE |
1490 | 24 | tr | 27 | te |
1491 | 28 | tr | ||
1492 | 29 | ======= | ||
1493 | 30 | te | ||
1494 | 31 | tr | ||
1495 | 32 | zh_CN | ||
1496 | 33 | >>>>>>> MERGE-SOURCE | ||
1497 | 25 | 34 | ||
1498 | === added file 'translations/el.po' | |||
1499 | --- translations/el.po 1970-01-01 00:00:00 +0000 | |||
1500 | +++ translations/el.po 2012-06-15 15:20:27 +0000 | |||
1501 | @@ -0,0 +1,453 @@ | |||
1502 | 1 | # Greek translation for nuvola-player | ||
1503 | 2 | # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 | ||
1504 | 3 | # This file is distributed under the same license as the nuvola-player package. | ||
1505 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2012. | ||
1506 | 5 | # | ||
1507 | 6 | msgid "" | ||
1508 | 7 | msgstr "" | ||
1509 | 8 | "Project-Id-Version: nuvola-player\n" | ||
1510 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
1511 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | ||
1512 | 11 | "PO-Revision-Date: 2012-02-28 16:42+0000\n" | ||
1513 | 12 | "Last-Translator: Stathis Iosifidis <Unknown>\n" | ||
1514 | 13 | "Language-Team: Greek <el@li.org>\n" | ||
1515 | 14 | "MIME-Version: 1.0\n" | ||
1516 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1517 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
1518 | 17 | "X-Launchpad-Export-Date: 2012-02-29 05:23+0000\n" | ||
1519 | 18 | "X-Generator: Launchpad (build 14874)\n" | ||
1520 | 19 | |||
1521 | 20 | #. / Shown if unsupported command line argument is used | ||
1522 | 21 | #: src/main.vala:194 | ||
1523 | 22 | msgid "Error: Option parsing failed:" | ||
1524 | 23 | msgstr "Σφάλμα: Αποτυχία Ανάλυσης Επιλογών:" | ||
1525 | 24 | |||
1526 | 25 | #. / Short label for command 'start or resume playback' | ||
1527 | 26 | #: src/player.vala:57 | ||
1528 | 27 | msgid "Play" | ||
1529 | 28 | msgstr "Αναπαραγωγή" | ||
1530 | 29 | |||
1531 | 30 | #. / Short label for command 'pause playback' | ||
1532 | 31 | #: src/player.vala:59 | ||
1533 | 32 | msgid "Pause" | ||
1534 | 33 | msgstr "Παύση" | ||
1535 | 34 | |||
1536 | 35 | #. / Short label for command 'skip to previous song' | ||
1537 | 36 | #: src/player.vala:61 | ||
1538 | 37 | msgid "Previous song" | ||
1539 | 38 | msgstr "Προηγούμενο τραγούδι" | ||
1540 | 39 | |||
1541 | 40 | #. / Short label for command 'skip to next song' | ||
1542 | 41 | #: src/player.vala:63 | ||
1543 | 42 | msgid "Next song" | ||
1544 | 43 | msgstr "Επόμενο τραγούδι" | ||
1545 | 44 | |||
1546 | 45 | #. / Short label for command 'thumb up' or 'like this song' (see Google Music buttons) | ||
1547 | 46 | #: src/player.vala:65 | ||
1548 | 47 | msgid "Thumbs Up" | ||
1549 | 48 | msgstr "Μου αρέσει" | ||
1550 | 49 | |||
1551 | 50 | #. / Short label for command 'thumb down' or 'dislike this song' (see Google Music buttons) | ||
1552 | 51 | #: src/player.vala:67 | ||
1553 | 52 | msgid "Thumbs Down" | ||
1554 | 53 | msgstr "Δεν μου αρέσει" | ||
1555 | 54 | |||
1556 | 55 | #. / Short label for command 'add this song to favorites' | ||
1557 | 56 | #: src/player.vala:69 | ||
1558 | 57 | msgid "Favorite" | ||
1559 | 58 | msgstr "Αγαπημένο" | ||
1560 | 59 | |||
1561 | 60 | #. / Short label for command 'quit application' | ||
1562 | 61 | #: src/player.vala:71 | ||
1563 | 62 | msgid "Quit" | ||
1564 | 63 | msgstr "Έξοδος" | ||
1565 | 64 | |||
1566 | 65 | #. / Initial notification | ||
1567 | 66 | #: src/player.vala:166 | ||
1568 | 67 | msgid "Version" | ||
1569 | 68 | msgstr "Έκδοση" | ||
1570 | 69 | |||
1571 | 70 | #. / Shown in notification if both artist and album are unknown | ||
1572 | 71 | #: src/player.vala:301 | ||
1573 | 72 | msgid "by unknown artist" | ||
1574 | 73 | msgstr "κατά άγνωστο καλλιτέχνη" | ||
1575 | 74 | |||
1576 | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name | ||
1577 | 76 | #: src/player.vala:305 | ||
1578 | 77 | msgid "by unknown artist from %s" | ||
1579 | 78 | msgstr "κατά άγνωστο καλλιτέχνη από %s" | ||
1580 | 79 | |||
1581 | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name | ||
1582 | 81 | #: src/player.vala:309 | ||
1583 | 82 | msgid "by %s" | ||
1584 | 83 | msgstr "κατά %s" | ||
1585 | 84 | |||
1586 | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name | ||
1587 | 86 | #: src/player.vala:313 | ||
1588 | 87 | msgid "by %1$s from %2$s" | ||
1589 | 88 | msgstr "κατά %1$s από %2$s" | ||
1590 | 89 | |||
1591 | 90 | #. / Shown in Service selector if service doesn't provide description | ||
1592 | 91 | #: src/service.vala:189 | ||
1593 | 92 | msgid "No description provided for this service." | ||
1594 | 93 | msgstr "Δεν παρέχεται λεπτομέρειες για αυτή την υπηρεσία." | ||
1595 | 94 | |||
1596 | 95 | #. / Shown as heading in Service selector | ||
1597 | 96 | #: src/service.vala:193 | ||
1598 | 97 | msgid "Select cloud music service" | ||
1599 | 98 | msgstr "Επιλογή υπηρεσίας μουσικής cloud" | ||
1600 | 99 | |||
1601 | 100 | #. / Shown as label of Cancel button in Service selector | ||
1602 | 101 | #: src/service.vala:197 | ||
1603 | 102 | msgid "Cancel" | ||
1604 | 103 | msgstr "Άκυρο" | ||
1605 | 104 | |||
1606 | 105 | #. / Menu Service | ||
1607 | 106 | #: src/gui/actions.vala:110 | ||
1608 | 107 | msgid "_Service" | ||
1609 | 108 | msgstr "_Υπηρεσία" | ||
1610 | 109 | |||
1611 | 110 | #. / Menu item to switch service | ||
1612 | 111 | #: src/gui/actions.vala:117 | ||
1613 | 112 | msgid "_Switch Service" | ||
1614 | 113 | msgstr "_Εναλλαγή Υπηρεσίας" | ||
1615 | 114 | |||
1616 | 115 | #. / Menu Control | ||
1617 | 116 | #: src/gui/actions.vala:121 | ||
1618 | 117 | msgid "_Control" | ||
1619 | 118 | msgstr "_Control" | ||
1620 | 119 | |||
1621 | 120 | #. / Menu View | ||
1622 | 121 | #: src/gui/actions.vala:128 | ||
1623 | 122 | msgid "_View" | ||
1624 | 123 | msgstr "_Προβολή" | ||
1625 | 124 | |||
1626 | 125 | #. / Menu Options | ||
1627 | 126 | #: src/gui/actions.vala:135 | ||
1628 | 127 | msgid "_Options" | ||
1629 | 128 | msgstr "_Επιλογές" | ||
1630 | 129 | |||
1631 | 130 | #. / Menu item to purge cookies | ||
1632 | 131 | #. / Crash dialog | ||
1633 | 132 | #: src/gui/actions.vala:137 src/gui/windows.vala:243 | ||
1634 | 133 | msgid "Purge cookies" | ||
1635 | 134 | msgstr "Εκκαθάριση cookies" | ||
1636 | 135 | |||
1637 | 136 | #. / Menu item to purge album art cache | ||
1638 | 137 | #: src/gui/actions.vala:139 | ||
1639 | 138 | msgid "Purge album art" | ||
1640 | 139 | msgstr "Εκκαθάριση άλμπουμ" | ||
1641 | 140 | |||
1642 | 141 | #. / Menu item to purge browser cache | ||
1643 | 142 | #. / Crash dialog | ||
1644 | 143 | #: src/gui/actions.vala:141 src/gui/windows.vala:248 | ||
1645 | 144 | msgid "Purge browser cache" | ||
1646 | 145 | msgstr "Εκκαθάριση λανθάνουσας μνήμης περιηγητή" | ||
1647 | 146 | |||
1648 | 147 | #. / Menu Help | ||
1649 | 148 | #: src/gui/actions.vala:146 | ||
1650 | 149 | msgid "_Help" | ||
1651 | 150 | msgstr "_Βοήθεια" | ||
1652 | 151 | |||
1653 | 152 | #. / Menu item to open online help | ||
1654 | 153 | #: src/gui/actions.vala:148 | ||
1655 | 154 | msgid "Get help online" | ||
1656 | 155 | msgstr "Λήψη βοήθειας από το δίκτυο" | ||
1657 | 156 | |||
1658 | 157 | #. / Menu item to open bug/issue tracker | ||
1659 | 158 | #: src/gui/actions.vala:150 | ||
1660 | 159 | msgid "Report a problem" | ||
1661 | 160 | msgstr "Αναφορά προβλήματος" | ||
1662 | 161 | |||
1663 | 162 | #. / Menu item to open feature requests tracker | ||
1664 | 163 | #: src/gui/actions.vala:152 | ||
1665 | 164 | msgid "Suggest new feature" | ||
1666 | 165 | msgstr "Υποδείξεις νέων χαρακτηριστικών" | ||
1667 | 166 | |||
1668 | 167 | #. / Menu item to open page with information about donations | ||
1669 | 168 | #: src/gui/actions.vala:154 | ||
1670 | 169 | msgid "Donate" | ||
1671 | 170 | msgstr "Δωρεά" | ||
1672 | 171 | |||
1673 | 172 | #. / Menu item to open Nuvola's page on Google+ social network | ||
1674 | 173 | #: src/gui/actions.vala:156 | ||
1675 | 174 | msgid "Google+ page" | ||
1676 | 175 | msgstr "Ιστοσελίδα Google+" | ||
1677 | 176 | |||
1678 | 177 | #. / Menu item to open Nuvola's page on Facebook social network | ||
1679 | 178 | #: src/gui/actions.vala:158 | ||
1680 | 179 | msgid "Facebook page" | ||
1681 | 180 | msgstr "Ιστοσελίδα Facebook" | ||
1682 | 181 | |||
1683 | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar | ||
1684 | 183 | #: src/gui/actions.vala:162 | ||
1685 | 184 | msgid "Nuvola Menu" | ||
1686 | 185 | msgstr "Μενού Nuvola" | ||
1687 | 186 | |||
1688 | 187 | #. / Menu item to show both menu bar and tool bar | ||
1689 | 188 | #: src/gui/actions.vala:170 | ||
1690 | 189 | msgid "Both menubar and toolbar" | ||
1691 | 190 | msgstr "Και οι δυο μπάρες μενού και εργαλείων" | ||
1692 | 191 | |||
1693 | 192 | #. / Menu item to show only menu bar, tool bar is hidden | ||
1694 | 193 | #: src/gui/actions.vala:172 | ||
1695 | 194 | msgid "Only menubar" | ||
1696 | 195 | msgstr "Μόνο μπάρα μενού" | ||
1697 | 196 | |||
1698 | 197 | #. / Menu item to show only tool bar, menu bar is hidden | ||
1699 | 198 | #: src/gui/actions.vala:174 | ||
1700 | 199 | msgid "Only toolbar" | ||
1701 | 200 | msgstr "Μόνο μπάρα εργαλείων" | ||
1702 | 201 | |||
1703 | 202 | #. / Menu item to open web page about the current release | ||
1704 | 203 | #: src/gui/actions.vala:183 | ||
1705 | 204 | msgid "About release %s" | ||
1706 | 205 | msgstr "Σχετικά με την έκδοση %s" | ||
1707 | 206 | |||
1708 | 207 | #. / Preferences dialog title | ||
1709 | 208 | #: src/gui/preferences.vala:33 | ||
1710 | 209 | msgid "Preferences" | ||
1711 | 210 | msgstr "Προτιμήσεις" | ||
1712 | 211 | |||
1713 | 212 | #. / Settings dialog, tab General | ||
1714 | 213 | #: src/gui/preferences.vala:88 | ||
1715 | 214 | msgid "General" | ||
1716 | 215 | msgstr "Γενικά" | ||
1717 | 216 | |||
1718 | 217 | #. / Settings dialog - tab General | ||
1719 | 218 | #: src/gui/preferences.vala:91 | ||
1720 | 219 | msgid "Handle multimedia keys." | ||
1721 | 220 | msgstr "Διαχείριση πλήκτρων πολυμέσων." | ||
1722 | 221 | |||
1723 | 222 | #. / Settings dialog - tab General | ||
1724 | 223 | #: src/gui/preferences.vala:97 | ||
1725 | 224 | msgid "Use Pause (break) key to toggle play/pause" | ||
1726 | 225 | msgstr "Χρήση Πλήκτρου Παύσης (διακοπή) για εναλλαγή αναπαραγωγής/παύσης" | ||
1727 | 226 | |||
1728 | 227 | #. / Settings dialog - tab General | ||
1729 | 228 | #: src/gui/preferences.vala:103 | ||
1730 | 229 | msgid "Show notifications." | ||
1731 | 230 | msgstr "Εμφάνιση ειδοποιήσεων." | ||
1732 | 231 | |||
1733 | 232 | #. / Settings dialog - tab General | ||
1734 | 233 | #: src/gui/preferences.vala:109 | ||
1735 | 234 | msgid "Hide window if close button is pressed" | ||
1736 | 235 | msgstr "Απόκρυψη παραθύρου εάν πατηθεί το πλήκτρο κλεισίματος" | ||
1737 | 236 | |||
1738 | 237 | #. / Settings dialog - tab General | ||
1739 | 238 | #: src/gui/preferences.vala:114 | ||
1740 | 239 | msgid "Always (may require tray icon)" | ||
1741 | 240 | msgstr "Πάντα (μπορεί να απαιτείται εικονίδιο στην μπάρα)" | ||
1742 | 241 | |||
1743 | 242 | #. / Settings dialog - tab General | ||
1744 | 243 | #: src/gui/preferences.vala:117 | ||
1745 | 244 | msgid "Only if music is playing (may require tray icon)" | ||
1746 | 245 | msgstr "" | ||
1747 | 246 | "Μόνο όταν αναπαράγεται μουσική (μπορεί να απαιτείται εικονίδιο στην μπάρα)" | ||
1748 | 247 | |||
1749 | 248 | #. / Settings dialog - tab General | ||
1750 | 249 | #. / Settings dialog - tab General, never show tray icon | ||
1751 | 250 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 | ||
1752 | 251 | msgid "Never" | ||
1753 | 252 | msgstr "Ποτέ" | ||
1754 | 253 | |||
1755 | 254 | #. / Settings dialog - tab General | ||
1756 | 255 | #: src/gui/preferences.vala:134 | ||
1757 | 256 | msgid "Show tray icon" | ||
1758 | 257 | msgstr "Εμφάνιση εικονιδίου στην μπάρα" | ||
1759 | 258 | |||
1760 | 259 | #. / Settings dialog - tab General, always show tray icon | ||
1761 | 260 | #: src/gui/preferences.vala:139 | ||
1762 | 261 | msgid "Always" | ||
1763 | 262 | msgstr "Πάντα" | ||
1764 | 263 | |||
1765 | 264 | #. / Settings dialog - tab General, show tray icon if needed | ||
1766 | 265 | #: src/gui/preferences.vala:142 | ||
1767 | 266 | msgid "If needed" | ||
1768 | 267 | msgstr "Εάν απαιτείται" | ||
1769 | 268 | |||
1770 | 269 | #. / Settings dialog tab | ||
1771 | 270 | #: src/gui/preferences.vala:163 | ||
1772 | 271 | msgid "Network" | ||
1773 | 272 | msgstr "Δίκτυο" | ||
1774 | 273 | |||
1775 | 274 | #. / Settings dialog - tab Network | ||
1776 | 275 | #: src/gui/preferences.vala:166 | ||
1777 | 276 | msgid "" | ||
1778 | 277 | "Some cloud music services don't work with automatic settings and may require " | ||
1779 | 278 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | ||
1780 | 279 | "Nuvola Player." | ||
1781 | 280 | msgstr "" | ||
1782 | 281 | "Μερικές υπηρεσίες μουσικής cloud δεν δουλεύουν με αυτόματες ρυθμίσεις και " | ||
1783 | 282 | "μπορεί να απαιτούν χειροκίνητες ρυθμίσεις διαμεσολάβησης SOCKS. Οι νέες " | ||
1784 | 283 | "ρυθμίσεις διαμεσολάβησης εφαρμόζονται μετά την επανεκκίνηση του προγράμματος " | ||
1785 | 284 | "Nuvola." | ||
1786 | 285 | |||
1787 | 286 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | ||
1788 | 287 | #: src/gui/preferences.vala:175 | ||
1789 | 288 | msgid "" | ||
1790 | 289 | "<b>Warning:</b> A version of a library used for network connection contained " | ||
1791 | 290 | "in your system has issues with HTTPS proxy support and it may cause crash of " | ||
1792 | 291 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." | ||
1793 | 292 | msgstr "" | ||
1794 | 293 | "<b>Προσοχή:</b> Η έκδοση της βιβλιοθήκης που χρησιμοποιείται για σύνδεση με " | ||
1795 | 294 | "το δίκτυο που περιλαμβάνεται στο σύστημά σας έχει προβλήματα με υποστήριξη " | ||
1796 | 295 | "διαμεσολάβησης HTTPS και μπορεί να προκαλέσει κατάρρευση του προγράμματος " | ||
1797 | 296 | "Nuvola. Συνίσταται να μην χρησιμοποιήσετε ρυθμίσεις Διαμεσολάβησης HTTP(S)." | ||
1798 | 297 | |||
1799 | 298 | #. / Settings dialog - tab Network, shown if tsocks library was not detected | ||
1800 | 299 | #: src/gui/preferences.vala:185 | ||
1801 | 300 | msgid "" | ||
1802 | 301 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " | ||
1803 | 302 | "may not be supported." | ||
1804 | 303 | msgstr "" | ||
1805 | 304 | "<b>Σημείωση:</b> Η <a href='%s'>βιβλιοθήκη TSOCKS</a> δεν ανιχνεύθηκε. Η " | ||
1806 | 305 | "διαμεσολάβηση SOCKS μπορεί να μην υποστηρίζεται." | ||
1807 | 306 | |||
1808 | 307 | #. / Settings dialog - tab Network | ||
1809 | 308 | #: src/gui/preferences.vala:195 | ||
1810 | 309 | msgid "Use direct connection without a proxy server" | ||
1811 | 310 | msgstr "Χρήση άμεσης σύνδεσης χωρίς εξυπηρετητή διαμεσολάβησης" | ||
1812 | 311 | |||
1813 | 312 | #. / Settings dialog - tab Network | ||
1814 | 313 | #: src/gui/preferences.vala:199 | ||
1815 | 314 | msgid "Use system HTTP(S) proxy settings" | ||
1816 | 315 | msgstr "Χρήση ρυθμίσεων διαμεσολάβησης συστήματος HTTP(S)" | ||
1817 | 316 | |||
1818 | 317 | #. / Settings dialog - tab Network | ||
1819 | 318 | #: src/gui/preferences.vala:203 | ||
1820 | 319 | msgid "Use manual proxy settings" | ||
1821 | 320 | msgstr "Χρήση χειροκίνητων ρυθμίσεων διαμεσολάβησης" | ||
1822 | 321 | |||
1823 | 322 | #: src/gui/preferences.vala:212 | ||
1824 | 323 | msgid "Proxy Type" | ||
1825 | 324 | msgstr "Τύπος Διαμεσολάβησης" | ||
1826 | 325 | |||
1827 | 326 | #. / Settings dialog - tab Network, proxy type HTTP(S) | ||
1828 | 327 | #: src/gui/preferences.vala:215 | ||
1829 | 328 | msgid "HTTP(S)" | ||
1830 | 329 | msgstr "HTTP(S)" | ||
1831 | 330 | |||
1832 | 331 | #. / Settings dialog - tab Network, proxy type SOCKS | ||
1833 | 332 | #: src/gui/preferences.vala:218 | ||
1834 | 333 | msgid "SOCKS" | ||
1835 | 334 | msgstr "SOCKS" | ||
1836 | 335 | |||
1837 | 336 | #. / Settings dialog - tab Network | ||
1838 | 337 | #: src/gui/preferences.vala:228 | ||
1839 | 338 | msgid "Proxy Server" | ||
1840 | 339 | msgstr "Εξυπηρετητής Διαμεσολάβησης" | ||
1841 | 340 | |||
1842 | 341 | #. / Settings dialog - tab Network | ||
1843 | 342 | #: src/gui/preferences.vala:238 | ||
1844 | 343 | msgid "Proxy Server Port" | ||
1845 | 344 | msgstr "Θύρα Εξυπηρετητή Διαμεσολάβησης" | ||
1846 | 345 | |||
1847 | 346 | #. / Settings dialog, tab User Scripts | ||
1848 | 347 | #: src/gui/preferences.vala:280 | ||
1849 | 348 | msgid "User scripts" | ||
1850 | 349 | msgstr "Scripts Χρήστη" | ||
1851 | 350 | |||
1852 | 351 | #. / Settings dialog - tab User Scripts | ||
1853 | 352 | #: src/gui/preferences.vala:283 | ||
1854 | 353 | msgid "" | ||
1855 | 354 | "User scripts are used to enhance web interface of cloud music services." | ||
1856 | 355 | msgstr "" | ||
1857 | 356 | "Scripts χρήστη που χρησιμοποιούνται για βελτίωση της διεπαφής ιστού των " | ||
1858 | 357 | "υπηρεσιών μουσικής cloud." | ||
1859 | 358 | |||
1860 | 359 | #. / Settings dialog - tab User Scripts, warning | ||
1861 | 360 | #: src/gui/preferences.vala:291 | ||
1862 | 361 | msgid "" | ||
1863 | 362 | "<b>Warning:</b> Support for user scripts is incomplete and experimental. It " | ||
1864 | 363 | "may be removed in future releases. User script can send data to third " | ||
1865 | 364 | "parties, install only trustworthy user scripts." | ||
1866 | 365 | msgstr "" | ||
1867 | 366 | "<b>Προσοχή:</b> Η υποστήριξη για sripts χρήστη είναι μη ολοκληρωμένη και " | ||
1868 | 367 | "πειραματική. Μπορεί να αφαιρεθεί σε μελλοντικές εκδόσεις. Τα scripts χρήστη " | ||
1869 | 368 | "μπορεί να στείλουν δεδομένα σε τρίτους, εγκαταστήστε μόνο έμπιστα scripts " | ||
1870 | 369 | "χρήστη." | ||
1871 | 370 | |||
1872 | 371 | #. / Settings dialog - tab User Scripts | ||
1873 | 372 | #: src/gui/preferences.vala:301 | ||
1874 | 373 | msgid "You have to select service to configure user scripts." | ||
1875 | 374 | msgstr "Πρέπει να επιλέξετε υπηρεσία για να ρυθμίσετε τα scripts χρήστη." | ||
1876 | 375 | |||
1877 | 376 | #. / Settings dialog - tab User Scripts | ||
1878 | 377 | #: src/gui/preferences.vala:310 | ||
1879 | 378 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" | ||
1880 | 379 | msgstr "" | ||
1881 | 380 | "Λίστα χωρισμένη με κόμματα των ενεργοποιημένων scripts χρηστών για την " | ||
1882 | 381 | "υπηρεσία <b>%s</b>:" | ||
1883 | 382 | |||
1884 | 383 | #. / Settings dialog - tab User Scripts, button to open user scripts directory | ||
1885 | 384 | #: src/gui/preferences.vala:325 | ||
1886 | 385 | msgid "Open user scripts directory" | ||
1887 | 386 | msgstr "Άνοιγμα καταλόγου scripts χρήστη" | ||
1888 | 387 | |||
1889 | 388 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links | ||
1890 | 389 | #: src/gui/windows.vala:63 | ||
1891 | 390 | msgid "" | ||
1892 | 391 | "You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a " | ||
1893 | 392 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " | ||
1894 | 393 | "<a href='%4$s'>stable and beta builds</a>.</i>" | ||
1895 | 394 | msgstr "" | ||
1896 | 395 | "Εκτελείτε μια <b>μη σταθερή έκδοση %1$s</b>.<a href='%2$s'>Αναφέρετε ένα " | ||
1897 | 396 | "πρόβλημα</a>. <a href='%3$s'>Δείτε το ιστορικό αλλαγών</a>. <i>Αυτή η μπάρα " | ||
1898 | 397 | "δεν εμφανίζεται σε <a href='%4$s'>σταθερές και beta εκδόσεις</a>.</i>" | ||
1899 | 398 | |||
1900 | 399 | #. / Shown in the About Nuvola Player dialog | ||
1901 | 400 | #: src/gui/windows.vala:163 | ||
1902 | 401 | msgid "Cloud music integration for your Linux desktop" | ||
1903 | 402 | msgstr "Ενσωμάτωση υπηρεσίας μουσικής cloud στο σύστημα Linux" | ||
1904 | 403 | |||
1905 | 404 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) | ||
1906 | 405 | #: src/gui/windows.vala:165 | ||
1907 | 406 | msgid "translator-credits" | ||
1908 | 407 | msgstr "" | ||
1909 | 408 | "Launchpad Contributions:\n" | ||
1910 | 409 | " Stathis Iosifidis https://launchpad.net/~diamond-gr" | ||
1911 | 410 | |||
1912 | 411 | #. / Title of the Crash dialog | ||
1913 | 412 | #: src/gui/windows.vala:205 | ||
1914 | 413 | msgid "Nuvola Player Crash Dialog" | ||
1915 | 414 | msgstr "Παράθυρο Κατάρρευσης Αναπαραγωγέα Nuvola" | ||
1916 | 415 | |||
1917 | 416 | #. / Crash dialog | ||
1918 | 417 | #: src/gui/windows.vala:220 | ||
1919 | 418 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" | ||
1920 | 419 | msgstr "" | ||
1921 | 420 | "<b>Η προηγούμενη συνεδρία του προγράμματος Nuvola δεν τερματίστηκε σωστά.</b>" | ||
1922 | 421 | |||
1923 | 422 | #. / Crash dialog | ||
1924 | 423 | #: src/gui/windows.vala:228 | ||
1925 | 424 | msgid "You can try following options to solve this issue:" | ||
1926 | 425 | msgstr "" | ||
1927 | 426 | "Μπορείτε να εφαρμόσετε τις παρακάτω επιλογές για να λύσετε αυτό το θέμα:" | ||
1928 | 427 | |||
1929 | 428 | #. / Crash dialog | ||
1930 | 429 | #: src/gui/windows.vala:237 | ||
1931 | 430 | msgid "Reset configuration" | ||
1932 | 431 | msgstr "Επαναφορά ρυθμίσεων" | ||
1933 | 432 | |||
1934 | 433 | #. / Crash dialog | ||
1935 | 434 | #: src/gui/windows.vala:240 | ||
1936 | 435 | msgid "Reset state of user interface" | ||
1937 | 436 | msgstr "Κατάσταση επαναφοράς διεπαφής χρήστη" | ||
1938 | 437 | |||
1939 | 438 | #. / Crash dialog | ||
1940 | 439 | #: src/gui/windows.vala:254 | ||
1941 | 440 | msgid "Disable HTTP(S) proxy" | ||
1942 | 441 | msgstr "Απενεργοποίηση διαμεσολάβησης HTTP(S)" | ||
1943 | 442 | |||
1944 | 443 | #. / Crash dialog | ||
1945 | 444 | #: src/gui/windows.vala:259 | ||
1946 | 445 | msgid "" | ||
1947 | 446 | "Cloud music services use Flash to play music. Unfortunately, Flash Player is " | ||
1948 | 447 | "known not to be very stable and may cause crash of Nuvola Player. Please " | ||
1949 | 448 | "visit <a href='%s'>Flash troubleshooting</a>" | ||
1950 | 449 | msgstr "" | ||
1951 | 450 | "Οι υπηρεσίες μουσικής cloud χρησιμοποιούν Flash για αναπαραγωγή μουσικής. " | ||
1952 | 451 | "Δυστυχώς, ο Flash Player είναι γνωστό ότι δεν είναι πολύ σταθερός και μπορεί " | ||
1953 | 452 | "να προκαλέσει κατάρρευση του Nuvola. Παρακαλώ επισκεφθείτε την ιστοσελίδα <a " | ||
1954 | 453 | "href='%s'>προβλήματα Flash</a>" | ||
1955 | 0 | 454 | ||
1956 | === added file 'translations/hu.po' | |||
1957 | --- translations/hu.po 1970-01-01 00:00:00 +0000 | |||
1958 | +++ translations/hu.po 2012-06-15 15:20:27 +0000 | |||
1959 | @@ -0,0 +1,447 @@ | |||
1960 | 1 | # Hungarian translation for nuvola-player | ||
1961 | 2 | # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 | ||
1962 | 3 | # This file is distributed under the same license as the nuvola-player package. | ||
1963 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2012. | ||
1964 | 5 | # | ||
1965 | 6 | msgid "" | ||
1966 | 7 | msgstr "" | ||
1967 | 8 | "Project-Id-Version: nuvola-player\n" | ||
1968 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
1969 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | ||
1970 | 11 | "PO-Revision-Date: 2012-02-21 12:34+0000\n" | ||
1971 | 12 | "Last-Translator: Peter Nagy <Unknown>\n" | ||
1972 | 13 | "Language-Team: Hungarian <hu@li.org>\n" | ||
1973 | 14 | "MIME-Version: 1.0\n" | ||
1974 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
1975 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
1976 | 17 | "X-Launchpad-Export-Date: 2012-02-22 06:53+0000\n" | ||
1977 | 18 | "X-Generator: Launchpad (build 14838)\n" | ||
1978 | 19 | |||
1979 | 20 | #. / Shown if unsupported command line argument is used | ||
1980 | 21 | #: src/main.vala:194 | ||
1981 | 22 | msgid "Error: Option parsing failed:" | ||
1982 | 23 | msgstr "HIBA: A paraméter nem dolgozható fel:" | ||
1983 | 24 | |||
1984 | 25 | #. / Short label for command 'start or resume playback' | ||
1985 | 26 | #: src/player.vala:57 | ||
1986 | 27 | msgid "Play" | ||
1987 | 28 | msgstr "Lejátszás" | ||
1988 | 29 | |||
1989 | 30 | #. / Short label for command 'pause playback' | ||
1990 | 31 | #: src/player.vala:59 | ||
1991 | 32 | msgid "Pause" | ||
1992 | 33 | msgstr "Szünet" | ||
1993 | 34 | |||
1994 | 35 | #. / Short label for command 'skip to previous song' | ||
1995 | 36 | #: src/player.vala:61 | ||
1996 | 37 | msgid "Previous song" | ||
1997 | 38 | msgstr "Előző szám" | ||
1998 | 39 | |||
1999 | 40 | #. / Short label for command 'skip to next song' | ||
2000 | 41 | #: src/player.vala:63 | ||
2001 | 42 | msgid "Next song" | ||
2002 | 43 | msgstr "Következő szám" | ||
2003 | 44 | |||
2004 | 45 | #. / Short label for command 'thumb up' or 'like this song' (see Google Music buttons) | ||
2005 | 46 | #: src/player.vala:65 | ||
2006 | 47 | msgid "Thumbs Up" | ||
2007 | 48 | msgstr "Tetszik" | ||
2008 | 49 | |||
2009 | 50 | #. / Short label for command 'thumb down' or 'dislike this song' (see Google Music buttons) | ||
2010 | 51 | #: src/player.vala:67 | ||
2011 | 52 | msgid "Thumbs Down" | ||
2012 | 53 | msgstr "Nem tetszik" | ||
2013 | 54 | |||
2014 | 55 | #. / Short label for command 'add this song to favorites' | ||
2015 | 56 | #: src/player.vala:69 | ||
2016 | 57 | msgid "Favorite" | ||
2017 | 58 | msgstr "Kedvenc" | ||
2018 | 59 | |||
2019 | 60 | #. / Short label for command 'quit application' | ||
2020 | 61 | #: src/player.vala:71 | ||
2021 | 62 | msgid "Quit" | ||
2022 | 63 | msgstr "Bezárás" | ||
2023 | 64 | |||
2024 | 65 | #. / Initial notification | ||
2025 | 66 | #: src/player.vala:166 | ||
2026 | 67 | msgid "Version" | ||
2027 | 68 | msgstr "Verzió" | ||
2028 | 69 | |||
2029 | 70 | #. / Shown in notification if both artist and album are unknown | ||
2030 | 71 | #: src/player.vala:301 | ||
2031 | 72 | msgid "by unknown artist" | ||
2032 | 73 | msgstr "ismeretlen előadó" | ||
2033 | 74 | |||
2034 | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name | ||
2035 | 76 | #: src/player.vala:305 | ||
2036 | 77 | msgid "by unknown artist from %s" | ||
2037 | 78 | msgstr "ismeretlen előadó %s albuma" | ||
2038 | 79 | |||
2039 | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name | ||
2040 | 81 | #: src/player.vala:309 | ||
2041 | 82 | msgid "by %s" | ||
2042 | 83 | msgstr "előadó: %s" | ||
2043 | 84 | |||
2044 | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name | ||
2045 | 86 | #: src/player.vala:313 | ||
2046 | 87 | msgid "by %1$s from %2$s" | ||
2047 | 88 | msgstr "%1$ %2$ albumáról" | ||
2048 | 89 | |||
2049 | 90 | #. / Shown in Service selector if service doesn't provide description | ||
2050 | 91 | #: src/service.vala:189 | ||
2051 | 92 | msgid "No description provided for this service." | ||
2052 | 93 | msgstr "Nem találom a szolgáltatás leírását" | ||
2053 | 94 | |||
2054 | 95 | #. / Shown as heading in Service selector | ||
2055 | 96 | #: src/service.vala:193 | ||
2056 | 97 | msgid "Select cloud music service" | ||
2057 | 98 | msgstr "Válassz zenei felhő-szolgáltatást" | ||
2058 | 99 | |||
2059 | 100 | #. / Shown as label of Cancel button in Service selector | ||
2060 | 101 | #: src/service.vala:197 | ||
2061 | 102 | msgid "Cancel" | ||
2062 | 103 | msgstr "Mégsem" | ||
2063 | 104 | |||
2064 | 105 | #. / Menu Service | ||
2065 | 106 | #: src/gui/actions.vala:110 | ||
2066 | 107 | msgid "_Service" | ||
2067 | 108 | msgstr "_Szolgáltatás" | ||
2068 | 109 | |||
2069 | 110 | #. / Menu item to switch service | ||
2070 | 111 | #: src/gui/actions.vala:117 | ||
2071 | 112 | msgid "_Switch Service" | ||
2072 | 113 | msgstr "_Szolgáltatás váltás" | ||
2073 | 114 | |||
2074 | 115 | #. / Menu Control | ||
2075 | 116 | #: src/gui/actions.vala:121 | ||
2076 | 117 | msgid "_Control" | ||
2077 | 118 | msgstr "_Vezérlés" | ||
2078 | 119 | |||
2079 | 120 | #. / Menu View | ||
2080 | 121 | #: src/gui/actions.vala:128 | ||
2081 | 122 | msgid "_View" | ||
2082 | 123 | msgstr "_Nézet" | ||
2083 | 124 | |||
2084 | 125 | #. / Menu Options | ||
2085 | 126 | #: src/gui/actions.vala:135 | ||
2086 | 127 | msgid "_Options" | ||
2087 | 128 | msgstr "Beállítás_ok" | ||
2088 | 129 | |||
2089 | 130 | #. / Menu item to purge cookies | ||
2090 | 131 | #. / Crash dialog | ||
2091 | 132 | #: src/gui/actions.vala:137 src/gui/windows.vala:243 | ||
2092 | 133 | msgid "Purge cookies" | ||
2093 | 134 | msgstr "Sütik törlése" | ||
2094 | 135 | |||
2095 | 136 | #. / Menu item to purge album art cache | ||
2096 | 137 | #: src/gui/actions.vala:139 | ||
2097 | 138 | msgid "Purge album art" | ||
2098 | 139 | msgstr "Album boritók törlése" | ||
2099 | 140 | |||
2100 | 141 | #. / Menu item to purge browser cache | ||
2101 | 142 | #. / Crash dialog | ||
2102 | 143 | #: src/gui/actions.vala:141 src/gui/windows.vala:248 | ||
2103 | 144 | msgid "Purge browser cache" | ||
2104 | 145 | msgstr "Bögésző gyorsítótár üritése" | ||
2105 | 146 | |||
2106 | 147 | #. / Menu Help | ||
2107 | 148 | #: src/gui/actions.vala:146 | ||
2108 | 149 | msgid "_Help" | ||
2109 | 150 | msgstr "Súgó (_H)" | ||
2110 | 151 | |||
2111 | 152 | #. / Menu item to open online help | ||
2112 | 153 | #: src/gui/actions.vala:148 | ||
2113 | 154 | msgid "Get help online" | ||
2114 | 155 | msgstr "Online segítség" | ||
2115 | 156 | |||
2116 | 157 | #. / Menu item to open bug/issue tracker | ||
2117 | 158 | #: src/gui/actions.vala:150 | ||
2118 | 159 | msgid "Report a problem" | ||
2119 | 160 | msgstr "Probléma jelentése" | ||
2120 | 161 | |||
2121 | 162 | #. / Menu item to open feature requests tracker | ||
2122 | 163 | #: src/gui/actions.vala:152 | ||
2123 | 164 | msgid "Suggest new feature" | ||
2124 | 165 | msgstr "Új fukció javaslata" | ||
2125 | 166 | |||
2126 | 167 | #. / Menu item to open page with information about donations | ||
2127 | 168 | #: src/gui/actions.vala:154 | ||
2128 | 169 | msgid "Donate" | ||
2129 | 170 | msgstr "Támogatás" | ||
2130 | 171 | |||
2131 | 172 | #. / Menu item to open Nuvola's page on Google+ social network | ||
2132 | 173 | #: src/gui/actions.vala:156 | ||
2133 | 174 | msgid "Google+ page" | ||
2134 | 175 | msgstr "Google+ oldal" | ||
2135 | 176 | |||
2136 | 177 | #. / Menu item to open Nuvola's page on Facebook social network | ||
2137 | 178 | #: src/gui/actions.vala:158 | ||
2138 | 179 | msgid "Facebook page" | ||
2139 | 180 | msgstr "Facebook oldal" | ||
2140 | 181 | |||
2141 | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar | ||
2142 | 183 | #: src/gui/actions.vala:162 | ||
2143 | 184 | msgid "Nuvola Menu" | ||
2144 | 185 | msgstr "Nuvola menü" | ||
2145 | 186 | |||
2146 | 187 | #. / Menu item to show both menu bar and tool bar | ||
2147 | 188 | #: src/gui/actions.vala:170 | ||
2148 | 189 | msgid "Both menubar and toolbar" | ||
2149 | 190 | msgstr "Menü- és eszközsáv is" | ||
2150 | 191 | |||
2151 | 192 | #. / Menu item to show only menu bar, tool bar is hidden | ||
2152 | 193 | #: src/gui/actions.vala:172 | ||
2153 | 194 | msgid "Only menubar" | ||
2154 | 195 | msgstr "Csak menüsáv" | ||
2155 | 196 | |||
2156 | 197 | #. / Menu item to show only tool bar, menu bar is hidden | ||
2157 | 198 | #: src/gui/actions.vala:174 | ||
2158 | 199 | msgid "Only toolbar" | ||
2159 | 200 | msgstr "Csak eszközsáv" | ||
2160 | 201 | |||
2161 | 202 | #. / Menu item to open web page about the current release | ||
2162 | 203 | #: src/gui/actions.vala:183 | ||
2163 | 204 | msgid "About release %s" | ||
2164 | 205 | msgstr "A %s verzióról" | ||
2165 | 206 | |||
2166 | 207 | #. / Preferences dialog title | ||
2167 | 208 | #: src/gui/preferences.vala:33 | ||
2168 | 209 | msgid "Preferences" | ||
2169 | 210 | msgstr "Testreszabás" | ||
2170 | 211 | |||
2171 | 212 | #. / Settings dialog, tab General | ||
2172 | 213 | #: src/gui/preferences.vala:88 | ||
2173 | 214 | msgid "General" | ||
2174 | 215 | msgstr "Általános" | ||
2175 | 216 | |||
2176 | 217 | #. / Settings dialog - tab General | ||
2177 | 218 | #: src/gui/preferences.vala:91 | ||
2178 | 219 | msgid "Handle multimedia keys." | ||
2179 | 220 | msgstr "Mutlimédia gombok kezelése" | ||
2180 | 221 | |||
2181 | 222 | #. / Settings dialog - tab General | ||
2182 | 223 | #: src/gui/preferences.vala:97 | ||
2183 | 224 | msgid "Use Pause (break) key to toggle play/pause" | ||
2184 | 225 | msgstr "Szünet (Pause) gombbal a lejátszás megállítása/elindítása" | ||
2185 | 226 | |||
2186 | 227 | #. / Settings dialog - tab General | ||
2187 | 228 | #: src/gui/preferences.vala:103 | ||
2188 | 229 | msgid "Show notifications." | ||
2189 | 230 | msgstr "Értesítések megjelenítése" | ||
2190 | 231 | |||
2191 | 232 | #. / Settings dialog - tab General | ||
2192 | 233 | #: src/gui/preferences.vala:109 | ||
2193 | 234 | msgid "Hide window if close button is pressed" | ||
2194 | 235 | msgstr "Az ablak elrejtése a Bezárás gombbal" | ||
2195 | 236 | |||
2196 | 237 | #. / Settings dialog - tab General | ||
2197 | 238 | #: src/gui/preferences.vala:114 | ||
2198 | 239 | msgid "Always (may require tray icon)" | ||
2199 | 240 | msgstr "Mindig (tálca ikonra lehet szükség)" | ||
2200 | 241 | |||
2201 | 242 | #. / Settings dialog - tab General | ||
2202 | 243 | #: src/gui/preferences.vala:117 | ||
2203 | 244 | msgid "Only if music is playing (may require tray icon)" | ||
2204 | 245 | msgstr "Csak ha zenét játszik (tálca ikonra lehet szükség)" | ||
2205 | 246 | |||
2206 | 247 | #. / Settings dialog - tab General | ||
2207 | 248 | #. / Settings dialog - tab General, never show tray icon | ||
2208 | 249 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 | ||
2209 | 250 | msgid "Never" | ||
2210 | 251 | msgstr "Soha" | ||
2211 | 252 | |||
2212 | 253 | #. / Settings dialog - tab General | ||
2213 | 254 | #: src/gui/preferences.vala:134 | ||
2214 | 255 | msgid "Show tray icon" | ||
2215 | 256 | msgstr "Tálca ikon megjelenítése" | ||
2216 | 257 | |||
2217 | 258 | #. / Settings dialog - tab General, always show tray icon | ||
2218 | 259 | #: src/gui/preferences.vala:139 | ||
2219 | 260 | msgid "Always" | ||
2220 | 261 | msgstr "Mindig" | ||
2221 | 262 | |||
2222 | 263 | #. / Settings dialog - tab General, show tray icon if needed | ||
2223 | 264 | #: src/gui/preferences.vala:142 | ||
2224 | 265 | msgid "If needed" | ||
2225 | 266 | msgstr "Ha szükséges" | ||
2226 | 267 | |||
2227 | 268 | #. / Settings dialog tab | ||
2228 | 269 | #: src/gui/preferences.vala:163 | ||
2229 | 270 | msgid "Network" | ||
2230 | 271 | msgstr "Hálózat" | ||
2231 | 272 | |||
2232 | 273 | #. / Settings dialog - tab Network | ||
2233 | 274 | #: src/gui/preferences.vala:166 | ||
2234 | 275 | msgid "" | ||
2235 | 276 | "Some cloud music services don't work with automatic settings and may require " | ||
2236 | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | ||
2237 | 278 | "Nuvola Player." | ||
2238 | 279 | msgstr "" | ||
2239 | 280 | "Néhány zenei felhő-szolgáltatás nem működik automatikus beállításokkal és " | ||
2240 | 281 | "kézi SOCKS proxy beállítást igényelhet. Az új proxy beállítások a Nuvola " | ||
2241 | 282 | "Lejátszó újraindítása után lépnek csak érvénybe." | ||
2242 | 283 | |||
2243 | 284 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | ||
2244 | 285 | #: src/gui/preferences.vala:175 | ||
2245 | 286 | msgid "" | ||
2246 | 287 | "<b>Warning:</b> A version of a library used for network connection contained " | ||
2247 | 288 | "in your system has issues with HTTPS proxy support and it may cause crash of " | ||
2248 | 289 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." | ||
2249 | 290 | msgstr "" | ||
2250 | 291 | "<b>FIGYELEM:</b> A rendszeren található egyik szoftevr könyvtár verziójának " | ||
2251 | 292 | "probláémái vannak a HTTP(S) proxy-k használatával és a Nuvola Lejátszó " | ||
2252 | 293 | "összeomlását okozhatja. Erősen ellenjavalt a HTTP(S) proxy használata." | ||
2253 | 294 | |||
2254 | 295 | #. / Settings dialog - tab Network, shown if tsocks library was not detected | ||
2255 | 296 | #: src/gui/preferences.vala:185 | ||
2256 | 297 | msgid "" | ||
2257 | 298 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " | ||
2258 | 299 | "may not be supported." | ||
2259 | 300 | msgstr "" | ||
2260 | 301 | "<b>MEGJEGYZÉS:</b> A <a href='%s'>TSOCKS szoftver könyvtár</a>nem található. " | ||
2261 | 302 | "A SOCKS proxy támogatás nem biztos, hogy működni fog." | ||
2262 | 303 | |||
2263 | 304 | #. / Settings dialog - tab Network | ||
2264 | 305 | #: src/gui/preferences.vala:195 | ||
2265 | 306 | msgid "Use direct connection without a proxy server" | ||
2266 | 307 | msgstr "Közvetlen kapcsolat használata proxy nélkül." | ||
2267 | 308 | |||
2268 | 309 | #. / Settings dialog - tab Network | ||
2269 | 310 | #: src/gui/preferences.vala:199 | ||
2270 | 311 | msgid "Use system HTTP(S) proxy settings" | ||
2271 | 312 | msgstr "A redszer HTTP(S) proxy beállításainak használata." | ||
2272 | 313 | |||
2273 | 314 | #. / Settings dialog - tab Network | ||
2274 | 315 | #: src/gui/preferences.vala:203 | ||
2275 | 316 | msgid "Use manual proxy settings" | ||
2276 | 317 | msgstr "Kézi proxy beállítás" | ||
2277 | 318 | |||
2278 | 319 | #: src/gui/preferences.vala:212 | ||
2279 | 320 | msgid "Proxy Type" | ||
2280 | 321 | msgstr "Proxy típusa" | ||
2281 | 322 | |||
2282 | 323 | #. / Settings dialog - tab Network, proxy type HTTP(S) | ||
2283 | 324 | #: src/gui/preferences.vala:215 | ||
2284 | 325 | msgid "HTTP(S)" | ||
2285 | 326 | msgstr "HTTP(S)" | ||
2286 | 327 | |||
2287 | 328 | #. / Settings dialog - tab Network, proxy type SOCKS | ||
2288 | 329 | #: src/gui/preferences.vala:218 | ||
2289 | 330 | msgid "SOCKS" | ||
2290 | 331 | msgstr "SOCKS" | ||
2291 | 332 | |||
2292 | 333 | #. / Settings dialog - tab Network | ||
2293 | 334 | #: src/gui/preferences.vala:228 | ||
2294 | 335 | msgid "Proxy Server" | ||
2295 | 336 | msgstr "Proxy-kiszolgáló" | ||
2296 | 337 | |||
2297 | 338 | #. / Settings dialog - tab Network | ||
2298 | 339 | #: src/gui/preferences.vala:238 | ||
2299 | 340 | msgid "Proxy Server Port" | ||
2300 | 341 | msgstr "Proxy-kiszolgáló port" | ||
2301 | 342 | |||
2302 | 343 | #. / Settings dialog, tab User Scripts | ||
2303 | 344 | #: src/gui/preferences.vala:280 | ||
2304 | 345 | msgid "User scripts" | ||
2305 | 346 | msgstr "Felhasználói szkriptek" | ||
2306 | 347 | |||
2307 | 348 | #. / Settings dialog - tab User Scripts | ||
2308 | 349 | #: src/gui/preferences.vala:283 | ||
2309 | 350 | msgid "" | ||
2310 | 351 | "User scripts are used to enhance web interface of cloud music services." | ||
2311 | 352 | msgstr "" | ||
2312 | 353 | "A felhasználói szkriptek a zenei felhő-szolgáltatások webes felületeinek " | ||
2313 | 354 | "feljavítására szolgálnak." | ||
2314 | 355 | |||
2315 | 356 | #. / Settings dialog - tab User Scripts, warning | ||
2316 | 357 | #: src/gui/preferences.vala:291 | ||
2317 | 358 | msgid "" | ||
2318 | 359 | "<b>Warning:</b> Support for user scripts is incomplete and experimental. It " | ||
2319 | 360 | "may be removed in future releases. User script can send data to third " | ||
2320 | 361 | "parties, install only trustworthy user scripts." | ||
2321 | 362 | msgstr "" | ||
2322 | 363 | "<b>FIGYELEM:</b> A felhasználói szkriptek támogatás nem teljes és kísérleti " | ||
2323 | 364 | "stádiumban van. Akár eltávolÍtásra is kerülhet a későbbi verziókban. Egy " | ||
2324 | 365 | "felhasználói szkript adatokat küldhet harmadik fél számára is ezért csak " | ||
2325 | 366 | "megbízható forrásból származót telepítsen." | ||
2326 | 367 | |||
2327 | 368 | #. / Settings dialog - tab User Scripts | ||
2328 | 369 | #: src/gui/preferences.vala:301 | ||
2329 | 370 | msgid "You have to select service to configure user scripts." | ||
2330 | 371 | msgstr "Válasszon szolgáltatást a felhasználói szkriptek beállításához." | ||
2331 | 372 | |||
2332 | 373 | #. / Settings dialog - tab User Scripts | ||
2333 | 374 | #: src/gui/preferences.vala:310 | ||
2334 | 375 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" | ||
2335 | 376 | msgstr "" | ||
2336 | 377 | "A <b>%s</b> szolgáltatáshoz engedélyezett felhasználói szkriptek vesszővel " | ||
2337 | 378 | "elválasztva:" | ||
2338 | 379 | |||
2339 | 380 | #. / Settings dialog - tab User Scripts, button to open user scripts directory | ||
2340 | 381 | #: src/gui/preferences.vala:325 | ||
2341 | 382 | msgid "Open user scripts directory" | ||
2342 | 383 | msgstr "Felhasználói szkriptek mappája" | ||
2343 | 384 | |||
2344 | 385 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links | ||
2345 | 386 | #: src/gui/windows.vala:63 | ||
2346 | 387 | msgid "" | ||
2347 | 388 | "You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a " | ||
2348 | 389 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " | ||
2349 | 390 | "<a href='%4$s'>stable and beta builds</a>.</i>" | ||
2350 | 391 | msgstr "" | ||
2351 | 392 | "<b>nem stabil %1$s</b> verzió. <a href='%2$s'>Hiba jelentése</a>. <a " | ||
2352 | 393 | "href='%3$s'>Változás lista</a>. <i>Ez az eszköztár nem jelenik meg <a " | ||
2353 | 394 | "href='%4$s'>stabil és beta verziókban</a>.</i>" | ||
2354 | 395 | |||
2355 | 396 | #. / Shown in the About Nuvola Player dialog | ||
2356 | 397 | #: src/gui/windows.vala:163 | ||
2357 | 398 | msgid "Cloud music integration for your Linux desktop" | ||
2358 | 399 | msgstr "Felhő-zene integráció Linux asztali környezethez" | ||
2359 | 400 | |||
2360 | 401 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) | ||
2361 | 402 | #: src/gui/windows.vala:165 | ||
2362 | 403 | msgid "translator-credits" | ||
2363 | 404 | msgstr "" | ||
2364 | 405 | "Launchpad Contributions:\n" | ||
2365 | 406 | " Peter Nagy https://launchpad.net/~antronin" | ||
2366 | 407 | |||
2367 | 408 | #. / Title of the Crash dialog | ||
2368 | 409 | #: src/gui/windows.vala:205 | ||
2369 | 410 | msgid "Nuvola Player Crash Dialog" | ||
2370 | 411 | msgstr "Nuvola Lejátszó Összeomlás Jelentő" | ||
2371 | 412 | |||
2372 | 413 | #. / Crash dialog | ||
2373 | 414 | #: src/gui/windows.vala:220 | ||
2374 | 415 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" | ||
2375 | 416 | msgstr "<b>Az előző Nuvola Lejátszó folyamat nem lett lezárva rendesen.</b>" | ||
2376 | 417 | |||
2377 | 418 | #. / Crash dialog | ||
2378 | 419 | #: src/gui/windows.vala:228 | ||
2379 | 420 | msgid "You can try following options to solve this issue:" | ||
2380 | 421 | msgstr "A következő lehetőségeket próbálhatja ki ennek megoldására:" | ||
2381 | 422 | |||
2382 | 423 | #. / Crash dialog | ||
2383 | 424 | #: src/gui/windows.vala:237 | ||
2384 | 425 | msgid "Reset configuration" | ||
2385 | 426 | msgstr "A beállítások alapállapotba hozása" | ||
2386 | 427 | |||
2387 | 428 | #. / Crash dialog | ||
2388 | 429 | #: src/gui/windows.vala:240 | ||
2389 | 430 | msgid "Reset state of user interface" | ||
2390 | 431 | msgstr "Felhasználói felület alapállapotba hozása" | ||
2391 | 432 | |||
2392 | 433 | #. / Crash dialog | ||
2393 | 434 | #: src/gui/windows.vala:254 | ||
2394 | 435 | msgid "Disable HTTP(S) proxy" | ||
2395 | 436 | msgstr "HTTP(S) proxy kikapcsolása" | ||
2396 | 437 | |||
2397 | 438 | #. / Crash dialog | ||
2398 | 439 | #: src/gui/windows.vala:259 | ||
2399 | 440 | msgid "" | ||
2400 | 441 | "Cloud music services use Flash to play music. Unfortunately, Flash Player is " | ||
2401 | 442 | "known not to be very stable and may cause crash of Nuvola Player. Please " | ||
2402 | 443 | "visit <a href='%s'>Flash troubleshooting</a>" | ||
2403 | 444 | msgstr "" | ||
2404 | 445 | "A zenei felhő-szolgáltatások flash-t használnak a zene lejátszására. Sajnos " | ||
2405 | 446 | "a Flash Player híresen instabil és a Nuvola Lejátszó összeomlását okozhatja. " | ||
2406 | 447 | "Kérem tekintse meg a <a href='%s'>Flash hibaelhárítót</a>." | ||
2407 | 0 | 448 | ||
2408 | === modified file 'translations/ms.po' | |||
2409 | --- translations/ms.po 2012-02-13 19:25:11 +0000 | |||
2410 | +++ translations/ms.po 2012-06-15 15:20:27 +0000 | |||
2411 | @@ -8,19 +8,29 @@ | |||
2412 | 8 | "Project-Id-Version: nuvola-player\n" | 8 | "Project-Id-Version: nuvola-player\n" |
2413 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2414 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" |
2415 | 11 | <<<<<<< TREE | ||
2416 | 11 | "PO-Revision-Date: 2012-01-07 19:14+0000\n" | 12 | "PO-Revision-Date: 2012-01-07 19:14+0000\n" |
2417 | 12 | "Last-Translator: abuyop <Unknown>\n" | 13 | "Last-Translator: abuyop <Unknown>\n" |
2418 | 14 | ======= | ||
2419 | 15 | "PO-Revision-Date: 2012-03-19 00:34+0000\n" | ||
2420 | 16 | "Last-Translator: abuyop <Unknown>\n" | ||
2421 | 17 | >>>>>>> MERGE-SOURCE | ||
2422 | 13 | "Language-Team: Malay <ms@li.org>\n" | 18 | "Language-Team: Malay <ms@li.org>\n" |
2423 | 14 | "MIME-Version: 1.0\n" | 19 | "MIME-Version: 1.0\n" |
2424 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 20 | "Content-Type: text/plain; charset=UTF-8\n" |
2425 | 16 | "Content-Transfer-Encoding: 8bit\n" | 21 | "Content-Transfer-Encoding: 8bit\n" |
2426 | 22 | <<<<<<< TREE | ||
2427 | 17 | "X-Launchpad-Export-Date: 2012-01-08 05:35+0000\n" | 23 | "X-Launchpad-Export-Date: 2012-01-08 05:35+0000\n" |
2428 | 18 | "X-Generator: Launchpad (build 14640)\n" | 24 | "X-Generator: Launchpad (build 14640)\n" |
2429 | 25 | ======= | ||
2430 | 26 | "X-Launchpad-Export-Date: 2012-03-20 05:54+0000\n" | ||
2431 | 27 | "X-Generator: Launchpad (build 14969)\n" | ||
2432 | 28 | >>>>>>> MERGE-SOURCE | ||
2433 | 19 | 29 | ||
2434 | 20 | #. / Shown if unsupported command line argument is used | 30 | #. / Shown if unsupported command line argument is used |
2435 | 21 | #: src/main.vala:194 | 31 | #: src/main.vala:194 |
2436 | 22 | msgid "Error: Option parsing failed:" | 32 | msgid "Error: Option parsing failed:" |
2438 | 23 | msgstr "" | 33 | msgstr "Ralat: Penghuraian pilihan gagal:" |
2439 | 24 | 34 | ||
2440 | 25 | #. / Short label for command 'start or resume playback' | 35 | #. / Short label for command 'start or resume playback' |
2441 | 26 | #: src/player.vala:57 | 36 | #: src/player.vala:57 |
2442 | @@ -70,12 +80,12 @@ | |||
2443 | 70 | #. / Shown in notification if both artist and album are unknown | 80 | #. / Shown in notification if both artist and album are unknown |
2444 | 71 | #: src/player.vala:301 | 81 | #: src/player.vala:301 |
2445 | 72 | msgid "by unknown artist" | 82 | msgid "by unknown artist" |
2447 | 73 | msgstr "" | 83 | msgstr "oleh artis tidak diketahui" |
2448 | 74 | 84 | ||
2449 | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name | 85 | #. / Shown in notification if artist is unknown, %s will be replaced by album name |
2450 | 76 | #: src/player.vala:305 | 86 | #: src/player.vala:305 |
2451 | 77 | msgid "by unknown artist from %s" | 87 | msgid "by unknown artist from %s" |
2453 | 78 | msgstr "" | 88 | msgstr "oleh artis tidak diketahui dari %s" |
2454 | 79 | 89 | ||
2455 | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name | 90 | #. / Shown in notification if album is unknown, %s will be replaced by artist name |
2456 | 81 | #: src/player.vala:309 | 91 | #: src/player.vala:309 |
2457 | @@ -85,17 +95,17 @@ | |||
2458 | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name | 95 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name |
2459 | 86 | #: src/player.vala:313 | 96 | #: src/player.vala:313 |
2460 | 87 | msgid "by %1$s from %2$s" | 97 | msgid "by %1$s from %2$s" |
2462 | 88 | msgstr "" | 98 | msgstr "oleh %1$s dari %2$s" |
2463 | 89 | 99 | ||
2464 | 90 | #. / Shown in Service selector if service doesn't provide description | 100 | #. / Shown in Service selector if service doesn't provide description |
2465 | 91 | #: src/service.vala:189 | 101 | #: src/service.vala:189 |
2466 | 92 | msgid "No description provided for this service." | 102 | msgid "No description provided for this service." |
2468 | 93 | msgstr "" | 103 | msgstr "Tiada keterangan disediakan oleh perkhidmatan ini." |
2469 | 94 | 104 | ||
2470 | 95 | #. / Shown as heading in Service selector | 105 | #. / Shown as heading in Service selector |
2471 | 96 | #: src/service.vala:193 | 106 | #: src/service.vala:193 |
2472 | 97 | msgid "Select cloud music service" | 107 | msgid "Select cloud music service" |
2474 | 98 | msgstr "" | 108 | msgstr "Pilih perkhidmatan muzik awan" |
2475 | 99 | 109 | ||
2476 | 100 | #. / Shown as label of Cancel button in Service selector | 110 | #. / Shown as label of Cancel button in Service selector |
2477 | 101 | #: src/service.vala:197 | 111 | #: src/service.vala:197 |
2478 | @@ -105,27 +115,27 @@ | |||
2479 | 105 | #. / Menu Service | 115 | #. / Menu Service |
2480 | 106 | #: src/gui/actions.vala:110 | 116 | #: src/gui/actions.vala:110 |
2481 | 107 | msgid "_Service" | 117 | msgid "_Service" |
2483 | 108 | msgstr "" | 118 | msgstr "Pe_rkhidmatan" |
2484 | 109 | 119 | ||
2485 | 110 | #. / Menu item to switch service | 120 | #. / Menu item to switch service |
2486 | 111 | #: src/gui/actions.vala:117 | 121 | #: src/gui/actions.vala:117 |
2487 | 112 | msgid "_Switch Service" | 122 | msgid "_Switch Service" |
2489 | 113 | msgstr "" | 123 | msgstr "T_ukar Perkhidmatan" |
2490 | 114 | 124 | ||
2491 | 115 | #. / Menu Control | 125 | #. / Menu Control |
2492 | 116 | #: src/gui/actions.vala:121 | 126 | #: src/gui/actions.vala:121 |
2493 | 117 | msgid "_Control" | 127 | msgid "_Control" |
2495 | 118 | msgstr "" | 128 | msgstr "Ka_walan" |
2496 | 119 | 129 | ||
2497 | 120 | #. / Menu View | 130 | #. / Menu View |
2498 | 121 | #: src/gui/actions.vala:128 | 131 | #: src/gui/actions.vala:128 |
2499 | 122 | msgid "_View" | 132 | msgid "_View" |
2501 | 123 | msgstr "" | 133 | msgstr "_Lihat" |
2502 | 124 | 134 | ||
2503 | 125 | #. / Menu Options | 135 | #. / Menu Options |
2504 | 126 | #: src/gui/actions.vala:135 | 136 | #: src/gui/actions.vala:135 |
2505 | 127 | msgid "_Options" | 137 | msgid "_Options" |
2507 | 128 | msgstr "" | 138 | msgstr "_Pilihan" |
2508 | 129 | 139 | ||
2509 | 130 | #. / Menu item to purge cookies | 140 | #. / Menu item to purge cookies |
2510 | 131 | #. / Crash dialog | 141 | #. / Crash dialog |
2511 | @@ -136,7 +146,7 @@ | |||
2512 | 136 | #. / Menu item to purge album art cache | 146 | #. / Menu item to purge album art cache |
2513 | 137 | #: src/gui/actions.vala:139 | 147 | #: src/gui/actions.vala:139 |
2514 | 138 | msgid "Purge album art" | 148 | msgid "Purge album art" |
2516 | 139 | msgstr "" | 149 | msgstr "Singkir seni album" |
2517 | 140 | 150 | ||
2518 | 141 | #. / Menu item to purge browser cache | 151 | #. / Menu item to purge browser cache |
2519 | 142 | #. / Crash dialog | 152 | #. / Crash dialog |
2520 | @@ -147,22 +157,22 @@ | |||
2521 | 147 | #. / Menu Help | 157 | #. / Menu Help |
2522 | 148 | #: src/gui/actions.vala:146 | 158 | #: src/gui/actions.vala:146 |
2523 | 149 | msgid "_Help" | 159 | msgid "_Help" |
2525 | 150 | msgstr "" | 160 | msgstr "_Bantuan" |
2526 | 151 | 161 | ||
2527 | 152 | #. / Menu item to open online help | 162 | #. / Menu item to open online help |
2528 | 153 | #: src/gui/actions.vala:148 | 163 | #: src/gui/actions.vala:148 |
2529 | 154 | msgid "Get help online" | 164 | msgid "Get help online" |
2531 | 155 | msgstr "" | 165 | msgstr "Dapatkan bantuan atas talian" |
2532 | 156 | 166 | ||
2533 | 157 | #. / Menu item to open bug/issue tracker | 167 | #. / Menu item to open bug/issue tracker |
2534 | 158 | #: src/gui/actions.vala:150 | 168 | #: src/gui/actions.vala:150 |
2535 | 159 | msgid "Report a problem" | 169 | msgid "Report a problem" |
2537 | 160 | msgstr "" | 170 | msgstr "Laporkan masalah" |
2538 | 161 | 171 | ||
2539 | 162 | #. / Menu item to open feature requests tracker | 172 | #. / Menu item to open feature requests tracker |
2540 | 163 | #: src/gui/actions.vala:152 | 173 | #: src/gui/actions.vala:152 |
2541 | 164 | msgid "Suggest new feature" | 174 | msgid "Suggest new feature" |
2543 | 165 | msgstr "" | 175 | msgstr "Cadang fitur baru" |
2544 | 166 | 176 | ||
2545 | 167 | #. / Menu item to open page with information about donations | 177 | #. / Menu item to open page with information about donations |
2546 | 168 | #: src/gui/actions.vala:154 | 178 | #: src/gui/actions.vala:154 |
2547 | @@ -182,22 +192,22 @@ | |||
2548 | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar | 192 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar |
2549 | 183 | #: src/gui/actions.vala:162 | 193 | #: src/gui/actions.vala:162 |
2550 | 184 | msgid "Nuvola Menu" | 194 | msgid "Nuvola Menu" |
2552 | 185 | msgstr "" | 195 | msgstr "Menu Nuvola" |
2553 | 186 | 196 | ||
2554 | 187 | #. / Menu item to show both menu bar and tool bar | 197 | #. / Menu item to show both menu bar and tool bar |
2555 | 188 | #: src/gui/actions.vala:170 | 198 | #: src/gui/actions.vala:170 |
2556 | 189 | msgid "Both menubar and toolbar" | 199 | msgid "Both menubar and toolbar" |
2558 | 190 | msgstr "" | 200 | msgstr "Kedua-dua palang menu dan palang alat" |
2559 | 191 | 201 | ||
2560 | 192 | #. / Menu item to show only menu bar, tool bar is hidden | 202 | #. / Menu item to show only menu bar, tool bar is hidden |
2561 | 193 | #: src/gui/actions.vala:172 | 203 | #: src/gui/actions.vala:172 |
2562 | 194 | msgid "Only menubar" | 204 | msgid "Only menubar" |
2564 | 195 | msgstr "" | 205 | msgstr "Hanya palang menu" |
2565 | 196 | 206 | ||
2566 | 197 | #. / Menu item to show only tool bar, menu bar is hidden | 207 | #. / Menu item to show only tool bar, menu bar is hidden |
2567 | 198 | #: src/gui/actions.vala:174 | 208 | #: src/gui/actions.vala:174 |
2568 | 199 | msgid "Only toolbar" | 209 | msgid "Only toolbar" |
2570 | 200 | msgstr "" | 210 | msgstr "Hanya palang alat" |
2571 | 201 | 211 | ||
2572 | 202 | #. / Menu item to open web page about the current release | 212 | #. / Menu item to open web page about the current release |
2573 | 203 | #: src/gui/actions.vala:183 | 213 | #: src/gui/actions.vala:183 |
2574 | @@ -207,7 +217,7 @@ | |||
2575 | 207 | #. / Preferences dialog title | 217 | #. / Preferences dialog title |
2576 | 208 | #: src/gui/preferences.vala:33 | 218 | #: src/gui/preferences.vala:33 |
2577 | 209 | msgid "Preferences" | 219 | msgid "Preferences" |
2579 | 210 | msgstr "" | 220 | msgstr "Keutamaan" |
2580 | 211 | 221 | ||
2581 | 212 | #. / Settings dialog, tab General | 222 | #. / Settings dialog, tab General |
2582 | 213 | #: src/gui/preferences.vala:88 | 223 | #: src/gui/preferences.vala:88 |
2583 | @@ -227,48 +237,48 @@ | |||
2584 | 227 | #. / Settings dialog - tab General | 237 | #. / Settings dialog - tab General |
2585 | 228 | #: src/gui/preferences.vala:103 | 238 | #: src/gui/preferences.vala:103 |
2586 | 229 | msgid "Show notifications." | 239 | msgid "Show notifications." |
2588 | 230 | msgstr "" | 240 | msgstr "Papar pemberitahuan." |
2589 | 231 | 241 | ||
2590 | 232 | #. / Settings dialog - tab General | 242 | #. / Settings dialog - tab General |
2591 | 233 | #: src/gui/preferences.vala:109 | 243 | #: src/gui/preferences.vala:109 |
2592 | 234 | msgid "Hide window if close button is pressed" | 244 | msgid "Hide window if close button is pressed" |
2594 | 235 | msgstr "" | 245 | msgstr "Sembunyi tetingkap jika butang tutup ditekan" |
2595 | 236 | 246 | ||
2596 | 237 | #. / Settings dialog - tab General | 247 | #. / Settings dialog - tab General |
2597 | 238 | #: src/gui/preferences.vala:114 | 248 | #: src/gui/preferences.vala:114 |
2598 | 239 | msgid "Always (may require tray icon)" | 249 | msgid "Always (may require tray icon)" |
2600 | 240 | msgstr "" | 250 | msgstr "Sentiasa (mungkin memerlukan ikon talam)" |
2601 | 241 | 251 | ||
2602 | 242 | #. / Settings dialog - tab General | 252 | #. / Settings dialog - tab General |
2603 | 243 | #: src/gui/preferences.vala:117 | 253 | #: src/gui/preferences.vala:117 |
2604 | 244 | msgid "Only if music is playing (may require tray icon)" | 254 | msgid "Only if music is playing (may require tray icon)" |
2606 | 245 | msgstr "" | 255 | msgstr "Hanya jika muzik dimainkan (mungkin memerlukan ikon talam)" |
2607 | 246 | 256 | ||
2608 | 247 | #. / Settings dialog - tab General | 257 | #. / Settings dialog - tab General |
2609 | 248 | #. / Settings dialog - tab General, never show tray icon | 258 | #. / Settings dialog - tab General, never show tray icon |
2610 | 249 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 | 259 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 |
2611 | 250 | msgid "Never" | 260 | msgid "Never" |
2613 | 251 | msgstr "" | 261 | msgstr "Tidak Sesekali" |
2614 | 252 | 262 | ||
2615 | 253 | #. / Settings dialog - tab General | 263 | #. / Settings dialog - tab General |
2616 | 254 | #: src/gui/preferences.vala:134 | 264 | #: src/gui/preferences.vala:134 |
2617 | 255 | msgid "Show tray icon" | 265 | msgid "Show tray icon" |
2619 | 256 | msgstr "" | 266 | msgstr "Papar ikon talam" |
2620 | 257 | 267 | ||
2621 | 258 | #. / Settings dialog - tab General, always show tray icon | 268 | #. / Settings dialog - tab General, always show tray icon |
2622 | 259 | #: src/gui/preferences.vala:139 | 269 | #: src/gui/preferences.vala:139 |
2623 | 260 | msgid "Always" | 270 | msgid "Always" |
2625 | 261 | msgstr "" | 271 | msgstr "Sentiasa" |
2626 | 262 | 272 | ||
2627 | 263 | #. / Settings dialog - tab General, show tray icon if needed | 273 | #. / Settings dialog - tab General, show tray icon if needed |
2628 | 264 | #: src/gui/preferences.vala:142 | 274 | #: src/gui/preferences.vala:142 |
2629 | 265 | msgid "If needed" | 275 | msgid "If needed" |
2631 | 266 | msgstr "" | 276 | msgstr "Jika diperlukan" |
2632 | 267 | 277 | ||
2633 | 268 | #. / Settings dialog tab | 278 | #. / Settings dialog tab |
2634 | 269 | #: src/gui/preferences.vala:163 | 279 | #: src/gui/preferences.vala:163 |
2635 | 270 | msgid "Network" | 280 | msgid "Network" |
2637 | 271 | msgstr "" | 281 | msgstr "Rangkaian" |
2638 | 272 | 282 | ||
2639 | 273 | #. / Settings dialog - tab Network | 283 | #. / Settings dialog - tab Network |
2640 | 274 | #: src/gui/preferences.vala:166 | 284 | #: src/gui/preferences.vala:166 |
2641 | @@ -277,6 +287,9 @@ | |||
2642 | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | 287 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " |
2643 | 278 | "Nuvola Player." | 288 | "Nuvola Player." |
2644 | 279 | msgstr "" | 289 | msgstr "" |
2645 | 290 | "Beberapa perkhidmatan muzik awan tidak berfungsi dengan tetapan automatik " | ||
2646 | 291 | "dan mungkin memerlukan tetapan proksi SOCKS manual. Tetapan proksi baru " | ||
2647 | 292 | "dilaksanakan selepas mula semula Pemain Nuvola." | ||
2648 | 280 | 293 | ||
2649 | 281 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | 294 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used |
2650 | 282 | #: src/gui/preferences.vala:175 | 295 | #: src/gui/preferences.vala:175 |
2651 | @@ -285,6 +298,10 @@ | |||
2652 | 285 | "in your system has issues with HTTPS proxy support and it may cause crash of " | 298 | "in your system has issues with HTTPS proxy support and it may cause crash of " |
2653 | 286 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." | 299 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." |
2654 | 287 | msgstr "" | 300 | msgstr "" |
2655 | 301 | "<b>Amaran:</b> Versi pustaka yang digunakan untuk sambungan rangkaian " | ||
2656 | 302 | "terkandung dalam sistem anda mempunyai isu dengan sokongan proksi dan ia " | ||
2657 | 303 | "mungkin menyebabkan kerosakan pada Pemain Nuvola. Adalah sangat disarankan " | ||
2658 | 304 | "tidak menggunakan tetapan Proksi HTTP(S)." | ||
2659 | 288 | 305 | ||
2660 | 289 | #. / Settings dialog - tab Network, shown if tsocks library was not detected | 306 | #. / Settings dialog - tab Network, shown if tsocks library was not detected |
2661 | 290 | #: src/gui/preferences.vala:185 | 307 | #: src/gui/preferences.vala:185 |
2662 | @@ -292,45 +309,47 @@ | |||
2663 | 292 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " | 309 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " |
2664 | 293 | "may not be supported." | 310 | "may not be supported." |
2665 | 294 | msgstr "" | 311 | msgstr "" |
2666 | 312 | "<b>Perhatian:</b> <a href='%s'>TSOCKS library</a> tidak dikesan. Proksi " | ||
2667 | 313 | "SOCKS mungkin tidak disokong." | ||
2668 | 295 | 314 | ||
2669 | 296 | #. / Settings dialog - tab Network | 315 | #. / Settings dialog - tab Network |
2670 | 297 | #: src/gui/preferences.vala:195 | 316 | #: src/gui/preferences.vala:195 |
2671 | 298 | msgid "Use direct connection without a proxy server" | 317 | msgid "Use direct connection without a proxy server" |
2673 | 299 | msgstr "" | 318 | msgstr "Guna sambungan langsung tanpa pelayan proksi" |
2674 | 300 | 319 | ||
2675 | 301 | #. / Settings dialog - tab Network | 320 | #. / Settings dialog - tab Network |
2676 | 302 | #: src/gui/preferences.vala:199 | 321 | #: src/gui/preferences.vala:199 |
2677 | 303 | msgid "Use system HTTP(S) proxy settings" | 322 | msgid "Use system HTTP(S) proxy settings" |
2679 | 304 | msgstr "" | 323 | msgstr "Guna tetapan proksi HTTP(S) sistem" |
2680 | 305 | 324 | ||
2681 | 306 | #. / Settings dialog - tab Network | 325 | #. / Settings dialog - tab Network |
2682 | 307 | #: src/gui/preferences.vala:203 | 326 | #: src/gui/preferences.vala:203 |
2683 | 308 | msgid "Use manual proxy settings" | 327 | msgid "Use manual proxy settings" |
2685 | 309 | msgstr "" | 328 | msgstr "Guna tetapan proksi manual" |
2686 | 310 | 329 | ||
2687 | 311 | #: src/gui/preferences.vala:212 | 330 | #: src/gui/preferences.vala:212 |
2688 | 312 | msgid "Proxy Type" | 331 | msgid "Proxy Type" |
2690 | 313 | msgstr "" | 332 | msgstr "Jenis Proksi" |
2691 | 314 | 333 | ||
2692 | 315 | #. / Settings dialog - tab Network, proxy type HTTP(S) | 334 | #. / Settings dialog - tab Network, proxy type HTTP(S) |
2693 | 316 | #: src/gui/preferences.vala:215 | 335 | #: src/gui/preferences.vala:215 |
2694 | 317 | msgid "HTTP(S)" | 336 | msgid "HTTP(S)" |
2696 | 318 | msgstr "" | 337 | msgstr "HTTP(S)" |
2697 | 319 | 338 | ||
2698 | 320 | #. / Settings dialog - tab Network, proxy type SOCKS | 339 | #. / Settings dialog - tab Network, proxy type SOCKS |
2699 | 321 | #: src/gui/preferences.vala:218 | 340 | #: src/gui/preferences.vala:218 |
2700 | 322 | msgid "SOCKS" | 341 | msgid "SOCKS" |
2702 | 323 | msgstr "" | 342 | msgstr "SOCKS" |
2703 | 324 | 343 | ||
2704 | 325 | #. / Settings dialog - tab Network | 344 | #. / Settings dialog - tab Network |
2705 | 326 | #: src/gui/preferences.vala:228 | 345 | #: src/gui/preferences.vala:228 |
2706 | 327 | msgid "Proxy Server" | 346 | msgid "Proxy Server" |
2708 | 328 | msgstr "" | 347 | msgstr "Pelayan Proksi" |
2709 | 329 | 348 | ||
2710 | 330 | #. / Settings dialog - tab Network | 349 | #. / Settings dialog - tab Network |
2711 | 331 | #: src/gui/preferences.vala:238 | 350 | #: src/gui/preferences.vala:238 |
2712 | 332 | msgid "Proxy Server Port" | 351 | msgid "Proxy Server Port" |
2714 | 333 | msgstr "" | 352 | msgstr "Port Pelayan Proksi" |
2715 | 334 | 353 | ||
2716 | 335 | #. / Settings dialog, tab User Scripts | 354 | #. / Settings dialog, tab User Scripts |
2717 | 336 | #: src/gui/preferences.vala:280 | 355 | #: src/gui/preferences.vala:280 |
2718 | @@ -342,6 +361,8 @@ | |||
2719 | 342 | msgid "" | 361 | msgid "" |
2720 | 343 | "User scripts are used to enhance web interface of cloud music services." | 362 | "User scripts are used to enhance web interface of cloud music services." |
2721 | 344 | msgstr "" | 363 | msgstr "" |
2722 | 364 | "Skrip pengguna digunakan untuk tingkatkan antaramuka sesawang bagi " | ||
2723 | 365 | "perkhidmatan muzik awan." | ||
2724 | 345 | 366 | ||
2725 | 346 | #. / Settings dialog - tab User Scripts, warning | 367 | #. / Settings dialog - tab User Scripts, warning |
2726 | 347 | #: src/gui/preferences.vala:291 | 368 | #: src/gui/preferences.vala:291 |
2727 | @@ -350,21 +371,27 @@ | |||
2728 | 350 | "may be removed in future releases. User script can send data to third " | 371 | "may be removed in future releases. User script can send data to third " |
2729 | 351 | "parties, install only trustworthy user scripts." | 372 | "parties, install only trustworthy user scripts." |
2730 | 352 | msgstr "" | 373 | msgstr "" |
2731 | 374 | "<b>Amaran:</b> Sokongan untuk skrip pengguna tidak lengkap dan masih dalam " | ||
2732 | 375 | "eksperimen. Ia mungkin dibuang dalam keluaran akan datan. Skrip pengguna " | ||
2733 | 376 | "boleh menghantar data ke pihak ketiga, hanya pasang skrip pengguna yang " | ||
2734 | 377 | "dipercayai sahaja." | ||
2735 | 353 | 378 | ||
2736 | 354 | #. / Settings dialog - tab User Scripts | 379 | #. / Settings dialog - tab User Scripts |
2737 | 355 | #: src/gui/preferences.vala:301 | 380 | #: src/gui/preferences.vala:301 |
2738 | 356 | msgid "You have to select service to configure user scripts." | 381 | msgid "You have to select service to configure user scripts." |
2740 | 357 | msgstr "" | 382 | msgstr "Anda mesti pilih perkhidmatan untuk konfigur skrip pengguna." |
2741 | 358 | 383 | ||
2742 | 359 | #. / Settings dialog - tab User Scripts | 384 | #. / Settings dialog - tab User Scripts |
2743 | 360 | #: src/gui/preferences.vala:310 | 385 | #: src/gui/preferences.vala:310 |
2744 | 361 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" | 386 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" |
2745 | 362 | msgstr "" | 387 | msgstr "" |
2746 | 388 | "Senarai terpisah-koma bagi skrip pengguna yang dibenarkan untuk perkhidmatan " | ||
2747 | 389 | "<b>%s</b>:" | ||
2748 | 363 | 390 | ||
2749 | 364 | #. / Settings dialog - tab User Scripts, button to open user scripts directory | 391 | #. / Settings dialog - tab User Scripts, button to open user scripts directory |
2750 | 365 | #: src/gui/preferences.vala:325 | 392 | #: src/gui/preferences.vala:325 |
2751 | 366 | msgid "Open user scripts directory" | 393 | msgid "Open user scripts directory" |
2753 | 367 | msgstr "" | 394 | msgstr "Buka direktori skrip pengguna" |
2754 | 368 | 395 | ||
2755 | 369 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links | 396 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links |
2756 | 370 | #: src/gui/windows.vala:63 | 397 | #: src/gui/windows.vala:63 |
2757 | @@ -373,49 +400,58 @@ | |||
2758 | 373 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " | 400 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " |
2759 | 374 | "<a href='%4$s'>stable and beta builds</a>.</i>" | 401 | "<a href='%4$s'>stable and beta builds</a>.</i>" |
2760 | 375 | msgstr "" | 402 | msgstr "" |
2761 | 403 | "Anda sedang menjalankan <b>binaan tidak stabil %1$s</b>. <a " | ||
2762 | 404 | "href='%2$s'>Laporakn masalah</a>. <a href='%3$s'>Lihat log penukaran</a>. " | ||
2763 | 405 | "<i>Palang ini tidak dipaparkan dalam <a href='%4$s'>binaan stabil dan " | ||
2764 | 406 | "beta</a>.</i>" | ||
2765 | 376 | 407 | ||
2766 | 377 | #. / Shown in the About Nuvola Player dialog | 408 | #. / Shown in the About Nuvola Player dialog |
2767 | 378 | #: src/gui/windows.vala:163 | 409 | #: src/gui/windows.vala:163 |
2768 | 379 | msgid "Cloud music integration for your Linux desktop" | 410 | msgid "Cloud music integration for your Linux desktop" |
2770 | 380 | msgstr "" | 411 | msgstr "Penyepaduan muzik awan untuk desktop Linux anda" |
2771 | 381 | 412 | ||
2772 | 382 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) | 413 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) |
2773 | 383 | #: src/gui/windows.vala:165 | 414 | #: src/gui/windows.vala:165 |
2774 | 384 | msgid "translator-credits" | 415 | msgid "translator-credits" |
2775 | 385 | msgstr "" | 416 | msgstr "" |
2776 | 386 | "Launchpad Contributions:\n" | 417 | "Launchpad Contributions:\n" |
2777 | 418 | <<<<<<< TREE | ||
2778 | 387 | " Jiří Janoušek https://launchpad.net/~janousek.jiri\n" | 419 | " Jiří Janoušek https://launchpad.net/~janousek.jiri\n" |
2779 | 388 | " abuyop https://launchpad.net/~abuyop" | 420 | " abuyop https://launchpad.net/~abuyop" |
2780 | 421 | ======= | ||
2781 | 422 | " Jiří Janoušek https://launchpad.net/~fenryxo\n" | ||
2782 | 423 | " abuyop https://launchpad.net/~abuyop" | ||
2783 | 424 | >>>>>>> MERGE-SOURCE | ||
2784 | 389 | 425 | ||
2785 | 390 | #. / Title of the Crash dialog | 426 | #. / Title of the Crash dialog |
2786 | 391 | #: src/gui/windows.vala:205 | 427 | #: src/gui/windows.vala:205 |
2787 | 392 | msgid "Nuvola Player Crash Dialog" | 428 | msgid "Nuvola Player Crash Dialog" |
2789 | 393 | msgstr "" | 429 | msgstr "Dialog Kerosakan Pemain Nuvola" |
2790 | 394 | 430 | ||
2791 | 395 | #. / Crash dialog | 431 | #. / Crash dialog |
2792 | 396 | #: src/gui/windows.vala:220 | 432 | #: src/gui/windows.vala:220 |
2793 | 397 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" | 433 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" |
2795 | 398 | msgstr "" | 434 | msgstr "<b>Sesi Pemain Nuvola terdahulu tidak ditutup dengan betul.</b>" |
2796 | 399 | 435 | ||
2797 | 400 | #. / Crash dialog | 436 | #. / Crash dialog |
2798 | 401 | #: src/gui/windows.vala:228 | 437 | #: src/gui/windows.vala:228 |
2799 | 402 | msgid "You can try following options to solve this issue:" | 438 | msgid "You can try following options to solve this issue:" |
2801 | 403 | msgstr "" | 439 | msgstr "Anda boleh cuba pilihan berikut untuk leraikan isu ini:" |
2802 | 404 | 440 | ||
2803 | 405 | #. / Crash dialog | 441 | #. / Crash dialog |
2804 | 406 | #: src/gui/windows.vala:237 | 442 | #: src/gui/windows.vala:237 |
2805 | 407 | msgid "Reset configuration" | 443 | msgid "Reset configuration" |
2807 | 408 | msgstr "" | 444 | msgstr "Tetap semula konfigurasi" |
2808 | 409 | 445 | ||
2809 | 410 | #. / Crash dialog | 446 | #. / Crash dialog |
2810 | 411 | #: src/gui/windows.vala:240 | 447 | #: src/gui/windows.vala:240 |
2811 | 412 | msgid "Reset state of user interface" | 448 | msgid "Reset state of user interface" |
2813 | 413 | msgstr "" | 449 | msgstr "Tetap semula keadaan antaramuka pengguna" |
2814 | 414 | 450 | ||
2815 | 415 | #. / Crash dialog | 451 | #. / Crash dialog |
2816 | 416 | #: src/gui/windows.vala:254 | 452 | #: src/gui/windows.vala:254 |
2817 | 417 | msgid "Disable HTTP(S) proxy" | 453 | msgid "Disable HTTP(S) proxy" |
2819 | 418 | msgstr "" | 454 | msgstr "Lumpuhkan proksi HTTP(S)" |
2820 | 419 | 455 | ||
2821 | 420 | #. / Crash dialog | 456 | #. / Crash dialog |
2822 | 421 | #: src/gui/windows.vala:259 | 457 | #: src/gui/windows.vala:259 |
2823 | @@ -424,3 +460,6 @@ | |||
2824 | 424 | "known not to be very stable and may cause crash of Nuvola Player. Please " | 460 | "known not to be very stable and may cause crash of Nuvola Player. Please " |
2825 | 425 | "visit <a href='%s'>Flash troubleshooting</a>" | 461 | "visit <a href='%s'>Flash troubleshooting</a>" |
2826 | 426 | msgstr "" | 462 | msgstr "" |
2827 | 463 | "Perkkhidmatan muzik awan menggunakan Flash untuk main muzik. Malangnya, " | ||
2828 | 464 | "Pemain Flash yang diketahui tidak stabil dan mungkin menyebabkan kerosakan " | ||
2829 | 465 | "pada Pemain Nuvola. Sila lawati <a href='%s'>Pencarisilapan Flash</a>" | ||
2830 | 427 | 466 | ||
2831 | === modified file 'translations/nl.po' | |||
2832 | --- translations/nl.po 2012-02-13 19:25:11 +0000 | |||
2833 | +++ translations/nl.po 2012-06-15 15:20:27 +0000 | |||
2834 | @@ -8,14 +8,24 @@ | |||
2835 | 8 | "Project-Id-Version: nuvola-player\n" | 8 | "Project-Id-Version: nuvola-player\n" |
2836 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2837 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" |
2838 | 11 | <<<<<<< TREE | ||
2839 | 11 | "PO-Revision-Date: 2012-02-02 22:11+0000\n" | 12 | "PO-Revision-Date: 2012-02-02 22:11+0000\n" |
2840 | 12 | "Last-Translator: Hoster <Unknown>\n" | 13 | "Last-Translator: Hoster <Unknown>\n" |
2841 | 14 | ======= | ||
2842 | 15 | "PO-Revision-Date: 2012-03-13 16:16+0000\n" | ||
2843 | 16 | "Last-Translator: Yop Spanjers <Unknown>\n" | ||
2844 | 17 | >>>>>>> MERGE-SOURCE | ||
2845 | 13 | "Language-Team: Dutch <nl@li.org>\n" | 18 | "Language-Team: Dutch <nl@li.org>\n" |
2846 | 14 | "MIME-Version: 1.0\n" | 19 | "MIME-Version: 1.0\n" |
2847 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 20 | "Content-Type: text/plain; charset=UTF-8\n" |
2848 | 16 | "Content-Transfer-Encoding: 8bit\n" | 21 | "Content-Transfer-Encoding: 8bit\n" |
2849 | 22 | <<<<<<< TREE | ||
2850 | 17 | "X-Launchpad-Export-Date: 2012-02-03 06:29+0000\n" | 23 | "X-Launchpad-Export-Date: 2012-02-03 06:29+0000\n" |
2851 | 18 | "X-Generator: Launchpad (build 14738)\n" | 24 | "X-Generator: Launchpad (build 14738)\n" |
2852 | 25 | ======= | ||
2853 | 26 | "X-Launchpad-Export-Date: 2012-03-14 05:43+0000\n" | ||
2854 | 27 | "X-Generator: Launchpad (build 14933)\n" | ||
2855 | 28 | >>>>>>> MERGE-SOURCE | ||
2856 | 19 | 29 | ||
2857 | 20 | #. / Shown if unsupported command line argument is used | 30 | #. / Shown if unsupported command line argument is used |
2858 | 21 | #: src/main.vala:194 | 31 | #: src/main.vala:194 |
2859 | @@ -95,7 +105,7 @@ | |||
2860 | 95 | #. / Shown as heading in Service selector | 105 | #. / Shown as heading in Service selector |
2861 | 96 | #: src/service.vala:193 | 106 | #: src/service.vala:193 |
2862 | 97 | msgid "Select cloud music service" | 107 | msgid "Select cloud music service" |
2864 | 98 | msgstr "Selecteer de muziek service" | 108 | msgstr "Selecteer de online muziek service" |
2865 | 99 | 109 | ||
2866 | 100 | #. / Shown as label of Cancel button in Service selector | 110 | #. / Shown as label of Cancel button in Service selector |
2867 | 101 | #: src/service.vala:197 | 111 | #: src/service.vala:197 |
2868 | @@ -237,12 +247,13 @@ | |||
2869 | 237 | #. / Settings dialog - tab General | 247 | #. / Settings dialog - tab General |
2870 | 238 | #: src/gui/preferences.vala:114 | 248 | #: src/gui/preferences.vala:114 |
2871 | 239 | msgid "Always (may require tray icon)" | 249 | msgid "Always (may require tray icon)" |
2873 | 240 | msgstr "" | 250 | msgstr "Altijd (misschien een taakbalk icoon vereist)" |
2874 | 241 | 251 | ||
2875 | 242 | #. / Settings dialog - tab General | 252 | #. / Settings dialog - tab General |
2876 | 243 | #: src/gui/preferences.vala:117 | 253 | #: src/gui/preferences.vala:117 |
2877 | 244 | msgid "Only if music is playing (may require tray icon)" | 254 | msgid "Only if music is playing (may require tray icon)" |
2878 | 245 | msgstr "" | 255 | msgstr "" |
2879 | 256 | "Alleen als er muziek word afgespeeld (wellicht een taakbalk icoon vereist)" | ||
2880 | 246 | 257 | ||
2881 | 247 | #. / Settings dialog - tab General | 258 | #. / Settings dialog - tab General |
2882 | 248 | #. / Settings dialog - tab General, never show tray icon | 259 | #. / Settings dialog - tab General, never show tray icon |
2883 | @@ -277,6 +288,9 @@ | |||
2884 | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | 288 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " |
2885 | 278 | "Nuvola Player." | 289 | "Nuvola Player." |
2886 | 279 | msgstr "" | 290 | msgstr "" |
2887 | 291 | "Sommige cloud muziek diensten werken misschien niet met automatische " | ||
2888 | 292 | "instellingen en vereisen misschien handmatige SOCKS proxy instellingen. " | ||
2889 | 293 | "Nieuwe proxy instellingen zijn toegepast na het herstarten van Nuvola Player." | ||
2890 | 280 | 294 | ||
2891 | 281 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | 295 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used |
2892 | 282 | #: src/gui/preferences.vala:175 | 296 | #: src/gui/preferences.vala:175 |
2893 | @@ -384,9 +398,15 @@ | |||
2894 | 384 | msgid "translator-credits" | 398 | msgid "translator-credits" |
2895 | 385 | msgstr "" | 399 | msgstr "" |
2896 | 386 | "Launchpad Contributions:\n" | 400 | "Launchpad Contributions:\n" |
2897 | 401 | <<<<<<< TREE | ||
2898 | 387 | " Hoster https://launchpad.net/~yopspanjers\n" | 402 | " Hoster https://launchpad.net/~yopspanjers\n" |
2899 | 388 | " Jiří Janoušek https://launchpad.net/~fenryxo\n" | 403 | " Jiří Janoušek https://launchpad.net/~fenryxo\n" |
2900 | 389 | " Sander Deryckere https://launchpad.net/~sanderd17" | 404 | " Sander Deryckere https://launchpad.net/~sanderd17" |
2901 | 405 | ======= | ||
2902 | 406 | " Jiří Janoušek https://launchpad.net/~fenryxo\n" | ||
2903 | 407 | " Sander Deryckere https://launchpad.net/~sanderd17\n" | ||
2904 | 408 | " Yop Spanjers https://launchpad.net/~yopspanjers" | ||
2905 | 409 | >>>>>>> MERGE-SOURCE | ||
2906 | 390 | 410 | ||
2907 | 391 | #. / Title of the Crash dialog | 411 | #. / Title of the Crash dialog |
2908 | 392 | #: src/gui/windows.vala:205 | 412 | #: src/gui/windows.vala:205 |
2909 | 393 | 413 | ||
2910 | === modified file 'translations/pt_BR.po' | |||
2911 | --- translations/pt_BR.po 2011-12-17 22:35:50 +0000 | |||
2912 | +++ translations/pt_BR.po 2012-06-15 15:20:27 +0000 | |||
2913 | @@ -8,24 +8,24 @@ | |||
2914 | 8 | "Project-Id-Version: nuvola-player\n" | 8 | "Project-Id-Version: nuvola-player\n" |
2915 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" |
2916 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" |
2919 | 11 | "PO-Revision-Date: 2011-12-16 11:57+0000\n" | 11 | "PO-Revision-Date: 2012-03-28 15:55+0000\n" |
2920 | 12 | "Last-Translator: Jiří Janoušek <janousek.jiri@gmail.com>\n" | 12 | "Last-Translator: Belenos Govannnon <Unknown>\n" |
2921 | 13 | "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" | 13 | "Language-Team: Brazilian Portuguese <pt_BR@li.org>\n" |
2922 | 14 | "MIME-Version: 1.0\n" | 14 | "MIME-Version: 1.0\n" |
2923 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | 15 | "Content-Type: text/plain; charset=UTF-8\n" |
2924 | 16 | "Content-Transfer-Encoding: 8bit\n" | 16 | "Content-Transfer-Encoding: 8bit\n" |
2927 | 17 | "X-Launchpad-Export-Date: 2011-12-17 07:02+0000\n" | 17 | "X-Launchpad-Export-Date: 2012-03-29 05:21+0000\n" |
2928 | 18 | "X-Generator: Launchpad (build 14525)\n" | 18 | "X-Generator: Launchpad (build 15032)\n" |
2929 | 19 | 19 | ||
2930 | 20 | #. / Shown if unsupported command line argument is used | 20 | #. / Shown if unsupported command line argument is used |
2931 | 21 | #: src/main.vala:194 | 21 | #: src/main.vala:194 |
2932 | 22 | msgid "Error: Option parsing failed:" | 22 | msgid "Error: Option parsing failed:" |
2934 | 23 | msgstr "" | 23 | msgstr "Erro: falha ao executar opção:" |
2935 | 24 | 24 | ||
2936 | 25 | #. / Short label for command 'start or resume playback' | 25 | #. / Short label for command 'start or resume playback' |
2937 | 26 | #: src/player.vala:57 | 26 | #: src/player.vala:57 |
2938 | 27 | msgid "Play" | 27 | msgid "Play" |
2940 | 28 | msgstr "Tocar" | 28 | msgstr "Play" |
2941 | 29 | 29 | ||
2942 | 30 | #. / Short label for command 'pause playback' | 30 | #. / Short label for command 'pause playback' |
2943 | 31 | #: src/player.vala:59 | 31 | #: src/player.vala:59 |
2944 | @@ -45,22 +45,22 @@ | |||
2945 | 45 | #. / Short label for command 'thumb up' or 'like this song' (see Google Music buttons) | 45 | #. / Short label for command 'thumb up' or 'like this song' (see Google Music buttons) |
2946 | 46 | #: src/player.vala:65 | 46 | #: src/player.vala:65 |
2947 | 47 | msgid "Thumbs Up" | 47 | msgid "Thumbs Up" |
2949 | 48 | msgstr "" | 48 | msgstr "Curtir" |
2950 | 49 | 49 | ||
2951 | 50 | #. / Short label for command 'thumb down' or 'dislike this song' (see Google Music buttons) | 50 | #. / Short label for command 'thumb down' or 'dislike this song' (see Google Music buttons) |
2952 | 51 | #: src/player.vala:67 | 51 | #: src/player.vala:67 |
2953 | 52 | msgid "Thumbs Down" | 52 | msgid "Thumbs Down" |
2955 | 53 | msgstr "" | 53 | msgstr "Não curtir" |
2956 | 54 | 54 | ||
2957 | 55 | #. / Short label for command 'add this song to favorites' | 55 | #. / Short label for command 'add this song to favorites' |
2958 | 56 | #: src/player.vala:69 | 56 | #: src/player.vala:69 |
2959 | 57 | msgid "Favorite" | 57 | msgid "Favorite" |
2961 | 58 | msgstr "" | 58 | msgstr "Favorito" |
2962 | 59 | 59 | ||
2963 | 60 | #. / Short label for command 'quit application' | 60 | #. / Short label for command 'quit application' |
2964 | 61 | #: src/player.vala:71 | 61 | #: src/player.vala:71 |
2965 | 62 | msgid "Quit" | 62 | msgid "Quit" |
2967 | 63 | msgstr "Sair" | 63 | msgstr "Fechar" |
2968 | 64 | 64 | ||
2969 | 65 | #. / Initial notification | 65 | #. / Initial notification |
2970 | 66 | #: src/player.vala:166 | 66 | #: src/player.vala:166 |
2971 | @@ -70,12 +70,12 @@ | |||
2972 | 70 | #. / Shown in notification if both artist and album are unknown | 70 | #. / Shown in notification if both artist and album are unknown |
2973 | 71 | #: src/player.vala:301 | 71 | #: src/player.vala:301 |
2974 | 72 | msgid "by unknown artist" | 72 | msgid "by unknown artist" |
2976 | 73 | msgstr "" | 73 | msgstr "por Artista Desconhecido" |
2977 | 74 | 74 | ||
2978 | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name |
2979 | 76 | #: src/player.vala:305 | 76 | #: src/player.vala:305 |
2980 | 77 | msgid "by unknown artist from %s" | 77 | msgid "by unknown artist from %s" |
2982 | 78 | msgstr "" | 78 | msgstr "por Artista Desconhecido - %s" |
2983 | 79 | 79 | ||
2984 | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name |
2985 | 81 | #: src/player.vala:309 | 81 | #: src/player.vala:309 |
2986 | @@ -85,129 +85,129 @@ | |||
2987 | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name |
2988 | 86 | #: src/player.vala:313 | 86 | #: src/player.vala:313 |
2989 | 87 | msgid "by %1$s from %2$s" | 87 | msgid "by %1$s from %2$s" |
2991 | 88 | msgstr "" | 88 | msgstr "por %1$s - %2$s" |
2992 | 89 | 89 | ||
2993 | 90 | #. / Shown in Service selector if service doesn't provide description | 90 | #. / Shown in Service selector if service doesn't provide description |
2994 | 91 | #: src/service.vala:189 | 91 | #: src/service.vala:189 |
2995 | 92 | msgid "No description provided for this service." | 92 | msgid "No description provided for this service." |
2997 | 93 | msgstr "" | 93 | msgstr "Nenhuma descrição para este serviço." |
2998 | 94 | 94 | ||
2999 | 95 | #. / Shown as heading in Service selector | 95 | #. / Shown as heading in Service selector |
3000 | 96 | #: src/service.vala:193 | 96 | #: src/service.vala:193 |
3001 | 97 | msgid "Select cloud music service" | 97 | msgid "Select cloud music service" |
3003 | 98 | msgstr "" | 98 | msgstr "Selecione o serviço de música online" |
3004 | 99 | 99 | ||
3005 | 100 | #. / Shown as label of Cancel button in Service selector | 100 | #. / Shown as label of Cancel button in Service selector |
3006 | 101 | #: src/service.vala:197 | 101 | #: src/service.vala:197 |
3007 | 102 | msgid "Cancel" | 102 | msgid "Cancel" |
3009 | 103 | msgstr "" | 103 | msgstr "Cancelar" |
3010 | 104 | 104 | ||
3011 | 105 | #. / Menu Service | 105 | #. / Menu Service |
3012 | 106 | #: src/gui/actions.vala:110 | 106 | #: src/gui/actions.vala:110 |
3013 | 107 | msgid "_Service" | 107 | msgid "_Service" |
3015 | 108 | msgstr "" | 108 | msgstr "_Serviço" |
3016 | 109 | 109 | ||
3017 | 110 | #. / Menu item to switch service | 110 | #. / Menu item to switch service |
3018 | 111 | #: src/gui/actions.vala:117 | 111 | #: src/gui/actions.vala:117 |
3019 | 112 | msgid "_Switch Service" | 112 | msgid "_Switch Service" |
3021 | 113 | msgstr "" | 113 | msgstr "_Alterar serviço" |
3022 | 114 | 114 | ||
3023 | 115 | #. / Menu Control | 115 | #. / Menu Control |
3024 | 116 | #: src/gui/actions.vala:121 | 116 | #: src/gui/actions.vala:121 |
3025 | 117 | msgid "_Control" | 117 | msgid "_Control" |
3027 | 118 | msgstr "" | 118 | msgstr "_Controle" |
3028 | 119 | 119 | ||
3029 | 120 | #. / Menu View | 120 | #. / Menu View |
3030 | 121 | #: src/gui/actions.vala:128 | 121 | #: src/gui/actions.vala:128 |
3031 | 122 | msgid "_View" | 122 | msgid "_View" |
3033 | 123 | msgstr "" | 123 | msgstr "_Exibir" |
3034 | 124 | 124 | ||
3035 | 125 | #. / Menu Options | 125 | #. / Menu Options |
3036 | 126 | #: src/gui/actions.vala:135 | 126 | #: src/gui/actions.vala:135 |
3037 | 127 | msgid "_Options" | 127 | msgid "_Options" |
3039 | 128 | msgstr "" | 128 | msgstr "_Opções" |
3040 | 129 | 129 | ||
3041 | 130 | #. / Menu item to purge cookies | 130 | #. / Menu item to purge cookies |
3042 | 131 | #. / Crash dialog | 131 | #. / Crash dialog |
3043 | 132 | #: src/gui/actions.vala:137 src/gui/windows.vala:243 | 132 | #: src/gui/actions.vala:137 src/gui/windows.vala:243 |
3044 | 133 | msgid "Purge cookies" | 133 | msgid "Purge cookies" |
3046 | 134 | msgstr "" | 134 | msgstr "Limpar cookies" |
3047 | 135 | 135 | ||
3048 | 136 | #. / Menu item to purge album art cache | 136 | #. / Menu item to purge album art cache |
3049 | 137 | #: src/gui/actions.vala:139 | 137 | #: src/gui/actions.vala:139 |
3050 | 138 | msgid "Purge album art" | 138 | msgid "Purge album art" |
3052 | 139 | msgstr "" | 139 | msgstr "Limpar capas de álbuns" |
3053 | 140 | 140 | ||
3054 | 141 | #. / Menu item to purge browser cache | 141 | #. / Menu item to purge browser cache |
3055 | 142 | #. / Crash dialog | 142 | #. / Crash dialog |
3056 | 143 | #: src/gui/actions.vala:141 src/gui/windows.vala:248 | 143 | #: src/gui/actions.vala:141 src/gui/windows.vala:248 |
3057 | 144 | msgid "Purge browser cache" | 144 | msgid "Purge browser cache" |
3059 | 145 | msgstr "" | 145 | msgstr "Limpar o cache do navegador" |
3060 | 146 | 146 | ||
3061 | 147 | #. / Menu Help | 147 | #. / Menu Help |
3062 | 148 | #: src/gui/actions.vala:146 | 148 | #: src/gui/actions.vala:146 |
3063 | 149 | msgid "_Help" | 149 | msgid "_Help" |
3065 | 150 | msgstr "" | 150 | msgstr "_Ajuda" |
3066 | 151 | 151 | ||
3067 | 152 | #. / Menu item to open online help | 152 | #. / Menu item to open online help |
3068 | 153 | #: src/gui/actions.vala:148 | 153 | #: src/gui/actions.vala:148 |
3069 | 154 | msgid "Get help online" | 154 | msgid "Get help online" |
3071 | 155 | msgstr "" | 155 | msgstr "Obter ajuda online" |
3072 | 156 | 156 | ||
3073 | 157 | #. / Menu item to open bug/issue tracker | 157 | #. / Menu item to open bug/issue tracker |
3074 | 158 | #: src/gui/actions.vala:150 | 158 | #: src/gui/actions.vala:150 |
3075 | 159 | msgid "Report a problem" | 159 | msgid "Report a problem" |
3077 | 160 | msgstr "" | 160 | msgstr "Relatar problema" |
3078 | 161 | 161 | ||
3079 | 162 | #. / Menu item to open feature requests tracker | 162 | #. / Menu item to open feature requests tracker |
3080 | 163 | #: src/gui/actions.vala:152 | 163 | #: src/gui/actions.vala:152 |
3081 | 164 | msgid "Suggest new feature" | 164 | msgid "Suggest new feature" |
3083 | 165 | msgstr "" | 165 | msgstr "Sugira uma nova função" |
3084 | 166 | 166 | ||
3085 | 167 | #. / Menu item to open page with information about donations | 167 | #. / Menu item to open page with information about donations |
3086 | 168 | #: src/gui/actions.vala:154 | 168 | #: src/gui/actions.vala:154 |
3087 | 169 | msgid "Donate" | 169 | msgid "Donate" |
3089 | 170 | msgstr "" | 170 | msgstr "Faça uma Doação" |
3090 | 171 | 171 | ||
3091 | 172 | #. / Menu item to open Nuvola's page on Google+ social network | 172 | #. / Menu item to open Nuvola's page on Google+ social network |
3092 | 173 | #: src/gui/actions.vala:156 | 173 | #: src/gui/actions.vala:156 |
3093 | 174 | msgid "Google+ page" | 174 | msgid "Google+ page" |
3095 | 175 | msgstr "" | 175 | msgstr "Página no Google+" |
3096 | 176 | 176 | ||
3097 | 177 | #. / Menu item to open Nuvola's page on Facebook social network | 177 | #. / Menu item to open Nuvola's page on Facebook social network |
3098 | 178 | #: src/gui/actions.vala:158 | 178 | #: src/gui/actions.vala:158 |
3099 | 179 | msgid "Facebook page" | 179 | msgid "Facebook page" |
3101 | 180 | msgstr "" | 180 | msgstr "Página no Facebook" |
3102 | 181 | 181 | ||
3103 | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar |
3104 | 183 | #: src/gui/actions.vala:162 | 183 | #: src/gui/actions.vala:162 |
3105 | 184 | msgid "Nuvola Menu" | 184 | msgid "Nuvola Menu" |
3107 | 185 | msgstr "" | 185 | msgstr "Menu do Nuvola" |
3108 | 186 | 186 | ||
3109 | 187 | #. / Menu item to show both menu bar and tool bar | 187 | #. / Menu item to show both menu bar and tool bar |
3110 | 188 | #: src/gui/actions.vala:170 | 188 | #: src/gui/actions.vala:170 |
3111 | 189 | msgid "Both menubar and toolbar" | 189 | msgid "Both menubar and toolbar" |
3113 | 190 | msgstr "" | 190 | msgstr "Barra de menu e barra de ferramentas" |
3114 | 191 | 191 | ||
3115 | 192 | #. / Menu item to show only menu bar, tool bar is hidden | 192 | #. / Menu item to show only menu bar, tool bar is hidden |
3116 | 193 | #: src/gui/actions.vala:172 | 193 | #: src/gui/actions.vala:172 |
3117 | 194 | msgid "Only menubar" | 194 | msgid "Only menubar" |
3119 | 195 | msgstr "" | 195 | msgstr "Apenas a barra de menu" |
3120 | 196 | 196 | ||
3121 | 197 | #. / Menu item to show only tool bar, menu bar is hidden | 197 | #. / Menu item to show only tool bar, menu bar is hidden |
3122 | 198 | #: src/gui/actions.vala:174 | 198 | #: src/gui/actions.vala:174 |
3123 | 199 | msgid "Only toolbar" | 199 | msgid "Only toolbar" |
3125 | 200 | msgstr "" | 200 | msgstr "Apenas a barra de ferramentas" |
3126 | 201 | 201 | ||
3127 | 202 | #. / Menu item to open web page about the current release | 202 | #. / Menu item to open web page about the current release |
3128 | 203 | #: src/gui/actions.vala:183 | 203 | #: src/gui/actions.vala:183 |
3129 | 204 | msgid "About release %s" | 204 | msgid "About release %s" |
3131 | 205 | msgstr "" | 205 | msgstr "Sobre a versão %s" |
3132 | 206 | 206 | ||
3133 | 207 | #. / Preferences dialog title | 207 | #. / Preferences dialog title |
3134 | 208 | #: src/gui/preferences.vala:33 | 208 | #: src/gui/preferences.vala:33 |
3135 | 209 | msgid "Preferences" | 209 | msgid "Preferences" |
3137 | 210 | msgstr "" | 210 | msgstr "Preferências" |
3138 | 211 | 211 | ||
3139 | 212 | #. / Settings dialog, tab General | 212 | #. / Settings dialog, tab General |
3140 | 213 | #: src/gui/preferences.vala:88 | 213 | #: src/gui/preferences.vala:88 |
3141 | @@ -217,58 +217,58 @@ | |||
3142 | 217 | #. / Settings dialog - tab General | 217 | #. / Settings dialog - tab General |
3143 | 218 | #: src/gui/preferences.vala:91 | 218 | #: src/gui/preferences.vala:91 |
3144 | 219 | msgid "Handle multimedia keys." | 219 | msgid "Handle multimedia keys." |
3146 | 220 | msgstr "Manipular teclas de multimídia." | 220 | msgstr "Usar teclas multimídia" |
3147 | 221 | 221 | ||
3148 | 222 | #. / Settings dialog - tab General | 222 | #. / Settings dialog - tab General |
3149 | 223 | #: src/gui/preferences.vala:97 | 223 | #: src/gui/preferences.vala:97 |
3150 | 224 | msgid "Use Pause (break) key to toggle play/pause" | 224 | msgid "Use Pause (break) key to toggle play/pause" |
3152 | 225 | msgstr "Use a tecla Pause(break) para alternar entre tocar/pausar" | 225 | msgstr "Usar a tecla Pause para tocar/pausar" |
3153 | 226 | 226 | ||
3154 | 227 | #. / Settings dialog - tab General | 227 | #. / Settings dialog - tab General |
3155 | 228 | #: src/gui/preferences.vala:103 | 228 | #: src/gui/preferences.vala:103 |
3156 | 229 | msgid "Show notifications." | 229 | msgid "Show notifications." |
3158 | 230 | msgstr "" | 230 | msgstr "Exibir notificações" |
3159 | 231 | 231 | ||
3160 | 232 | #. / Settings dialog - tab General | 232 | #. / Settings dialog - tab General |
3161 | 233 | #: src/gui/preferences.vala:109 | 233 | #: src/gui/preferences.vala:109 |
3162 | 234 | msgid "Hide window if close button is pressed" | 234 | msgid "Hide window if close button is pressed" |
3164 | 235 | msgstr "" | 235 | msgstr "Esconder a janela ao fechar" |
3165 | 236 | 236 | ||
3166 | 237 | #. / Settings dialog - tab General | 237 | #. / Settings dialog - tab General |
3167 | 238 | #: src/gui/preferences.vala:114 | 238 | #: src/gui/preferences.vala:114 |
3168 | 239 | msgid "Always (may require tray icon)" | 239 | msgid "Always (may require tray icon)" |
3170 | 240 | msgstr "" | 240 | msgstr "Sempre (ícone de notificação será exibido)" |
3171 | 241 | 241 | ||
3172 | 242 | #. / Settings dialog - tab General | 242 | #. / Settings dialog - tab General |
3173 | 243 | #: src/gui/preferences.vala:117 | 243 | #: src/gui/preferences.vala:117 |
3174 | 244 | msgid "Only if music is playing (may require tray icon)" | 244 | msgid "Only if music is playing (may require tray icon)" |
3176 | 245 | msgstr "" | 245 | msgstr "Ao reproduzir (ícone de notificação será exibido)" |
3177 | 246 | 246 | ||
3178 | 247 | #. / Settings dialog - tab General | 247 | #. / Settings dialog - tab General |
3179 | 248 | #. / Settings dialog - tab General, never show tray icon | 248 | #. / Settings dialog - tab General, never show tray icon |
3180 | 249 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 | 249 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 |
3181 | 250 | msgid "Never" | 250 | msgid "Never" |
3183 | 251 | msgstr "" | 251 | msgstr "Nunca" |
3184 | 252 | 252 | ||
3185 | 253 | #. / Settings dialog - tab General | 253 | #. / Settings dialog - tab General |
3186 | 254 | #: src/gui/preferences.vala:134 | 254 | #: src/gui/preferences.vala:134 |
3187 | 255 | msgid "Show tray icon" | 255 | msgid "Show tray icon" |
3189 | 256 | msgstr "" | 256 | msgstr "Mostrar ícone de notificação" |
3190 | 257 | 257 | ||
3191 | 258 | #. / Settings dialog - tab General, always show tray icon | 258 | #. / Settings dialog - tab General, always show tray icon |
3192 | 259 | #: src/gui/preferences.vala:139 | 259 | #: src/gui/preferences.vala:139 |
3193 | 260 | msgid "Always" | 260 | msgid "Always" |
3195 | 261 | msgstr "" | 261 | msgstr "Sempre" |
3196 | 262 | 262 | ||
3197 | 263 | #. / Settings dialog - tab General, show tray icon if needed | 263 | #. / Settings dialog - tab General, show tray icon if needed |
3198 | 264 | #: src/gui/preferences.vala:142 | 264 | #: src/gui/preferences.vala:142 |
3199 | 265 | msgid "If needed" | 265 | msgid "If needed" |
3201 | 266 | msgstr "" | 266 | msgstr "Se necessário" |
3202 | 267 | 267 | ||
3203 | 268 | #. / Settings dialog tab | 268 | #. / Settings dialog tab |
3204 | 269 | #: src/gui/preferences.vala:163 | 269 | #: src/gui/preferences.vala:163 |
3205 | 270 | msgid "Network" | 270 | msgid "Network" |
3207 | 271 | msgstr "" | 271 | msgstr "Rede" |
3208 | 272 | 272 | ||
3209 | 273 | #. / Settings dialog - tab Network | 273 | #. / Settings dialog - tab Network |
3210 | 274 | #: src/gui/preferences.vala:166 | 274 | #: src/gui/preferences.vala:166 |
3211 | @@ -277,6 +277,9 @@ | |||
3212 | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " |
3213 | 278 | "Nuvola Player." | 278 | "Nuvola Player." |
3214 | 279 | msgstr "" | 279 | msgstr "" |
3215 | 280 | "Alguns serviços de música online não funcionarão com configurações " | ||
3216 | 281 | "automáticas e requerem configurações manuais de proxy SOCKS. Novas " | ||
3217 | 282 | "configurações de proxy serão aplicadas após reiniciar o Nuvola Player." | ||
3218 | 280 | 283 | ||
3219 | 281 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | 284 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used |
3220 | 282 | #: src/gui/preferences.vala:175 | 285 | #: src/gui/preferences.vala:175 |
3221 | @@ -285,6 +288,10 @@ | |||
3222 | 285 | "in your system has issues with HTTPS proxy support and it may cause crash of " | 288 | "in your system has issues with HTTPS proxy support and it may cause crash of " |
3223 | 286 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." | 289 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." |
3224 | 287 | msgstr "" | 290 | msgstr "" |
3225 | 291 | "<b>Atenção:</b> Uma versão da biblioteca usada para a conexão de rede em seu " | ||
3226 | 292 | "sistema está com erros de suporte no proxy HTTPS e pode fazer com que o " | ||
3227 | 293 | "Nuvola Player pare de funcionar. O uso de configuração de proxy HTTP(S) não " | ||
3228 | 294 | "é recomendado." | ||
3229 | 288 | 295 | ||
3230 | 289 | #. / Settings dialog - tab Network, shown if tsocks library was not detected | 296 | #. / Settings dialog - tab Network, shown if tsocks library was not detected |
3231 | 290 | #: src/gui/preferences.vala:185 | 297 | #: src/gui/preferences.vala:185 |
3232 | @@ -292,56 +299,60 @@ | |||
3233 | 292 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " | 299 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " |
3234 | 293 | "may not be supported." | 300 | "may not be supported." |
3235 | 294 | msgstr "" | 301 | msgstr "" |
3236 | 302 | "<b>Atenção:</b> Nenhuma <a href='%s'>bliblioteca TSOCKS</a> foi encontrada. " | ||
3237 | 303 | "Proxy SOCKS não é suportado." | ||
3238 | 295 | 304 | ||
3239 | 296 | #. / Settings dialog - tab Network | 305 | #. / Settings dialog - tab Network |
3240 | 297 | #: src/gui/preferences.vala:195 | 306 | #: src/gui/preferences.vala:195 |
3241 | 298 | msgid "Use direct connection without a proxy server" | 307 | msgid "Use direct connection without a proxy server" |
3243 | 299 | msgstr "" | 308 | msgstr "Usar conexão direta, sem servidor proxy" |
3244 | 300 | 309 | ||
3245 | 301 | #. / Settings dialog - tab Network | 310 | #. / Settings dialog - tab Network |
3246 | 302 | #: src/gui/preferences.vala:199 | 311 | #: src/gui/preferences.vala:199 |
3247 | 303 | msgid "Use system HTTP(S) proxy settings" | 312 | msgid "Use system HTTP(S) proxy settings" |
3249 | 304 | msgstr "" | 313 | msgstr "Usar sistema HTTP(S) de configuração de proxy" |
3250 | 305 | 314 | ||
3251 | 306 | #. / Settings dialog - tab Network | 315 | #. / Settings dialog - tab Network |
3252 | 307 | #: src/gui/preferences.vala:203 | 316 | #: src/gui/preferences.vala:203 |
3253 | 308 | msgid "Use manual proxy settings" | 317 | msgid "Use manual proxy settings" |
3255 | 309 | msgstr "" | 318 | msgstr "Usar configuração manual de proxy" |
3256 | 310 | 319 | ||
3257 | 311 | #: src/gui/preferences.vala:212 | 320 | #: src/gui/preferences.vala:212 |
3258 | 312 | msgid "Proxy Type" | 321 | msgid "Proxy Type" |
3260 | 313 | msgstr "" | 322 | msgstr "Tipo de Proxy" |
3261 | 314 | 323 | ||
3262 | 315 | #. / Settings dialog - tab Network, proxy type HTTP(S) | 324 | #. / Settings dialog - tab Network, proxy type HTTP(S) |
3263 | 316 | #: src/gui/preferences.vala:215 | 325 | #: src/gui/preferences.vala:215 |
3264 | 317 | msgid "HTTP(S)" | 326 | msgid "HTTP(S)" |
3266 | 318 | msgstr "" | 327 | msgstr "HTTP(S)" |
3267 | 319 | 328 | ||
3268 | 320 | #. / Settings dialog - tab Network, proxy type SOCKS | 329 | #. / Settings dialog - tab Network, proxy type SOCKS |
3269 | 321 | #: src/gui/preferences.vala:218 | 330 | #: src/gui/preferences.vala:218 |
3270 | 322 | msgid "SOCKS" | 331 | msgid "SOCKS" |
3272 | 323 | msgstr "" | 332 | msgstr "SOCKS" |
3273 | 324 | 333 | ||
3274 | 325 | #. / Settings dialog - tab Network | 334 | #. / Settings dialog - tab Network |
3275 | 326 | #: src/gui/preferences.vala:228 | 335 | #: src/gui/preferences.vala:228 |
3276 | 327 | msgid "Proxy Server" | 336 | msgid "Proxy Server" |
3278 | 328 | msgstr "" | 337 | msgstr "Servidor Proxy" |
3279 | 329 | 338 | ||
3280 | 330 | #. / Settings dialog - tab Network | 339 | #. / Settings dialog - tab Network |
3281 | 331 | #: src/gui/preferences.vala:238 | 340 | #: src/gui/preferences.vala:238 |
3282 | 332 | msgid "Proxy Server Port" | 341 | msgid "Proxy Server Port" |
3284 | 333 | msgstr "" | 342 | msgstr "Porta do Servidor Proxy" |
3285 | 334 | 343 | ||
3286 | 335 | #. / Settings dialog, tab User Scripts | 344 | #. / Settings dialog, tab User Scripts |
3287 | 336 | #: src/gui/preferences.vala:280 | 345 | #: src/gui/preferences.vala:280 |
3288 | 337 | msgid "User scripts" | 346 | msgid "User scripts" |
3290 | 338 | msgstr "" | 347 | msgstr "Scripts do usuário" |
3291 | 339 | 348 | ||
3292 | 340 | #. / Settings dialog - tab User Scripts | 349 | #. / Settings dialog - tab User Scripts |
3293 | 341 | #: src/gui/preferences.vala:283 | 350 | #: src/gui/preferences.vala:283 |
3294 | 342 | msgid "" | 351 | msgid "" |
3295 | 343 | "User scripts are used to enhance web interface of cloud music services." | 352 | "User scripts are used to enhance web interface of cloud music services." |
3296 | 344 | msgstr "" | 353 | msgstr "" |
3297 | 354 | "Scripts do usuário são utilizados para aprimorar a interface web dos " | ||
3298 | 355 | "serviços de música online." | ||
3299 | 345 | 356 | ||
3300 | 346 | #. / Settings dialog - tab User Scripts, warning | 357 | #. / Settings dialog - tab User Scripts, warning |
3301 | 347 | #: src/gui/preferences.vala:291 | 358 | #: src/gui/preferences.vala:291 |
3302 | @@ -350,21 +361,29 @@ | |||
3303 | 350 | "may be removed in future releases. User script can send data to third " | 361 | "may be removed in future releases. User script can send data to third " |
3304 | 351 | "parties, install only trustworthy user scripts." | 362 | "parties, install only trustworthy user scripts." |
3305 | 352 | msgstr "" | 363 | msgstr "" |
3306 | 364 | "<b>Atenção:</b> O suporte a scripts do usuário está incompleto e é " | ||
3307 | 365 | "experimental, podendo ser removido em versões futuras. Os scripts do usuário " | ||
3308 | 366 | "podem enviar informações para terceiros — instale apenas scripts de sua " | ||
3309 | 367 | "confiança." | ||
3310 | 353 | 368 | ||
3311 | 354 | #. / Settings dialog - tab User Scripts | 369 | #. / Settings dialog - tab User Scripts |
3312 | 355 | #: src/gui/preferences.vala:301 | 370 | #: src/gui/preferences.vala:301 |
3313 | 356 | msgid "You have to select service to configure user scripts." | 371 | msgid "You have to select service to configure user scripts." |
3314 | 357 | msgstr "" | 372 | msgstr "" |
3315 | 373 | "Você deve primeiro selecionar o serviço, então configure os scripts de " | ||
3316 | 374 | "usuários." | ||
3317 | 358 | 375 | ||
3318 | 359 | #. / Settings dialog - tab User Scripts | 376 | #. / Settings dialog - tab User Scripts |
3319 | 360 | #: src/gui/preferences.vala:310 | 377 | #: src/gui/preferences.vala:310 |
3320 | 361 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" | 378 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" |
3321 | 362 | msgstr "" | 379 | msgstr "" |
3322 | 380 | "Listas de scripts de usuário (separados por vírgula) ativos no serviço " | ||
3323 | 381 | "<b>%s</b>:" | ||
3324 | 363 | 382 | ||
3325 | 364 | #. / Settings dialog - tab User Scripts, button to open user scripts directory | 383 | #. / Settings dialog - tab User Scripts, button to open user scripts directory |
3326 | 365 | #: src/gui/preferences.vala:325 | 384 | #: src/gui/preferences.vala:325 |
3327 | 366 | msgid "Open user scripts directory" | 385 | msgid "Open user scripts directory" |
3329 | 367 | msgstr "" | 386 | msgstr "Abrir o diretório dos scripts do usuário" |
3330 | 368 | 387 | ||
3331 | 369 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links | 388 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links |
3332 | 370 | #: src/gui/windows.vala:63 | 389 | #: src/gui/windows.vala:63 |
3333 | @@ -373,48 +392,55 @@ | |||
3334 | 373 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " | 392 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " |
3335 | 374 | "<a href='%4$s'>stable and beta builds</a>.</i>" | 393 | "<a href='%4$s'>stable and beta builds</a>.</i>" |
3336 | 375 | msgstr "" | 394 | msgstr "" |
3337 | 395 | "Você está usando a <b>versão instável %1$s</b>. <a href='%2$s'>Reporte um " | ||
3338 | 396 | "bug</a>. <a href='%3$s'>Veja o changelog</a>. <i>Este aviso não é mostrado " | ||
3339 | 397 | "nas versões <a href='%4$s'>finais e beta</a>.</i>" | ||
3340 | 376 | 398 | ||
3341 | 377 | #. / Shown in the About Nuvola Player dialog | 399 | #. / Shown in the About Nuvola Player dialog |
3342 | 378 | #: src/gui/windows.vala:163 | 400 | #: src/gui/windows.vala:163 |
3343 | 379 | msgid "Cloud music integration for your Linux desktop" | 401 | msgid "Cloud music integration for your Linux desktop" |
3345 | 380 | msgstr "" | 402 | msgstr "Integração de música online para seu desktop Linux." |
3346 | 381 | 403 | ||
3347 | 382 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) | 404 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) |
3348 | 383 | #: src/gui/windows.vala:165 | 405 | #: src/gui/windows.vala:165 |
3349 | 384 | msgid "translator-credits" | 406 | msgid "translator-credits" |
3350 | 385 | msgstr "" | 407 | msgstr "" |
3351 | 386 | "Launchpad Contributions:\n" | 408 | "Launchpad Contributions:\n" |
3353 | 387 | " Jiří Janoušek https://launchpad.net/~janousek.jiri" | 409 | " Belenos Govannnon https://launchpad.net/~belenos\n" |
3354 | 410 | " Darlildo Lima https://launchpad.net/~darlildo-cefetce\n" | ||
3355 | 411 | " Jiří Janoušek https://launchpad.net/~fenryxo\n" | ||
3356 | 412 | " Ron Alon https://launchpad.net/~ro2342" | ||
3357 | 388 | 413 | ||
3358 | 389 | #. / Title of the Crash dialog | 414 | #. / Title of the Crash dialog |
3359 | 390 | #: src/gui/windows.vala:205 | 415 | #: src/gui/windows.vala:205 |
3360 | 391 | msgid "Nuvola Player Crash Dialog" | 416 | msgid "Nuvola Player Crash Dialog" |
3362 | 392 | msgstr "" | 417 | msgstr "Fechamento inesperado do Nuvola Player" |
3363 | 393 | 418 | ||
3364 | 394 | #. / Crash dialog | 419 | #. / Crash dialog |
3365 | 395 | #: src/gui/windows.vala:220 | 420 | #: src/gui/windows.vala:220 |
3366 | 396 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" | 421 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" |
3367 | 397 | msgstr "" | 422 | msgstr "" |
3368 | 423 | "<b>A sessão anterior do Nuvola Player não foi fechada corretamente.</b>" | ||
3369 | 398 | 424 | ||
3370 | 399 | #. / Crash dialog | 425 | #. / Crash dialog |
3371 | 400 | #: src/gui/windows.vala:228 | 426 | #: src/gui/windows.vala:228 |
3372 | 401 | msgid "You can try following options to solve this issue:" | 427 | msgid "You can try following options to solve this issue:" |
3374 | 402 | msgstr "" | 428 | msgstr "Você pode corrigir este problema com as opções a seguir:" |
3375 | 403 | 429 | ||
3376 | 404 | #. / Crash dialog | 430 | #. / Crash dialog |
3377 | 405 | #: src/gui/windows.vala:237 | 431 | #: src/gui/windows.vala:237 |
3378 | 406 | msgid "Reset configuration" | 432 | msgid "Reset configuration" |
3380 | 407 | msgstr "" | 433 | msgstr "Reiniciar Configuração" |
3381 | 408 | 434 | ||
3382 | 409 | #. / Crash dialog | 435 | #. / Crash dialog |
3383 | 410 | #: src/gui/windows.vala:240 | 436 | #: src/gui/windows.vala:240 |
3384 | 411 | msgid "Reset state of user interface" | 437 | msgid "Reset state of user interface" |
3386 | 412 | msgstr "" | 438 | msgstr "Resetar o estado da interface do usuário" |
3387 | 413 | 439 | ||
3388 | 414 | #. / Crash dialog | 440 | #. / Crash dialog |
3389 | 415 | #: src/gui/windows.vala:254 | 441 | #: src/gui/windows.vala:254 |
3390 | 416 | msgid "Disable HTTP(S) proxy" | 442 | msgid "Disable HTTP(S) proxy" |
3392 | 417 | msgstr "" | 443 | msgstr "Desabilitar o proxy HTTP(S)" |
3393 | 418 | 444 | ||
3394 | 419 | #. / Crash dialog | 445 | #. / Crash dialog |
3395 | 420 | #: src/gui/windows.vala:259 | 446 | #: src/gui/windows.vala:259 |
3396 | @@ -423,3 +449,7 @@ | |||
3397 | 423 | "known not to be very stable and may cause crash of Nuvola Player. Please " | 449 | "known not to be very stable and may cause crash of Nuvola Player. Please " |
3398 | 424 | "visit <a href='%s'>Flash troubleshooting</a>" | 450 | "visit <a href='%s'>Flash troubleshooting</a>" |
3399 | 425 | msgstr "" | 451 | msgstr "" |
3400 | 452 | "Serviços de música na nuvem utilizam o Flash para tocar músicas. " | ||
3401 | 453 | "Infelizmente o Flash Player é conhecido por não ser muito estável e pode " | ||
3402 | 454 | "causar o fechamento inesperado do Nuvola Player. Por favor, visite a <a " | ||
3403 | 455 | "href='%s'>solução de problemas</a> do Flash." | ||
3404 | 426 | 456 | ||
3405 | === added file 'translations/sq.po' | |||
3406 | --- translations/sq.po 1970-01-01 00:00:00 +0000 | |||
3407 | +++ translations/sq.po 2012-06-15 15:20:27 +0000 | |||
3408 | @@ -0,0 +1,425 @@ | |||
3409 | 1 | # Albanian translation for nuvola-player | ||
3410 | 2 | # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 | ||
3411 | 3 | # This file is distributed under the same license as the nuvola-player package. | ||
3412 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2012. | ||
3413 | 5 | # | ||
3414 | 6 | msgid "" | ||
3415 | 7 | msgstr "" | ||
3416 | 8 | "Project-Id-Version: nuvola-player\n" | ||
3417 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
3418 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | ||
3419 | 11 | "PO-Revision-Date: 2012-03-25 19:19+0000\n" | ||
3420 | 12 | "Last-Translator: tomson <mendimiilire@gmail.com>\n" | ||
3421 | 13 | "Language-Team: Albanian <sq@li.org>\n" | ||
3422 | 14 | "MIME-Version: 1.0\n" | ||
3423 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
3424 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
3425 | 17 | "X-Launchpad-Export-Date: 2012-03-26 05:33+0000\n" | ||
3426 | 18 | "X-Generator: Launchpad (build 15008)\n" | ||
3427 | 19 | |||
3428 | 20 | #. / Shown if unsupported command line argument is used | ||
3429 | 21 | #: src/main.vala:194 | ||
3430 | 22 | msgid "Error: Option parsing failed:" | ||
3431 | 23 | msgstr "" | ||
3432 | 24 | |||
3433 | 25 | #. / Short label for command 'start or resume playback' | ||
3434 | 26 | #: src/player.vala:57 | ||
3435 | 27 | msgid "Play" | ||
3436 | 28 | msgstr "Luaj" | ||
3437 | 29 | |||
3438 | 30 | #. / Short label for command 'pause playback' | ||
3439 | 31 | #: src/player.vala:59 | ||
3440 | 32 | msgid "Pause" | ||
3441 | 33 | msgstr "Pushim" | ||
3442 | 34 | |||
3443 | 35 | #. / Short label for command 'skip to previous song' | ||
3444 | 36 | #: src/player.vala:61 | ||
3445 | 37 | msgid "Previous song" | ||
3446 | 38 | msgstr "Kënga e mëparshme" | ||
3447 | 39 | |||
3448 | 40 | #. / Short label for command 'skip to next song' | ||
3449 | 41 | #: src/player.vala:63 | ||
3450 | 42 | msgid "Next song" | ||
3451 | 43 | msgstr "Kënga tjetër" | ||
3452 | 44 | |||
3453 | 45 | #. / Short label for command 'thumb up' or 'like this song' (see Google Music buttons) | ||
3454 | 46 | #: src/player.vala:65 | ||
3455 | 47 | msgid "Thumbs Up" | ||
3456 | 48 | msgstr "Më pëlqen kjo këngë" | ||
3457 | 49 | |||
3458 | 50 | #. / Short label for command 'thumb down' or 'dislike this song' (see Google Music buttons) | ||
3459 | 51 | #: src/player.vala:67 | ||
3460 | 52 | msgid "Thumbs Down" | ||
3461 | 53 | msgstr "S'më pëlqen kjo këngë" | ||
3462 | 54 | |||
3463 | 55 | #. / Short label for command 'add this song to favorites' | ||
3464 | 56 | #: src/player.vala:69 | ||
3465 | 57 | msgid "Favorite" | ||
3466 | 58 | msgstr "Parapëlqej" | ||
3467 | 59 | |||
3468 | 60 | #. / Short label for command 'quit application' | ||
3469 | 61 | #: src/player.vala:71 | ||
3470 | 62 | msgid "Quit" | ||
3471 | 63 | msgstr "Mbylle" | ||
3472 | 64 | |||
3473 | 65 | #. / Initial notification | ||
3474 | 66 | #: src/player.vala:166 | ||
3475 | 67 | msgid "Version" | ||
3476 | 68 | msgstr "" | ||
3477 | 69 | |||
3478 | 70 | #. / Shown in notification if both artist and album are unknown | ||
3479 | 71 | #: src/player.vala:301 | ||
3480 | 72 | msgid "by unknown artist" | ||
3481 | 73 | msgstr "prej artistit të panjohur" | ||
3482 | 74 | |||
3483 | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name | ||
3484 | 76 | #: src/player.vala:305 | ||
3485 | 77 | msgid "by unknown artist from %s" | ||
3486 | 78 | msgstr "prej artistit të panjohur nga %s" | ||
3487 | 79 | |||
3488 | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name | ||
3489 | 81 | #: src/player.vala:309 | ||
3490 | 82 | msgid "by %s" | ||
3491 | 83 | msgstr "prej %s" | ||
3492 | 84 | |||
3493 | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name | ||
3494 | 86 | #: src/player.vala:313 | ||
3495 | 87 | msgid "by %1$s from %2$s" | ||
3496 | 88 | msgstr "prej %1$s nga %2$s" | ||
3497 | 89 | |||
3498 | 90 | #. / Shown in Service selector if service doesn't provide description | ||
3499 | 91 | #: src/service.vala:189 | ||
3500 | 92 | msgid "No description provided for this service." | ||
3501 | 93 | msgstr "S'ka përshkrim për këtë shërbim." | ||
3502 | 94 | |||
3503 | 95 | #. / Shown as heading in Service selector | ||
3504 | 96 | #: src/service.vala:193 | ||
3505 | 97 | msgid "Select cloud music service" | ||
3506 | 98 | msgstr "Zgjidh shërbimin e jashtëm të muzikës" | ||
3507 | 99 | |||
3508 | 100 | #. / Shown as label of Cancel button in Service selector | ||
3509 | 101 | #: src/service.vala:197 | ||
3510 | 102 | msgid "Cancel" | ||
3511 | 103 | msgstr "Fshije" | ||
3512 | 104 | |||
3513 | 105 | #. / Menu Service | ||
3514 | 106 | #: src/gui/actions.vala:110 | ||
3515 | 107 | msgid "_Service" | ||
3516 | 108 | msgstr "_Shërbim" | ||
3517 | 109 | |||
3518 | 110 | #. / Menu item to switch service | ||
3519 | 111 | #: src/gui/actions.vala:117 | ||
3520 | 112 | msgid "_Switch Service" | ||
3521 | 113 | msgstr "_Ndërro Shërbim" | ||
3522 | 114 | |||
3523 | 115 | #. / Menu Control | ||
3524 | 116 | #: src/gui/actions.vala:121 | ||
3525 | 117 | msgid "_Control" | ||
3526 | 118 | msgstr "" | ||
3527 | 119 | |||
3528 | 120 | #. / Menu View | ||
3529 | 121 | #: src/gui/actions.vala:128 | ||
3530 | 122 | msgid "_View" | ||
3531 | 123 | msgstr "_Pamje" | ||
3532 | 124 | |||
3533 | 125 | #. / Menu Options | ||
3534 | 126 | #: src/gui/actions.vala:135 | ||
3535 | 127 | msgid "_Options" | ||
3536 | 128 | msgstr "_Mundësitë" | ||
3537 | 129 | |||
3538 | 130 | #. / Menu item to purge cookies | ||
3539 | 131 | #. / Crash dialog | ||
3540 | 132 | #: src/gui/actions.vala:137 src/gui/windows.vala:243 | ||
3541 | 133 | msgid "Purge cookies" | ||
3542 | 134 | msgstr "" | ||
3543 | 135 | |||
3544 | 136 | #. / Menu item to purge album art cache | ||
3545 | 137 | #: src/gui/actions.vala:139 | ||
3546 | 138 | msgid "Purge album art" | ||
3547 | 139 | msgstr "" | ||
3548 | 140 | |||
3549 | 141 | #. / Menu item to purge browser cache | ||
3550 | 142 | #. / Crash dialog | ||
3551 | 143 | #: src/gui/actions.vala:141 src/gui/windows.vala:248 | ||
3552 | 144 | msgid "Purge browser cache" | ||
3553 | 145 | msgstr "" | ||
3554 | 146 | |||
3555 | 147 | #. / Menu Help | ||
3556 | 148 | #: src/gui/actions.vala:146 | ||
3557 | 149 | msgid "_Help" | ||
3558 | 150 | msgstr "_Ndihmë" | ||
3559 | 151 | |||
3560 | 152 | #. / Menu item to open online help | ||
3561 | 153 | #: src/gui/actions.vala:148 | ||
3562 | 154 | msgid "Get help online" | ||
3563 | 155 | msgstr "Merr ndihmë në linjë" | ||
3564 | 156 | |||
3565 | 157 | #. / Menu item to open bug/issue tracker | ||
3566 | 158 | #: src/gui/actions.vala:150 | ||
3567 | 159 | msgid "Report a problem" | ||
3568 | 160 | msgstr "" | ||
3569 | 161 | |||
3570 | 162 | #. / Menu item to open feature requests tracker | ||
3571 | 163 | #: src/gui/actions.vala:152 | ||
3572 | 164 | msgid "Suggest new feature" | ||
3573 | 165 | msgstr "" | ||
3574 | 166 | |||
3575 | 167 | #. / Menu item to open page with information about donations | ||
3576 | 168 | #: src/gui/actions.vala:154 | ||
3577 | 169 | msgid "Donate" | ||
3578 | 170 | msgstr "Dhuro" | ||
3579 | 171 | |||
3580 | 172 | #. / Menu item to open Nuvola's page on Google+ social network | ||
3581 | 173 | #: src/gui/actions.vala:156 | ||
3582 | 174 | msgid "Google+ page" | ||
3583 | 175 | msgstr "Faqja e Google+" | ||
3584 | 176 | |||
3585 | 177 | #. / Menu item to open Nuvola's page on Facebook social network | ||
3586 | 178 | #: src/gui/actions.vala:158 | ||
3587 | 179 | msgid "Facebook page" | ||
3588 | 180 | msgstr "Faqja e Facebook" | ||
3589 | 181 | |||
3590 | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar | ||
3591 | 183 | #: src/gui/actions.vala:162 | ||
3592 | 184 | msgid "Nuvola Menu" | ||
3593 | 185 | msgstr "Menuja e Nuvola-s" | ||
3594 | 186 | |||
3595 | 187 | #. / Menu item to show both menu bar and tool bar | ||
3596 | 188 | #: src/gui/actions.vala:170 | ||
3597 | 189 | msgid "Both menubar and toolbar" | ||
3598 | 190 | msgstr "" | ||
3599 | 191 | |||
3600 | 192 | #. / Menu item to show only menu bar, tool bar is hidden | ||
3601 | 193 | #: src/gui/actions.vala:172 | ||
3602 | 194 | msgid "Only menubar" | ||
3603 | 195 | msgstr "" | ||
3604 | 196 | |||
3605 | 197 | #. / Menu item to show only tool bar, menu bar is hidden | ||
3606 | 198 | #: src/gui/actions.vala:174 | ||
3607 | 199 | msgid "Only toolbar" | ||
3608 | 200 | msgstr "" | ||
3609 | 201 | |||
3610 | 202 | #. / Menu item to open web page about the current release | ||
3611 | 203 | #: src/gui/actions.vala:183 | ||
3612 | 204 | msgid "About release %s" | ||
3613 | 205 | msgstr "" | ||
3614 | 206 | |||
3615 | 207 | #. / Preferences dialog title | ||
3616 | 208 | #: src/gui/preferences.vala:33 | ||
3617 | 209 | msgid "Preferences" | ||
3618 | 210 | msgstr "Parapëlqimet" | ||
3619 | 211 | |||
3620 | 212 | #. / Settings dialog, tab General | ||
3621 | 213 | #: src/gui/preferences.vala:88 | ||
3622 | 214 | msgid "General" | ||
3623 | 215 | msgstr "Të përgjithshme" | ||
3624 | 216 | |||
3625 | 217 | #. / Settings dialog - tab General | ||
3626 | 218 | #: src/gui/preferences.vala:91 | ||
3627 | 219 | msgid "Handle multimedia keys." | ||
3628 | 220 | msgstr "" | ||
3629 | 221 | |||
3630 | 222 | #. / Settings dialog - tab General | ||
3631 | 223 | #: src/gui/preferences.vala:97 | ||
3632 | 224 | msgid "Use Pause (break) key to toggle play/pause" | ||
3633 | 225 | msgstr "" | ||
3634 | 226 | |||
3635 | 227 | #. / Settings dialog - tab General | ||
3636 | 228 | #: src/gui/preferences.vala:103 | ||
3637 | 229 | msgid "Show notifications." | ||
3638 | 230 | msgstr "Shfaq njoftimet." | ||
3639 | 231 | |||
3640 | 232 | #. / Settings dialog - tab General | ||
3641 | 233 | #: src/gui/preferences.vala:109 | ||
3642 | 234 | msgid "Hide window if close button is pressed" | ||
3643 | 235 | msgstr "Fshihe dritaren nqs shtypet butoni mbylle." | ||
3644 | 236 | |||
3645 | 237 | #. / Settings dialog - tab General | ||
3646 | 238 | #: src/gui/preferences.vala:114 | ||
3647 | 239 | msgid "Always (may require tray icon)" | ||
3648 | 240 | msgstr "" | ||
3649 | 241 | |||
3650 | 242 | #. / Settings dialog - tab General | ||
3651 | 243 | #: src/gui/preferences.vala:117 | ||
3652 | 244 | msgid "Only if music is playing (may require tray icon)" | ||
3653 | 245 | msgstr "" | ||
3654 | 246 | |||
3655 | 247 | #. / Settings dialog - tab General | ||
3656 | 248 | #. / Settings dialog - tab General, never show tray icon | ||
3657 | 249 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 | ||
3658 | 250 | msgid "Never" | ||
3659 | 251 | msgstr "Kurrë" | ||
3660 | 252 | |||
3661 | 253 | #. / Settings dialog - tab General | ||
3662 | 254 | #: src/gui/preferences.vala:134 | ||
3663 | 255 | msgid "Show tray icon" | ||
3664 | 256 | msgstr "Shfaq ikonën në shirit" | ||
3665 | 257 | |||
3666 | 258 | #. / Settings dialog - tab General, always show tray icon | ||
3667 | 259 | #: src/gui/preferences.vala:139 | ||
3668 | 260 | msgid "Always" | ||
3669 | 261 | msgstr "Gjithmonë" | ||
3670 | 262 | |||
3671 | 263 | #. / Settings dialog - tab General, show tray icon if needed | ||
3672 | 264 | #: src/gui/preferences.vala:142 | ||
3673 | 265 | msgid "If needed" | ||
3674 | 266 | msgstr "Nqs nevojitet" | ||
3675 | 267 | |||
3676 | 268 | #. / Settings dialog tab | ||
3677 | 269 | #: src/gui/preferences.vala:163 | ||
3678 | 270 | msgid "Network" | ||
3679 | 271 | msgstr "Rrjet" | ||
3680 | 272 | |||
3681 | 273 | #. / Settings dialog - tab Network | ||
3682 | 274 | #: src/gui/preferences.vala:166 | ||
3683 | 275 | msgid "" | ||
3684 | 276 | "Some cloud music services don't work with automatic settings and may require " | ||
3685 | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | ||
3686 | 278 | "Nuvola Player." | ||
3687 | 279 | msgstr "" | ||
3688 | 280 | |||
3689 | 281 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | ||
3690 | 282 | #: src/gui/preferences.vala:175 | ||
3691 | 283 | msgid "" | ||
3692 | 284 | "<b>Warning:</b> A version of a library used for network connection contained " | ||
3693 | 285 | "in your system has issues with HTTPS proxy support and it may cause crash of " | ||
3694 | 286 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." | ||
3695 | 287 | msgstr "" | ||
3696 | 288 | |||
3697 | 289 | #. / Settings dialog - tab Network, shown if tsocks library was not detected | ||
3698 | 290 | #: src/gui/preferences.vala:185 | ||
3699 | 291 | msgid "" | ||
3700 | 292 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " | ||
3701 | 293 | "may not be supported." | ||
3702 | 294 | msgstr "" | ||
3703 | 295 | |||
3704 | 296 | #. / Settings dialog - tab Network | ||
3705 | 297 | #: src/gui/preferences.vala:195 | ||
3706 | 298 | msgid "Use direct connection without a proxy server" | ||
3707 | 299 | msgstr "" | ||
3708 | 300 | |||
3709 | 301 | #. / Settings dialog - tab Network | ||
3710 | 302 | #: src/gui/preferences.vala:199 | ||
3711 | 303 | msgid "Use system HTTP(S) proxy settings" | ||
3712 | 304 | msgstr "" | ||
3713 | 305 | |||
3714 | 306 | #. / Settings dialog - tab Network | ||
3715 | 307 | #: src/gui/preferences.vala:203 | ||
3716 | 308 | msgid "Use manual proxy settings" | ||
3717 | 309 | msgstr "" | ||
3718 | 310 | |||
3719 | 311 | #: src/gui/preferences.vala:212 | ||
3720 | 312 | msgid "Proxy Type" | ||
3721 | 313 | msgstr "" | ||
3722 | 314 | |||
3723 | 315 | #. / Settings dialog - tab Network, proxy type HTTP(S) | ||
3724 | 316 | #: src/gui/preferences.vala:215 | ||
3725 | 317 | msgid "HTTP(S)" | ||
3726 | 318 | msgstr "HTTP(S)" | ||
3727 | 319 | |||
3728 | 320 | #. / Settings dialog - tab Network, proxy type SOCKS | ||
3729 | 321 | #: src/gui/preferences.vala:218 | ||
3730 | 322 | msgid "SOCKS" | ||
3731 | 323 | msgstr "SOCKS" | ||
3732 | 324 | |||
3733 | 325 | #. / Settings dialog - tab Network | ||
3734 | 326 | #: src/gui/preferences.vala:228 | ||
3735 | 327 | msgid "Proxy Server" | ||
3736 | 328 | msgstr "" | ||
3737 | 329 | |||
3738 | 330 | #. / Settings dialog - tab Network | ||
3739 | 331 | #: src/gui/preferences.vala:238 | ||
3740 | 332 | msgid "Proxy Server Port" | ||
3741 | 333 | msgstr "" | ||
3742 | 334 | |||
3743 | 335 | #. / Settings dialog, tab User Scripts | ||
3744 | 336 | #: src/gui/preferences.vala:280 | ||
3745 | 337 | msgid "User scripts" | ||
3746 | 338 | msgstr "" | ||
3747 | 339 | |||
3748 | 340 | #. / Settings dialog - tab User Scripts | ||
3749 | 341 | #: src/gui/preferences.vala:283 | ||
3750 | 342 | msgid "" | ||
3751 | 343 | "User scripts are used to enhance web interface of cloud music services." | ||
3752 | 344 | msgstr "" | ||
3753 | 345 | |||
3754 | 346 | #. / Settings dialog - tab User Scripts, warning | ||
3755 | 347 | #: src/gui/preferences.vala:291 | ||
3756 | 348 | msgid "" | ||
3757 | 349 | "<b>Warning:</b> Support for user scripts is incomplete and experimental. It " | ||
3758 | 350 | "may be removed in future releases. User script can send data to third " | ||
3759 | 351 | "parties, install only trustworthy user scripts." | ||
3760 | 352 | msgstr "" | ||
3761 | 353 | |||
3762 | 354 | #. / Settings dialog - tab User Scripts | ||
3763 | 355 | #: src/gui/preferences.vala:301 | ||
3764 | 356 | msgid "You have to select service to configure user scripts." | ||
3765 | 357 | msgstr "" | ||
3766 | 358 | |||
3767 | 359 | #. / Settings dialog - tab User Scripts | ||
3768 | 360 | #: src/gui/preferences.vala:310 | ||
3769 | 361 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" | ||
3770 | 362 | msgstr "" | ||
3771 | 363 | |||
3772 | 364 | #. / Settings dialog - tab User Scripts, button to open user scripts directory | ||
3773 | 365 | #: src/gui/preferences.vala:325 | ||
3774 | 366 | msgid "Open user scripts directory" | ||
3775 | 367 | msgstr "" | ||
3776 | 368 | |||
3777 | 369 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links | ||
3778 | 370 | #: src/gui/windows.vala:63 | ||
3779 | 371 | msgid "" | ||
3780 | 372 | "You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a " | ||
3781 | 373 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " | ||
3782 | 374 | "<a href='%4$s'>stable and beta builds</a>.</i>" | ||
3783 | 375 | msgstr "" | ||
3784 | 376 | |||
3785 | 377 | #. / Shown in the About Nuvola Player dialog | ||
3786 | 378 | #: src/gui/windows.vala:163 | ||
3787 | 379 | msgid "Cloud music integration for your Linux desktop" | ||
3788 | 380 | msgstr "" | ||
3789 | 381 | |||
3790 | 382 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) | ||
3791 | 383 | #: src/gui/windows.vala:165 | ||
3792 | 384 | msgid "translator-credits" | ||
3793 | 385 | msgstr "" | ||
3794 | 386 | "Launchpad Contributions:\n" | ||
3795 | 387 | " tomson https://launchpad.net/~mendimiilire" | ||
3796 | 388 | |||
3797 | 389 | #. / Title of the Crash dialog | ||
3798 | 390 | #: src/gui/windows.vala:205 | ||
3799 | 391 | msgid "Nuvola Player Crash Dialog" | ||
3800 | 392 | msgstr "" | ||
3801 | 393 | |||
3802 | 394 | #. / Crash dialog | ||
3803 | 395 | #: src/gui/windows.vala:220 | ||
3804 | 396 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" | ||
3805 | 397 | msgstr "" | ||
3806 | 398 | |||
3807 | 399 | #. / Crash dialog | ||
3808 | 400 | #: src/gui/windows.vala:228 | ||
3809 | 401 | msgid "You can try following options to solve this issue:" | ||
3810 | 402 | msgstr "" | ||
3811 | 403 | |||
3812 | 404 | #. / Crash dialog | ||
3813 | 405 | #: src/gui/windows.vala:237 | ||
3814 | 406 | msgid "Reset configuration" | ||
3815 | 407 | msgstr "Rivendos konfigurmin" | ||
3816 | 408 | |||
3817 | 409 | #. / Crash dialog | ||
3818 | 410 | #: src/gui/windows.vala:240 | ||
3819 | 411 | msgid "Reset state of user interface" | ||
3820 | 412 | msgstr "" | ||
3821 | 413 | |||
3822 | 414 | #. / Crash dialog | ||
3823 | 415 | #: src/gui/windows.vala:254 | ||
3824 | 416 | msgid "Disable HTTP(S) proxy" | ||
3825 | 417 | msgstr "" | ||
3826 | 418 | |||
3827 | 419 | #. / Crash dialog | ||
3828 | 420 | #: src/gui/windows.vala:259 | ||
3829 | 421 | msgid "" | ||
3830 | 422 | "Cloud music services use Flash to play music. Unfortunately, Flash Player is " | ||
3831 | 423 | "known not to be very stable and may cause crash of Nuvola Player. Please " | ||
3832 | 424 | "visit <a href='%s'>Flash troubleshooting</a>" | ||
3833 | 425 | msgstr "" | ||
3834 | 0 | 426 | ||
3835 | === added file 'translations/zh_CN.po' | |||
3836 | --- translations/zh_CN.po 1970-01-01 00:00:00 +0000 | |||
3837 | +++ translations/zh_CN.po 2012-06-15 15:20:27 +0000 | |||
3838 | @@ -0,0 +1,432 @@ | |||
3839 | 1 | # Chinese (Simplified) translation for nuvola-player | ||
3840 | 2 | # Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 | ||
3841 | 3 | # This file is distributed under the same license as the nuvola-player package. | ||
3842 | 4 | # FIRST AUTHOR <EMAIL@ADDRESS>, 2012. | ||
3843 | 5 | # | ||
3844 | 6 | msgid "" | ||
3845 | 7 | msgstr "" | ||
3846 | 8 | "Project-Id-Version: nuvola-player\n" | ||
3847 | 9 | "Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n" | ||
3848 | 10 | "POT-Creation-Date: 2011-12-16 10:33+0100\n" | ||
3849 | 11 | "PO-Revision-Date: 2012-03-07 09:24+0000\n" | ||
3850 | 12 | "Last-Translator: Wang Dianjin <Unknown>\n" | ||
3851 | 13 | "Language-Team: Chinese (Simplified) <zh_CN@li.org>\n" | ||
3852 | 14 | "MIME-Version: 1.0\n" | ||
3853 | 15 | "Content-Type: text/plain; charset=UTF-8\n" | ||
3854 | 16 | "Content-Transfer-Encoding: 8bit\n" | ||
3855 | 17 | "X-Launchpad-Export-Date: 2012-03-08 05:23+0000\n" | ||
3856 | 18 | "X-Generator: Launchpad (build 14914)\n" | ||
3857 | 19 | |||
3858 | 20 | #. / Shown if unsupported command line argument is used | ||
3859 | 21 | #: src/main.vala:194 | ||
3860 | 22 | msgid "Error: Option parsing failed:" | ||
3861 | 23 | msgstr "错误:操作解析失败;" | ||
3862 | 24 | |||
3863 | 25 | #. / Short label for command 'start or resume playback' | ||
3864 | 26 | #: src/player.vala:57 | ||
3865 | 27 | msgid "Play" | ||
3866 | 28 | msgstr "播放" | ||
3867 | 29 | |||
3868 | 30 | #. / Short label for command 'pause playback' | ||
3869 | 31 | #: src/player.vala:59 | ||
3870 | 32 | msgid "Pause" | ||
3871 | 33 | msgstr "暂停" | ||
3872 | 34 | |||
3873 | 35 | #. / Short label for command 'skip to previous song' | ||
3874 | 36 | #: src/player.vala:61 | ||
3875 | 37 | msgid "Previous song" | ||
3876 | 38 | msgstr "上一首" | ||
3877 | 39 | |||
3878 | 40 | #. / Short label for command 'skip to next song' | ||
3879 | 41 | #: src/player.vala:63 | ||
3880 | 42 | msgid "Next song" | ||
3881 | 43 | msgstr "下一首" | ||
3882 | 44 | |||
3883 | 45 | #. / Short label for command 'thumb up' or 'like this song' (see Google Music buttons) | ||
3884 | 46 | #: src/player.vala:65 | ||
3885 | 47 | msgid "Thumbs Up" | ||
3886 | 48 | msgstr "喜欢的歌曲" | ||
3887 | 49 | |||
3888 | 50 | #. / Short label for command 'thumb down' or 'dislike this song' (see Google Music buttons) | ||
3889 | 51 | #: src/player.vala:67 | ||
3890 | 52 | msgid "Thumbs Down" | ||
3891 | 53 | msgstr "不喜欢的歌曲" | ||
3892 | 54 | |||
3893 | 55 | #. / Short label for command 'add this song to favorites' | ||
3894 | 56 | #: src/player.vala:69 | ||
3895 | 57 | msgid "Favorite" | ||
3896 | 58 | msgstr "收藏" | ||
3897 | 59 | |||
3898 | 60 | #. / Short label for command 'quit application' | ||
3899 | 61 | #: src/player.vala:71 | ||
3900 | 62 | msgid "Quit" | ||
3901 | 63 | msgstr "退出" | ||
3902 | 64 | |||
3903 | 65 | #. / Initial notification | ||
3904 | 66 | #: src/player.vala:166 | ||
3905 | 67 | msgid "Version" | ||
3906 | 68 | msgstr "版本" | ||
3907 | 69 | |||
3908 | 70 | #. / Shown in notification if both artist and album are unknown | ||
3909 | 71 | #: src/player.vala:301 | ||
3910 | 72 | msgid "by unknown artist" | ||
3911 | 73 | msgstr "未知艺人" | ||
3912 | 74 | |||
3913 | 75 | #. / Shown in notification if artist is unknown, %s will be replaced by album name | ||
3914 | 76 | #: src/player.vala:305 | ||
3915 | 77 | msgid "by unknown artist from %s" | ||
3916 | 78 | msgstr "未知艺人,专辑: %2$" | ||
3917 | 79 | |||
3918 | 80 | #. / Shown in notification if album is unknown, %s will be replaced by artist name | ||
3919 | 81 | #: src/player.vala:309 | ||
3920 | 82 | msgid "by %s" | ||
3921 | 83 | msgstr "艺人:%s" | ||
3922 | 84 | |||
3923 | 85 | #. / Shown in notification, %1$s will be replaced by artist name, %2$s will be replaced by album name | ||
3924 | 86 | #: src/player.vala:313 | ||
3925 | 87 | msgid "by %1$s from %2$s" | ||
3926 | 88 | msgstr "艺人:%1$,专辑: %2$" | ||
3927 | 89 | |||
3928 | 90 | #. / Shown in Service selector if service doesn't provide description | ||
3929 | 91 | #: src/service.vala:189 | ||
3930 | 92 | msgid "No description provided for this service." | ||
3931 | 93 | msgstr "没有提供该服务的描述。" | ||
3932 | 94 | |||
3933 | 95 | #. / Shown as heading in Service selector | ||
3934 | 96 | #: src/service.vala:193 | ||
3935 | 97 | msgid "Select cloud music service" | ||
3936 | 98 | msgstr "选择云端音乐服务" | ||
3937 | 99 | |||
3938 | 100 | #. / Shown as label of Cancel button in Service selector | ||
3939 | 101 | #: src/service.vala:197 | ||
3940 | 102 | msgid "Cancel" | ||
3941 | 103 | msgstr "取消" | ||
3942 | 104 | |||
3943 | 105 | #. / Menu Service | ||
3944 | 106 | #: src/gui/actions.vala:110 | ||
3945 | 107 | msgid "_Service" | ||
3946 | 108 | msgstr "服务(_S)" | ||
3947 | 109 | |||
3948 | 110 | #. / Menu item to switch service | ||
3949 | 111 | #: src/gui/actions.vala:117 | ||
3950 | 112 | msgid "_Switch Service" | ||
3951 | 113 | msgstr "切换服务(_S)" | ||
3952 | 114 | |||
3953 | 115 | #. / Menu Control | ||
3954 | 116 | #: src/gui/actions.vala:121 | ||
3955 | 117 | msgid "_Control" | ||
3956 | 118 | msgstr "控制(_C)" | ||
3957 | 119 | |||
3958 | 120 | #. / Menu View | ||
3959 | 121 | #: src/gui/actions.vala:128 | ||
3960 | 122 | msgid "_View" | ||
3961 | 123 | msgstr "查看(_V)" | ||
3962 | 124 | |||
3963 | 125 | #. / Menu Options | ||
3964 | 126 | #: src/gui/actions.vala:135 | ||
3965 | 127 | msgid "_Options" | ||
3966 | 128 | msgstr "选项(_O)" | ||
3967 | 129 | |||
3968 | 130 | #. / Menu item to purge cookies | ||
3969 | 131 | #. / Crash dialog | ||
3970 | 132 | #: src/gui/actions.vala:137 src/gui/windows.vala:243 | ||
3971 | 133 | msgid "Purge cookies" | ||
3972 | 134 | msgstr "清除 cookie" | ||
3973 | 135 | |||
3974 | 136 | #. / Menu item to purge album art cache | ||
3975 | 137 | #: src/gui/actions.vala:139 | ||
3976 | 138 | msgid "Purge album art" | ||
3977 | 139 | msgstr "清除专辑封面" | ||
3978 | 140 | |||
3979 | 141 | #. / Menu item to purge browser cache | ||
3980 | 142 | #. / Crash dialog | ||
3981 | 143 | #: src/gui/actions.vala:141 src/gui/windows.vala:248 | ||
3982 | 144 | msgid "Purge browser cache" | ||
3983 | 145 | msgstr "清除浏览缓存" | ||
3984 | 146 | |||
3985 | 147 | #. / Menu Help | ||
3986 | 148 | #: src/gui/actions.vala:146 | ||
3987 | 149 | msgid "_Help" | ||
3988 | 150 | msgstr "帮助(_H)" | ||
3989 | 151 | |||
3990 | 152 | #. / Menu item to open online help | ||
3991 | 153 | #: src/gui/actions.vala:148 | ||
3992 | 154 | msgid "Get help online" | ||
3993 | 155 | msgstr "在线帮助" | ||
3994 | 156 | |||
3995 | 157 | #. / Menu item to open bug/issue tracker | ||
3996 | 158 | #: src/gui/actions.vala:150 | ||
3997 | 159 | msgid "Report a problem" | ||
3998 | 160 | msgstr "报告问题" | ||
3999 | 161 | |||
4000 | 162 | #. / Menu item to open feature requests tracker | ||
4001 | 163 | #: src/gui/actions.vala:152 | ||
4002 | 164 | msgid "Suggest new feature" | ||
4003 | 165 | msgstr "开发建议" | ||
4004 | 166 | |||
4005 | 167 | #. / Menu item to open page with information about donations | ||
4006 | 168 | #: src/gui/actions.vala:154 | ||
4007 | 169 | msgid "Donate" | ||
4008 | 170 | msgstr "捐赠" | ||
4009 | 171 | |||
4010 | 172 | #. / Menu item to open Nuvola's page on Google+ social network | ||
4011 | 173 | #: src/gui/actions.vala:156 | ||
4012 | 174 | msgid "Google+ page" | ||
4013 | 175 | msgstr "Google+ 页面" | ||
4014 | 176 | |||
4015 | 177 | #. / Menu item to open Nuvola's page on Facebook social network | ||
4016 | 178 | #: src/gui/actions.vala:158 | ||
4017 | 179 | msgid "Facebook page" | ||
4018 | 180 | msgstr "Facebook 页面" | ||
4019 | 181 | |||
4020 | 182 | #. / Special tool bar item shown if menu bar is not shown, triggers menu with items not available on tool bar | ||
4021 | 183 | #: src/gui/actions.vala:162 | ||
4022 | 184 | msgid "Nuvola Menu" | ||
4023 | 185 | msgstr "Nuvola 菜单" | ||
4024 | 186 | |||
4025 | 187 | #. / Menu item to show both menu bar and tool bar | ||
4026 | 188 | #: src/gui/actions.vala:170 | ||
4027 | 189 | msgid "Both menubar and toolbar" | ||
4028 | 190 | msgstr "显示菜单栏和工具条" | ||
4029 | 191 | |||
4030 | 192 | #. / Menu item to show only menu bar, tool bar is hidden | ||
4031 | 193 | #: src/gui/actions.vala:172 | ||
4032 | 194 | msgid "Only menubar" | ||
4033 | 195 | msgstr "只显示菜单栏" | ||
4034 | 196 | |||
4035 | 197 | #. / Menu item to show only tool bar, menu bar is hidden | ||
4036 | 198 | #: src/gui/actions.vala:174 | ||
4037 | 199 | msgid "Only toolbar" | ||
4038 | 200 | msgstr "只显示工具条" | ||
4039 | 201 | |||
4040 | 202 | #. / Menu item to open web page about the current release | ||
4041 | 203 | #: src/gui/actions.vala:183 | ||
4042 | 204 | msgid "About release %s" | ||
4043 | 205 | msgstr "关于版本 %s" | ||
4044 | 206 | |||
4045 | 207 | #. / Preferences dialog title | ||
4046 | 208 | #: src/gui/preferences.vala:33 | ||
4047 | 209 | msgid "Preferences" | ||
4048 | 210 | msgstr "首选项" | ||
4049 | 211 | |||
4050 | 212 | #. / Settings dialog, tab General | ||
4051 | 213 | #: src/gui/preferences.vala:88 | ||
4052 | 214 | msgid "General" | ||
4053 | 215 | msgstr "常规" | ||
4054 | 216 | |||
4055 | 217 | #. / Settings dialog - tab General | ||
4056 | 218 | #: src/gui/preferences.vala:91 | ||
4057 | 219 | msgid "Handle multimedia keys." | ||
4058 | 220 | msgstr "控制多媒体按键" | ||
4059 | 221 | |||
4060 | 222 | #. / Settings dialog - tab General | ||
4061 | 223 | #: src/gui/preferences.vala:97 | ||
4062 | 224 | msgid "Use Pause (break) key to toggle play/pause" | ||
4063 | 225 | msgstr "使用暂停(中断)键切换播放/暂停" | ||
4064 | 226 | |||
4065 | 227 | #. / Settings dialog - tab General | ||
4066 | 228 | #: src/gui/preferences.vala:103 | ||
4067 | 229 | msgid "Show notifications." | ||
4068 | 230 | msgstr "显示消息通知。" | ||
4069 | 231 | |||
4070 | 232 | #. / Settings dialog - tab General | ||
4071 | 233 | #: src/gui/preferences.vala:109 | ||
4072 | 234 | msgid "Hide window if close button is pressed" | ||
4073 | 235 | msgstr "点击关闭按钮时隐藏窗口" | ||
4074 | 236 | |||
4075 | 237 | #. / Settings dialog - tab General | ||
4076 | 238 | #: src/gui/preferences.vala:114 | ||
4077 | 239 | msgid "Always (may require tray icon)" | ||
4078 | 240 | msgstr "总是(可能需要托盘图标)" | ||
4079 | 241 | |||
4080 | 242 | #. / Settings dialog - tab General | ||
4081 | 243 | #: src/gui/preferences.vala:117 | ||
4082 | 244 | msgid "Only if music is playing (may require tray icon)" | ||
4083 | 245 | msgstr "只在音乐播放时(可能需要托盘图标)" | ||
4084 | 246 | |||
4085 | 247 | #. / Settings dialog - tab General | ||
4086 | 248 | #. / Settings dialog - tab General, never show tray icon | ||
4087 | 249 | #: src/gui/preferences.vala:120 src/gui/preferences.vala:145 | ||
4088 | 250 | msgid "Never" | ||
4089 | 251 | msgstr "从不" | ||
4090 | 252 | |||
4091 | 253 | #. / Settings dialog - tab General | ||
4092 | 254 | #: src/gui/preferences.vala:134 | ||
4093 | 255 | msgid "Show tray icon" | ||
4094 | 256 | msgstr "显示托盘图标" | ||
4095 | 257 | |||
4096 | 258 | #. / Settings dialog - tab General, always show tray icon | ||
4097 | 259 | #: src/gui/preferences.vala:139 | ||
4098 | 260 | msgid "Always" | ||
4099 | 261 | msgstr "总是" | ||
4100 | 262 | |||
4101 | 263 | #. / Settings dialog - tab General, show tray icon if needed | ||
4102 | 264 | #: src/gui/preferences.vala:142 | ||
4103 | 265 | msgid "If needed" | ||
4104 | 266 | msgstr "如果需要" | ||
4105 | 267 | |||
4106 | 268 | #. / Settings dialog tab | ||
4107 | 269 | #: src/gui/preferences.vala:163 | ||
4108 | 270 | msgid "Network" | ||
4109 | 271 | msgstr "网络" | ||
4110 | 272 | |||
4111 | 273 | #. / Settings dialog - tab Network | ||
4112 | 274 | #: src/gui/preferences.vala:166 | ||
4113 | 275 | msgid "" | ||
4114 | 276 | "Some cloud music services don't work with automatic settings and may require " | ||
4115 | 277 | "manual SOCKS proxy settings. New proxy settings is applied after restart of " | ||
4116 | 278 | "Nuvola Player." | ||
4117 | 279 | msgstr "一些旧的音乐服务无法在自动设置下工作,可能需要手动 SOCKS 代理设置。新的代理设置会在 Nuvola 播放器重启后生效。" | ||
4118 | 280 | |||
4119 | 281 | #. / Settings dialog - tab Network, warning shown if a buggy connection library is used | ||
4120 | 282 | #: src/gui/preferences.vala:175 | ||
4121 | 283 | msgid "" | ||
4122 | 284 | "<b>Warning:</b> A version of a library used for network connection contained " | ||
4123 | 285 | "in your system has issues with HTTPS proxy support and it may cause crash of " | ||
4124 | 286 | "Nuvola Player. It's highly recommended not to use HTTP(S) Proxy settings." | ||
4125 | 287 | msgstr "" | ||
4126 | 288 | "<b>警告:</b> 您的系统包含的网络连接使用的库文件版本无法支持 HTTP 代理,这有可能导致 Nuvola 播放器崩溃。严重推荐您不要使用 " | ||
4127 | 289 | "HTTP(S) 代理设置。" | ||
4128 | 290 | |||
4129 | 291 | #. / Settings dialog - tab Network, shown if tsocks library was not detected | ||
4130 | 292 | #: src/gui/preferences.vala:185 | ||
4131 | 293 | msgid "" | ||
4132 | 294 | "<b>Note:</b> <a href='%s'>TSOCKS library</a> was not detected. SOCKS proxy " | ||
4133 | 295 | "may not be supported." | ||
4134 | 296 | msgstr "<b>提示:</b> 没有检测到 <a href='%s'>TSOCKS 库</a>。可能无法支持 SOCKS 代理。" | ||
4135 | 297 | |||
4136 | 298 | #. / Settings dialog - tab Network | ||
4137 | 299 | #: src/gui/preferences.vala:195 | ||
4138 | 300 | msgid "Use direct connection without a proxy server" | ||
4139 | 301 | msgstr "无代理,直接连接网络" | ||
4140 | 302 | |||
4141 | 303 | #. / Settings dialog - tab Network | ||
4142 | 304 | #: src/gui/preferences.vala:199 | ||
4143 | 305 | msgid "Use system HTTP(S) proxy settings" | ||
4144 | 306 | msgstr "使用系统 HTTP(S) 代理设置" | ||
4145 | 307 | |||
4146 | 308 | #. / Settings dialog - tab Network | ||
4147 | 309 | #: src/gui/preferences.vala:203 | ||
4148 | 310 | msgid "Use manual proxy settings" | ||
4149 | 311 | msgstr "手动配置代理" | ||
4150 | 312 | |||
4151 | 313 | #: src/gui/preferences.vala:212 | ||
4152 | 314 | msgid "Proxy Type" | ||
4153 | 315 | msgstr "代理类型" | ||
4154 | 316 | |||
4155 | 317 | #. / Settings dialog - tab Network, proxy type HTTP(S) | ||
4156 | 318 | #: src/gui/preferences.vala:215 | ||
4157 | 319 | msgid "HTTP(S)" | ||
4158 | 320 | msgstr "HTTP(S)" | ||
4159 | 321 | |||
4160 | 322 | #. / Settings dialog - tab Network, proxy type SOCKS | ||
4161 | 323 | #: src/gui/preferences.vala:218 | ||
4162 | 324 | msgid "SOCKS" | ||
4163 | 325 | msgstr "SOCKS" | ||
4164 | 326 | |||
4165 | 327 | #. / Settings dialog - tab Network | ||
4166 | 328 | #: src/gui/preferences.vala:228 | ||
4167 | 329 | msgid "Proxy Server" | ||
4168 | 330 | msgstr "代理服务器" | ||
4169 | 331 | |||
4170 | 332 | #. / Settings dialog - tab Network | ||
4171 | 333 | #: src/gui/preferences.vala:238 | ||
4172 | 334 | msgid "Proxy Server Port" | ||
4173 | 335 | msgstr "代理服务器端口" | ||
4174 | 336 | |||
4175 | 337 | #. / Settings dialog, tab User Scripts | ||
4176 | 338 | #: src/gui/preferences.vala:280 | ||
4177 | 339 | msgid "User scripts" | ||
4178 | 340 | msgstr "用户脚本" | ||
4179 | 341 | |||
4180 | 342 | #. / Settings dialog - tab User Scripts | ||
4181 | 343 | #: src/gui/preferences.vala:283 | ||
4182 | 344 | msgid "" | ||
4183 | 345 | "User scripts are used to enhance web interface of cloud music services." | ||
4184 | 346 | msgstr "用户脚本用来增强云端音乐服务的网络界面。" | ||
4185 | 347 | |||
4186 | 348 | #. / Settings dialog - tab User Scripts, warning | ||
4187 | 349 | #: src/gui/preferences.vala:291 | ||
4188 | 350 | msgid "" | ||
4189 | 351 | "<b>Warning:</b> Support for user scripts is incomplete and experimental. It " | ||
4190 | 352 | "may be removed in future releases. User script can send data to third " | ||
4191 | 353 | "parties, install only trustworthy user scripts." | ||
4192 | 354 | msgstr "" | ||
4193 | 355 | "<b>警告:</b>对用户脚本的支持目前尚未完成,处于测试阶段。在功能版本中可能会移除。用户脚本可发送数据到第三方,只安装值得信任的用户脚本。" | ||
4194 | 356 | |||
4195 | 357 | #. / Settings dialog - tab User Scripts | ||
4196 | 358 | #: src/gui/preferences.vala:301 | ||
4197 | 359 | msgid "You have to select service to configure user scripts." | ||
4198 | 360 | msgstr "您必须选择服务以配置用户脚本。" | ||
4199 | 361 | |||
4200 | 362 | #. / Settings dialog - tab User Scripts | ||
4201 | 363 | #: src/gui/preferences.vala:310 | ||
4202 | 364 | msgid "Comma-separated list of user scripts enabled for service <b>%s</b>:" | ||
4203 | 365 | msgstr "支持服务 <b>%s</b> 的用户脚本,若有多个脚本请用逗号隔开:" | ||
4204 | 366 | |||
4205 | 367 | #. / Settings dialog - tab User Scripts, button to open user scripts directory | ||
4206 | 368 | #: src/gui/preferences.vala:325 | ||
4207 | 369 | msgid "Open user scripts directory" | ||
4208 | 370 | msgstr "打开用户脚本目录" | ||
4209 | 371 | |||
4210 | 372 | #. / Warning for unstable builds, %1$s = version, %2$s and %3$s = links | ||
4211 | 373 | #: src/gui/windows.vala:63 | ||
4212 | 374 | msgid "" | ||
4213 | 375 | "You are running <b>unstable build %1$s</b>. <a href='%2$s'>Report a " | ||
4214 | 376 | "problem</a>. <a href='%3$s'>See changelog</a>. <i>This bar is not shown in " | ||
4215 | 377 | "<a href='%4$s'>stable and beta builds</a>.</i>" | ||
4216 | 378 | msgstr "" | ||
4217 | 379 | "您正在运行 <b>非稳定构建版本 %1$s</b>。<a href='%2$s'>报告问题</a>。<a " | ||
4218 | 380 | "href='%3$s'>查看修改记录</a>。<i>该栏不会显示在 <a href='%4$s'>稳定版本和测试版本</a>中。</i>" | ||
4219 | 381 | |||
4220 | 382 | #. / Shown in the About Nuvola Player dialog | ||
4221 | 383 | #: src/gui/windows.vala:163 | ||
4222 | 384 | msgid "Cloud music integration for your Linux desktop" | ||
4223 | 385 | msgstr "移植云端音乐服务到您的 Linux 桌面" | ||
4224 | 386 | |||
4225 | 387 | #. / Names of translators (shown in the translator credits accessed from the About Nuvola Player dialog) | ||
4226 | 388 | #: src/gui/windows.vala:165 | ||
4227 | 389 | msgid "translator-credits" | ||
4228 | 390 | msgstr "" | ||
4229 | 391 | "Launchpad Contributions:\n" | ||
4230 | 392 | " Wang Dianjin https://launchpad.net/~tuhaihe" | ||
4231 | 393 | |||
4232 | 394 | #. / Title of the Crash dialog | ||
4233 | 395 | #: src/gui/windows.vala:205 | ||
4234 | 396 | msgid "Nuvola Player Crash Dialog" | ||
4235 | 397 | msgstr "Nuvola 播放器崩溃对话框" | ||
4236 | 398 | |||
4237 | 399 | #. / Crash dialog | ||
4238 | 400 | #: src/gui/windows.vala:220 | ||
4239 | 401 | msgid "<b>Previous Nuvola Player session was not closed correctly.</b>" | ||
4240 | 402 | msgstr "<b>前一个 Nuvola 播放器会话没有正常关闭。</b>" | ||
4241 | 403 | |||
4242 | 404 | #. / Crash dialog | ||
4243 | 405 | #: src/gui/windows.vala:228 | ||
4244 | 406 | msgid "You can try following options to solve this issue:" | ||
4245 | 407 | msgstr "您可以尝试下面选项来解决该问题:" | ||
4246 | 408 | |||
4247 | 409 | #. / Crash dialog | ||
4248 | 410 | #: src/gui/windows.vala:237 | ||
4249 | 411 | msgid "Reset configuration" | ||
4250 | 412 | msgstr "重置配置" | ||
4251 | 413 | |||
4252 | 414 | #. / Crash dialog | ||
4253 | 415 | #: src/gui/windows.vala:240 | ||
4254 | 416 | msgid "Reset state of user interface" | ||
4255 | 417 | msgstr "重置用户界面状态" | ||
4256 | 418 | |||
4257 | 419 | #. / Crash dialog | ||
4258 | 420 | #: src/gui/windows.vala:254 | ||
4259 | 421 | msgid "Disable HTTP(S) proxy" | ||
4260 | 422 | msgstr "禁用 HTTP(S) 代理" | ||
4261 | 423 | |||
4262 | 424 | #. / Crash dialog | ||
4263 | 425 | #: src/gui/windows.vala:259 | ||
4264 | 426 | msgid "" | ||
4265 | 427 | "Cloud music services use Flash to play music. Unfortunately, Flash Player is " | ||
4266 | 428 | "known not to be very stable and may cause crash of Nuvola Player. Please " | ||
4267 | 429 | "visit <a href='%s'>Flash troubleshooting</a>" | ||
4268 | 430 | msgstr "" | ||
4269 | 431 | "云端音乐服务使用 Flash 播放音乐。不幸的是,Flash 播放器不是非常稳定,这可能导致 Nuvola 播放器崩溃。请访问 <a " | ||
4270 | 432 | "href='%s'>Flash 故障排除</a>" | ||
4271 | 0 | 433 | ||
4272 | === renamed file 'vapi/libsoup-2.4-for-vala-gte-0.15.vapi' => 'vapi/libsoup-cache-2.4-vala-0.15.vapi' | |||
4273 | === modified file 'wscript' | |||
4274 | --- wscript 2012-05-12 12:26:29 +0000 | |||
4275 | +++ wscript 2012-06-15 15:20:27 +0000 | |||
4276 | @@ -11,7 +11,11 @@ | |||
4277 | 11 | RELEASE = "1.1" | 11 | RELEASE = "1.1" |
4278 | 12 | 12 | ||
4279 | 13 | # format "x.y.z~foo" | 13 | # format "x.y.z~foo" |
4280 | 14 | <<<<<<< TREE | ||
4281 | 14 | VERSION = '1.1~unstable' | 15 | VERSION = '1.1~unstable' |
4282 | 16 | ======= | ||
4283 | 17 | VERSION = '1.0.6~unstable' | ||
4284 | 18 | >>>>>>> MERGE-SOURCE | ||
4285 | 15 | 19 | ||
4286 | 16 | # "unstable", "stable" | 20 | # "unstable", "stable" |
4287 | 17 | CHANNEL = "unstable" | 21 | CHANNEL = "unstable" |
4288 | @@ -35,8 +39,8 @@ | |||
4289 | 35 | 'VERSION': VERSION, | 39 | 'VERSION': VERSION, |
4290 | 36 | 'RELEASE': RELEASE, | 40 | 'RELEASE': RELEASE, |
4291 | 37 | 'RELEASE_URL': WEBSITE_URL + "Releases/" + RELEASE + "/", | 41 | 'RELEASE_URL': WEBSITE_URL + "Releases/" + RELEASE + "/", |
4294 | 38 | 'TIPS_URL': "http://projects.fenryxo.cz/Google_Music_Frame/Tips/", | 42 | 'TIPS_URL': WEBSITE_URL + "Tips/", |
4295 | 39 | 'DONATE_URL': "http://projects.fenryxo.cz/Google_Music_Frame/Contribute/#donate", | 43 | 'DONATE_URL': WEBSITE_URL + "Contribute/#donate", |
4296 | 40 | 'GOOGLE_PLUS_URL': "https://plus.google.com/110794636546911932554", | 44 | 'GOOGLE_PLUS_URL': "https://plus.google.com/110794636546911932554", |
4297 | 41 | 'FACEBOOK_URL': "https://www.facebook.com/nuvolaplayer", | 45 | 'FACEBOOK_URL': "https://www.facebook.com/nuvolaplayer", |
4298 | 42 | 'TWITTER_URL': "https://www.twitter.com/NuvolaPlayer", | 46 | 'TWITTER_URL': "https://www.twitter.com/NuvolaPlayer", |
4299 | @@ -77,10 +81,6 @@ | |||
4300 | 77 | raise ValueError("Wrong channel for stable version") | 81 | raise ValueError("Wrong channel for stable version") |
4301 | 78 | VALA_DEFINES = [] | 82 | VALA_DEFINES = [] |
4302 | 79 | 83 | ||
4303 | 80 | GTK3 = False | ||
4304 | 81 | # Google Music Frame can be compiled using GTK+ 3, but: | ||
4305 | 82 | # a) Maverick is not shipped with GTK+3 theme | ||
4306 | 83 | # b) Flash isn't loaded (https://bugzilla.redhat.com/show_bug.cgi?id=695184) | ||
4307 | 84 | 84 | ||
4308 | 85 | top = '.' | 85 | top = '.' |
4309 | 86 | out = 'build' | 86 | out = 'build' |
4310 | @@ -94,8 +94,11 @@ | |||
4311 | 94 | ctx.add_option('--without-glib-dbus', action='store_false', default=True, dest="glib_dbus", help='Build without native DBus support in GLib/GIO (>= 2.26)') | 94 | ctx.add_option('--without-glib-dbus', action='store_false', default=True, dest="glib_dbus", help='Build without native DBus support in GLib/GIO (>= 2.26)') |
4312 | 95 | ctx.add_option('--with-indicator-sound-maverick', action='store_true', default=False, dest="indicator_sound_maverick", help='Build with support for Indicator Sound (Ubuntu Maverick version)') | 95 | ctx.add_option('--with-indicator-sound-maverick', action='store_true', default=False, dest="indicator_sound_maverick", help='Build with support for Indicator Sound (Ubuntu Maverick version)') |
4313 | 96 | ctx.add_option('--with-debug-symbols', action='store_true', default=False, dest="debug_symbols", help='Build with debug symbols') | 96 | ctx.add_option('--with-debug-symbols', action='store_true', default=False, dest="debug_symbols", help='Build with debug symbols') |
4314 | 97 | <<<<<<< TREE | ||
4315 | 97 | ctx.add_option('--enable-experimental', action='store_true', default=False, dest="experimental", help='Enable experimental features') | 98 | ctx.add_option('--enable-experimental', action='store_true', default=False, dest="experimental", help='Enable experimental features') |
4316 | 98 | ctx.add_option('--allow-buggy-webkit', action='store_true', default=False, dest="buggy_webkit", help='Allow to build with buggy WebKitGTK+') | 99 | ctx.add_option('--allow-buggy-webkit', action='store_true', default=False, dest="buggy_webkit", help='Allow to build with buggy WebKitGTK+') |
4317 | 100 | ======= | ||
4318 | 101 | >>>>>>> MERGE-SOURCE | ||
4319 | 99 | 102 | ||
4320 | 100 | def configure(conf): | 103 | def configure(conf): |
4321 | 101 | 104 | ||
4322 | @@ -129,18 +132,14 @@ | |||
4323 | 129 | else: | 132 | else: |
4324 | 130 | ctx.msg("libnotify VAPI fix will be applied", "no", "GREEN") | 133 | ctx.msg("libnotify VAPI fix will be applied", "no", "GREEN") |
4325 | 131 | check_package(conf, 'x11', 'XLIB', '0.5') | 134 | check_package(conf, 'x11', 'XLIB', '0.5') |
4329 | 132 | if GTK3: | 135 | if check_package(conf, 'webkit-1.0', 'WEBKIT', '1.5', False) is None: |
4330 | 133 | check_package(conf, 'webkitgtk-3.0', 'WEBKIT', '1.0') | 136 | # webkit >= 1.5 not found, but older version can be used |
4331 | 134 | check_package(conf, 'gtk+-3.0', 'GTK+', '2.22.0') | 137 | check_package(conf, 'webkit-1.0', 'WEBKIT', '1.0') |
4332 | 135 | else: | 138 | else: |
4341 | 136 | if check_package(conf, 'webkit-1.0', 'WEBKIT', '1.5', False) is None: | 139 | # webkit >= 1.5 has separate package for javascriptcore |
4342 | 137 | # webkit >= 1.5 not found, but older version can be used | 140 | check_package(conf, 'javascriptcoregtk-1.0', 'JSCORE', '1.5') |
4343 | 138 | check_package(conf, 'webkit-1.0', 'WEBKIT', '1.0') | 141 | check_package(conf, 'gtk+-2.0', 'GTK+', '2.20.0') |
4344 | 139 | else: | 142 | check_package(conf, 'gdk-2.0', 'GDK', '2.20.0') |
4337 | 140 | # webkit >= 1.5 has separate package for javascriptcore | ||
4338 | 141 | check_package(conf, 'javascriptcoregtk-1.0', 'JSCORE', '1.5') | ||
4339 | 142 | check_package(conf, 'gtk+-2.0', 'GTK+', '2.20.0') | ||
4340 | 143 | check_package(conf, 'gdk-2.0', 'GDK', '2.20.0') | ||
4345 | 144 | 143 | ||
4346 | 145 | ctx.env.WEBKITGTK_VERSION = map(int, conf.check_cfg(modversion='webkit-1.0').split(".")) | 144 | ctx.env.WEBKITGTK_VERSION = map(int, conf.check_cfg(modversion='webkit-1.0').split(".")) |
4347 | 146 | 145 | ||
4348 | @@ -166,7 +165,7 @@ | |||
4349 | 166 | else: | 165 | else: |
4350 | 167 | check_package(conf, 'glib-2.0', 'GLIB', '2.22') | 166 | check_package(conf, 'glib-2.0', 'GLIB', '2.22') |
4351 | 168 | check_package(conf, 'gio-2.0', 'GIO', '2.22') | 167 | check_package(conf, 'gio-2.0', 'GIO', '2.22') |
4353 | 169 | print ">>> Building without DBus support" | 168 | #~ print ">>> Building without DBus support" |
4354 | 170 | #~ check_package(conf, 'atk', 'ATK', '2.0') | 169 | #~ check_package(conf, 'atk', 'ATK', '2.0') |
4355 | 171 | 170 | ||
4356 | 172 | conf.check_cfg(modversion='libsoup-2.4'); | 171 | conf.check_cfg(modversion='libsoup-2.4'); |
4357 | @@ -180,11 +179,23 @@ | |||
4358 | 180 | ctx.msg("SoupCache for remote objects", "disabled", "YELLOW") | 179 | ctx.msg("SoupCache for remote objects", "disabled", "YELLOW") |
4359 | 181 | 180 | ||
4360 | 182 | check_package(conf, 'unique-1.0', 'UNIQUE', '0.9') | 181 | check_package(conf, 'unique-1.0', 'UNIQUE', '0.9') |
4361 | 182 | <<<<<<< TREE | ||
4362 | 183 | check_package(conf, 'json-glib-1.0', 'JSON-GLIB', '0.7') | 183 | check_package(conf, 'json-glib-1.0', 'JSON-GLIB', '0.7') |
4363 | 184 | 184 | ||
4364 | 185 | if check_package(conf, 'unity', 'UNITY', '3.0', False) \ | 185 | if check_package(conf, 'unity', 'UNITY', '3.0', False) \ |
4365 | 186 | and check_package(conf, 'dbusmenu-glib-0.4', 'DBUSMENU', '0.4', False): | 186 | and check_package(conf, 'dbusmenu-glib-0.4', 'DBUSMENU', '0.4', False): |
4366 | 187 | ctx.msg("Integration with Unity Launcher Quick List", "enabled", "GREEN") | 187 | ctx.msg("Integration with Unity Launcher Quick List", "enabled", "GREEN") |
4367 | 188 | ======= | ||
4368 | 189 | |||
4369 | 190 | if ctx.options.indicator_sound_maverick: | ||
4370 | 191 | check_package(conf, 'indicate', 'INDICATE', '0.4') # Maverick | ||
4371 | 192 | check_package(conf, 'dbusmenu-glib', 'DBUSMENU', '0.3') # Maverick | ||
4372 | 193 | ctx.env.VALA_DEFINES.append("INDICATOR_SOUND_MAVERICK") | ||
4373 | 194 | |||
4374 | 195 | if check_package(conf, 'unity', 'UNITY', '3.0', False) \ | ||
4375 | 196 | and check_package(conf, 'dbusmenu-glib-0.4', 'DBUSMENU', '0.4', False): | ||
4376 | 197 | ctx.msg("Integration with Unity Launcher Quick List", "enabled", "GREEN") | ||
4377 | 198 | >>>>>>> MERGE-SOURCE | ||
4378 | 188 | ctx.env.VALA_DEFINES.append("UNITY_QUICK_LIST") | 199 | ctx.env.VALA_DEFINES.append("UNITY_QUICK_LIST") |
4379 | 189 | else: | 200 | else: |
4380 | 190 | ctx.msg("Integration with Unity Launcher Quick List", "disabled", "YELLOW") | 201 | ctx.msg("Integration with Unity Launcher Quick List", "disabled", "YELLOW") |
4381 | @@ -262,6 +273,59 @@ | |||
4382 | 262 | packages += ' x11 unique-1.0 javascriptcore libfenryxo posix json-glib-1.0' | 273 | packages += ' x11 unique-1.0 javascriptcore libfenryxo posix json-glib-1.0' |
4383 | 263 | uselib = 'DL GLIB GTK+ GDK GEE SOUP ATK UNIQUE WEBKIT NOTIFY XLIB JSON-GLIB' | 274 | uselib = 'DL GLIB GTK+ GDK GEE SOUP ATK UNIQUE WEBKIT NOTIFY XLIB JSON-GLIB' |
4384 | 264 | 275 | ||
4385 | 276 | <<<<<<< TREE | ||
4386 | 277 | if ctx.env.GEE_GTE_0_6: | ||
4387 | 278 | packages += " gee-1.0" | ||
4388 | 279 | else: | ||
4389 | 280 | packages += " gee-when-lt-0.6" | ||
4390 | 281 | ======= | ||
4391 | 282 | |||
4392 | 283 | def build(ctx): | ||
4393 | 284 | # build graphics | ||
4394 | 285 | size = 16 | ||
4395 | 286 | ctx( | ||
4396 | 287 | rule='%s -w %s -h %s ${SRC} -o ${TGT}' % (ctx.env["RSVG-CONVERT"], size, size), | ||
4397 | 288 | source='graphics/nuvola-player.bigger-cloud-and-play.svg', | ||
4398 | 289 | target='data/icons/hicolor/%sx%s/apps/nuvolaplayer.png' % (size, size) | ||
4399 | 290 | ) | ||
4400 | 291 | for size in 22, 24: | ||
4401 | 292 | ctx( | ||
4402 | 293 | rule='%s -w %s -h %s ${SRC} -o ${TGT}' % (ctx.env["RSVG-CONVERT"], size, size), | ||
4403 | 294 | source='graphics/nuvola-player.bigger-cloud.svg', | ||
4404 | 295 | target='data/icons/hicolor/%sx%s/apps/nuvolaplayer.png' % (size, size) | ||
4405 | 296 | ) | ||
4406 | 297 | for size in 32, 48: | ||
4407 | 298 | ctx( | ||
4408 | 299 | rule='%s -w %s -h %s ${SRC} -o ${TGT}' % (ctx.env["RSVG-CONVERT"], size, size), | ||
4409 | 300 | source='graphics/nuvola-player.orig.svg', | ||
4410 | 301 | target='data/icons/hicolor/%sx%s/apps/nuvolaplayer.png' % (size, size) | ||
4411 | 302 | ) | ||
4412 | 303 | |||
4413 | 304 | if ctx.env.SCOUR: | ||
4414 | 305 | ctx( | ||
4415 | 306 | rule='%s -i ${SRC} -o ${TGT}' % ctx.env.SCOUR, | ||
4416 | 307 | source='graphics/nuvola-player.orig.svg', | ||
4417 | 308 | target='data/icons/hicolor/scalable/apps/nuvolaplayer.svg' | ||
4418 | 309 | ) | ||
4419 | 310 | else: | ||
4420 | 311 | ctx( | ||
4421 | 312 | rule='cp ${SRC} ${TGT}', | ||
4422 | 313 | source='graphics/nuvola-player.orig.svg', | ||
4423 | 314 | target='data/icons/hicolor/scalable/apps/nuvolaplayer.svg' | ||
4424 | 315 | ) | ||
4425 | 316 | |||
4426 | 317 | ctx( | ||
4427 | 318 | rule='%s -w 35 -h 26 ${SRC} -o ${TGT}' % ctx.env["RSVG-CONVERT"], | ||
4428 | 319 | source='graphics/cloud.orig.svg', | ||
4429 | 320 | target='data/nuvolaplayer/selector/arrow.png' | ||
4430 | 321 | ) | ||
4431 | 322 | |||
4432 | 323 | # build binaries | ||
4433 | 324 | packages = 'glib-2.0 gio-2.0 libsoup-2.4 config' | ||
4434 | 325 | packages += ' x11 unique-1.0 javascriptcore libfenryxo posix' | ||
4435 | 326 | uselib = 'DL GLIB GTK+ GDK GEE SOUP ATK UNIQUE WEBKIT NOTIFY XLIB' | ||
4436 | 327 | >>>>>>> MERGE-SOURCE | ||
4437 | 328 | |||
4438 | 265 | if ctx.env.GEE_GTE_0_6: | 329 | if ctx.env.GEE_GTE_0_6: |
4439 | 266 | packages += " gee-1.0" | 330 | packages += " gee-1.0" |
4440 | 267 | else: | 331 | else: |
4441 | @@ -276,15 +340,31 @@ | |||
4442 | 276 | else: vala_defines.append(key[:-1]) | 340 | else: vala_defines.append(key[:-1]) |
4443 | 277 | if "HAVE_JSCORE" in bld.env.table: | 341 | if "HAVE_JSCORE" in bld.env.table: |
4444 | 278 | uselib += " JSCORE" | 342 | uselib += " JSCORE" |
4445 | 343 | <<<<<<< TREE | ||
4446 | 279 | if bld.env["VALAC_VERSION"] >= (0, 15, 0): | 344 | if bld.env["VALAC_VERSION"] >= (0, 15, 0): |
4447 | 280 | vala_defines.append('VALAC_0_15') | 345 | vala_defines.append('VALAC_0_15') |
4448 | 281 | packages += " libsoup-2.4-for-vala-gte-0.15" | 346 | packages += " libsoup-2.4-for-vala-gte-0.15" |
4449 | 282 | elif bld.env["VALAC_VERSION"] >= (0, 13, 0): | 347 | elif bld.env["VALAC_VERSION"] >= (0, 13, 0): |
4450 | 348 | ======= | ||
4451 | 349 | if bld.env["VALAC_VERSION"] >= (0, 15, 0): | ||
4452 | 350 | vala_defines.append('VALAC_0_15') | ||
4453 | 351 | packages += " libsoup-cache-2.4-vala-0.15" | ||
4454 | 352 | elif bld.env["VALAC_VERSION"] >= (0, 13, 0): | ||
4455 | 353 | >>>>>>> MERGE-SOURCE | ||
4456 | 283 | vala_defines.append('VALAC_0_13') | 354 | vala_defines.append('VALAC_0_13') |
4457 | 355 | <<<<<<< TREE | ||
4458 | 284 | packages += " libsoup-2.4-for-vala-lt-0.15" | 356 | packages += " libsoup-2.4-for-vala-lt-0.15" |
4459 | 357 | ======= | ||
4460 | 358 | packages += " libsoup-cache-2.4" | ||
4461 | 359 | >>>>>>> MERGE-SOURCE | ||
4462 | 285 | else: | 360 | else: |
4463 | 361 | <<<<<<< TREE | ||
4464 | 286 | vala_defines.append('VALAC_0_12') | 362 | vala_defines.append('VALAC_0_12') |
4465 | 287 | packages += " libsoup-2.4-for-vala-lt-0.15" | 363 | packages += " libsoup-2.4-for-vala-lt-0.15" |
4466 | 364 | ======= | ||
4467 | 365 | vala_defines.append('VALAC_0_12') | ||
4468 | 366 | packages += " libsoup-cache-2.4" | ||
4469 | 367 | >>>>>>> MERGE-SOURCE | ||
4470 | 288 | 368 | ||
4471 | 289 | if DEV_STAGE != "stable" or ctx.options.debug_symbols: | 369 | if DEV_STAGE != "stable" or ctx.options.debug_symbols: |
4472 | 290 | vala_defines.append('DEV_BUILD') | 370 | vala_defines.append('DEV_BUILD') |
4473 | @@ -385,7 +465,26 @@ | |||
4474 | 385 | 'libfenryxo/tools.vala', | 465 | 'libfenryxo/tools.vala', |
4475 | 386 | ] | 466 | ] |
4476 | 387 | 467 | ||
4477 | 468 | <<<<<<< TREE | ||
4478 | 388 | task = ctx.program( | 469 | task = ctx.program( |
4479 | 470 | ======= | ||
4480 | 471 | if "INDICATOR_SOUND_MAVERICK" in vala_defines: | ||
4481 | 472 | packages += " Dbusmenu-Glib-0.2 Indicate-0.2" | ||
4482 | 473 | uselib += " DBUSMENU INDICATE" | ||
4483 | 474 | |||
4484 | 475 | if "UNITY_QUICK_LIST" in vala_defines: | ||
4485 | 476 | packages += " unity Dbusmenu-0.4" | ||
4486 | 477 | uselib += " UNITY DBUSMENU" | ||
4487 | 478 | |||
4488 | 479 | packages += " gtk+-2.0 gdk-2.0 webkit-1.0 gdk-x11-2.0" | ||
4489 | 480 | if ctx.env.LIBNOTIFY_VERSION < [0, 7, 0]: | ||
4490 | 481 | packages += " libnotify-fix" | ||
4491 | 482 | else: | ||
4492 | 483 | packages += " libnotify" | ||
4493 | 484 | |||
4494 | 485 | |||
4495 | 486 | task = bld.program( | ||
4496 | 487 | >>>>>>> MERGE-SOURCE | ||
4497 | 389 | target = target, | 488 | target = target, |
4498 | 390 | packages = packages, | 489 | packages = packages, |
4499 | 391 | uselib = uselib, | 490 | uselib = uselib, |
4500 | @@ -414,6 +513,7 @@ | |||
4501 | 414 | podir=GETTEXT_PO_DIR, | 513 | podir=GETTEXT_PO_DIR, |
4502 | 415 | install_path="${LOCALEDIR}") | 514 | install_path="${LOCALEDIR}") |
4503 | 416 | 515 | ||
4504 | 516 | <<<<<<< TREE | ||
4505 | 417 | data_dir = ctx.path.find_dir('data') | 517 | data_dir = ctx.path.find_dir('data') |
4506 | 418 | ctx.install_files('${PREFIX}/share', data_dir.ant_glob('**'), | 518 | ctx.install_files('${PREFIX}/share', data_dir.ant_glob('**'), |
4507 | 419 | cwd=data_dir, relative_trick=True) | 519 | cwd=data_dir, relative_trick=True) |
4508 | @@ -497,6 +597,19 @@ | |||
4509 | 497 | cmd = 'build_test' | 597 | cmd = 'build_test' |
4510 | 498 | fun = 'build_test' | 598 | fun = 'build_test' |
4511 | 499 | 599 | ||
4512 | 600 | ======= | ||
4513 | 601 | data_dir = bld.path.find_dir('data') | ||
4514 | 602 | bld.install_files('${PREFIX}/share', data_dir.ant_glob('**'), | ||
4515 | 603 | cwd=data_dir, relative_trick=True) | ||
4516 | 604 | data_dir = bld.path.find_dir("build/data") | ||
4517 | 605 | |||
4518 | 606 | if data_dir: | ||
4519 | 607 | bld.install_files('${PREFIX}/share', data_dir.ant_glob('**'), | ||
4520 | 608 | cwd=data_dir, relative_trick=True) | ||
4521 | 609 | |||
4522 | 610 | |||
4523 | 611 | |||
4524 | 612 | >>>>>>> MERGE-SOURCE | ||
4525 | 500 | def dist(ctx): | 613 | def dist(ctx): |
4526 | 501 | ctx.algo = "tar.gz" | 614 | ctx.algo = "tar.gz" |
4527 | 502 | ctx.excl = ' .bzr build/* **/.waf-1* **/*~ **/*.swp **/.lock-w* bzrcommit.txt' | 615 | ctx.excl = ' .bzr build/* **/.waf-1* **/*~ **/*.swp **/.lock-w* bzrcommit.txt' |
Wrong branch, sorry for the noise.