diff -Nru netflix-desktop-0.6.1~natty/ChangeLog netflix-desktop-0.7.0~natty/ChangeLog --- netflix-desktop-0.6.1~natty/ChangeLog 2013-01-29 12:05:24.000000000 +0000 +++ netflix-desktop-0.7.0~natty/ChangeLog 2013-04-18 22:40:14.000000000 +0000 @@ -1,4 +1,16 @@ -netflix-desktop (0.6.1~natty) natty; urgency=low +netflix-desktop (0.7.0~natty) natty; urgency=low + * Updated the Malay translation. + * Updated the French translation. + * Updated the Polish translation. + * Updated the Bosnian translation. + * Updated the Turkish translation. + * Disable automatic update of Mozilla Firefox. + * Disable automatic installation of Wine Gecko and Wine Mono. + * Added support for using kdesudo instead of gksudio as the graphical sudo prompt. + * Allow users to specify the profile location with the WINEPREFIX environment variable. + -- Erich E. Hoover Thu, 18 Apr 2013 16:38:47 -0600 + +netflix-desktop (0.6.1) natty; urgency=low * Added a new package for loading Maxdome. * Fixed a problem with upgrading from versions prior to 0.6.0. -- Erich E. Hoover Tue, 29 Jan 2013 05:01:45 -0700 diff -Nru netflix-desktop-0.6.1~natty/ChangeLog.debian netflix-desktop-0.7.0~natty/ChangeLog.debian --- netflix-desktop-0.6.1~natty/ChangeLog.debian 2013-01-29 12:05:24.000000000 +0000 +++ netflix-desktop-0.7.0~natty/ChangeLog.debian 2013-04-18 22:40:14.000000000 +0000 @@ -1,4 +1,16 @@ -netflix-desktop (0.6.1~natty) natty; urgency=low +netflix-desktop (0.7.0~natty) natty; urgency=low + * Updated the Malay translation. + * Updated the French translation. + * Updated the Polish translation. + * Updated the Bosnian translation. + * Updated the Turkish translation. + * Disable automatic update of Mozilla Firefox. + * Disable automatic installation of Wine Gecko and Wine Mono. + * Added support for using kdesudo instead of gksudio as the graphical sudo prompt. + * Allow users to specify the profile location with the WINEPREFIX environment variable. + -- Erich E. Hoover Thu, 18 Apr 2013 16:38:47 -0600 + +netflix-desktop (0.6.1) natty; urgency=low * Added a new package for loading Maxdome. * Fixed a problem with upgrading from versions prior to 0.6.0. -- Erich E. Hoover Tue, 29 Jan 2013 05:01:45 -0700 diff -Nru netflix-desktop-0.6.1~natty/debian/changelog netflix-desktop-0.7.0~natty/debian/changelog --- netflix-desktop-0.6.1~natty/debian/changelog 2013-01-29 12:05:24.000000000 +0000 +++ netflix-desktop-0.7.0~natty/debian/changelog 2013-04-18 22:40:14.000000000 +0000 @@ -1,4 +1,16 @@ -netflix-desktop (0.6.1~natty) natty; urgency=low +netflix-desktop (0.7.0~natty) natty; urgency=low + * Updated the Malay translation. + * Updated the French translation. + * Updated the Polish translation. + * Updated the Bosnian translation. + * Updated the Turkish translation. + * Disable automatic update of Mozilla Firefox. + * Disable automatic installation of Wine Gecko and Wine Mono. + * Added support for using kdesudo instead of gksudio as the graphical sudo prompt. + * Allow users to specify the profile location with the WINEPREFIX environment variable. + -- Erich E. Hoover Thu, 18 Apr 2013 16:38:47 -0600 + +netflix-desktop (0.6.1) natty; urgency=low * Added a new package for loading Maxdome. * Fixed a problem with upgrading from versions prior to 0.6.0. -- Erich E. Hoover Tue, 29 Jan 2013 05:01:45 -0700 diff -Nru netflix-desktop-0.6.1~natty/debian/services netflix-desktop-0.7.0~natty/debian/services --- netflix-desktop-0.6.1~natty/debian/services 2013-01-29 02:25:58.000000000 +0000 +++ netflix-desktop-0.7.0~natty/debian/services 2013-01-29 12:18:11.000000000 +0000 @@ -1,4 +1,4 @@ netflix-desktop Netflix Desktop Netflix Netflix, Inc. http://www.netflix.com/ 2b844bc6a0b5c2bbcdbb0c403475b10ca4a7dff3210a7c4f5d9521841cf052b1 http://developer.netflix.com/files/Netflix_API2_57x57.png lovefilm-desktop LOVEFiLM Desktop Lovefilm LOVEFiLM International Ltd. http://www.lovefilm.com/ d6b03740d9ae04866a562a826034f0a87dbd973073b482b4884cea06e9daf028 https://twimg0-a.akamaihd.net/profile_images/290083047/lf_normal.png redbox-desktop Redbox Desktop Redbox Redbox Automated Retail, LLC. http://www.redboxinstant.com/ a7b4527a0b30d84f516985b55278a7fb19b17d484994b69bb480a8bfb0e182e7 http://developer.redbox.com/sites/default/files/brand/redbox-icon-512.png -maxdome-desktop Maxdome Desktop Maxdome maxdome GmbH & Co. KG http://www.maxdome.de/ 998035856302229c35bb493afe0002f6148f44e59acb1d6414e4177908560db3 http://www.maxdome.de/images/maxdome/logo.png +maxdome-desktop Maxdome Desktop Maxdome maxdome GmbH & Co. KG. http://www.maxdome.de/ 998035856302229c35bb493afe0002f6148f44e59acb1d6414e4177908560db3 http://www.maxdome.de/images/maxdome/logo.png diff -Nru netflix-desktop-0.6.1~natty/po/ast.po netflix-desktop-0.7.0~natty/po/ast.po --- netflix-desktop-0.6.1~natty/po/ast.po 2013-01-29 02:37:14.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/ast.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2013-01-14 01:29+0000\n" "Last-Translator: Xuacu Saturio \n" "Language-Team: Asturian \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2013-01-15 05:31+0000\n" "X-Generator: Launchpad (build 16420)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "Restolador Wine baxo demanda" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "descargalos agora? (requier una conexón a internet y permisos pa executar " "sudo)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -43,7 +43,7 @@ "descargales agora? (requier una conexón a internet y permisos pa executar " "sudo)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -54,7 +54,7 @@ "l'alcuerdu de llicencia ya instalar eses tipografíes pa que $SERVICE " "funcione correutamente." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -63,35 +63,39 @@ "La imaxe compuesta ta desactivada nel ficheru de configuración de X11, " "activa'l sofitu pa composición y vuelvi a llanzar $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Argumentu de llinia de comandos «$arg» no reconocíu, usu:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[opciones]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Opciones:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Amosar la salida de depuración de Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Recoyer un rexistru de Wine '+relay'." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" "Nun se pudieron comprobar los atributos estendíos na llocalización " -"'${WINE_BROWSER}'." +"'${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -100,7 +104,7 @@ "ficheros, por favor activa la opción user_xattr del sistema de ficheros y " "prueba otra vuelta." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -108,6 +112,14 @@ "Devolviose un códigu d'error inesperáu al comprobar los atributos estendíos " "del sistema de ficheros." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/bg.po netflix-desktop-0.7.0~natty/po/bg.po --- netflix-desktop-0.6.1~natty/po/bg.po 2013-01-29 02:37:34.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/bg.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2013-01-14 14:33+0000\n" "Last-Translator: Blagovest Petrov \n" "Language-Team: Bulgarian \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2013-01-15 05:31+0000\n" "X-Generator: Launchpad (build 16420)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "Моментален браузър на Wine" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "Не се свалиха всички компоненти, нужни на $SERVICE. Бихте ли искали да ги " "свалите сега? (изисква интернет връзка и sudo права)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "Шрифтовете MS true type не са инсталирани правилно, бихте ли искали да ги " "свалите и инсталирате сега? (изисква интернет връзка и sudo права)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "приемете лицензионното споразумение и да инсталирате тези шрифтове, за да " "работи коректно $SERVICE." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Композирането е изключено в конфигурационния файл на X11. Моля, разрешете " "поддръжката на композиране и презаредете $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Неразпознат аргумент на команден ред '$arg', usage:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[опции]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Опции:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Показване на изход на Wine за отстраняване на грешки." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Събиране на лог Wine '+relay' ." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Не може да се проверят разширените атрибути при '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Не може да се проверят разширените атрибути при '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "Изглежда, че няма включени атрибути за разширена файлова система. Моля, " "разрешете опцията user_xattr за файловата система и пробвайте отново." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "Беше върнат неочакван код за грешка при тестване на атрибути за разширена " "файлова система." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/bs.po netflix-desktop-0.7.0~natty/po/bs.po --- netflix-desktop-0.6.1~natty/po/bs.po 2013-01-29 02:37:42.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/bs.po 2013-04-18 21:34:37.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-13 23:04+0000\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-22 22:41+0000\n" "Last-Translator: Kenan Dervišević \n" "Language-Team: Bosnian \n" -"Language: bs\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-14 05:16+0000\n" -"X-Generator: Launchpad (build 16420)\n" +"X-Launchpad-Export-Date: 2013-02-23 06:06+0000\n" +"X-Generator: Launchpad (build 16506)\n" +"Language: bs\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "Wine preglednik na zahtjev" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "Sve komponente koje su potrebne za rad $SERVICE nisu preuzete. Želite li ih " "preuzeti sada? (neophodna je internet veza i sudo dozvole)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type fonotovi nisu ispravno instalirani. Želite li ih preuzeti sada? " "(neophodna je internet veza i sudo dozvole)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -51,7 +51,7 @@ "Izgleda da još niste instalirali MS true type fontove. Morate prihvatiti " "licencu i instalirati ove fontove da bi $SERVICE radio ispravno." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -60,34 +60,38 @@ "Kompozicija je onemogućena u X11 konfiguracijskoj datoteci. Molimo vas da " "omogućite kompoziciju i ponovo pokrenete $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Argument komandne linije '$arg' nije prepoznat, način korištenja:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[opcije]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Opcije:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Prikaži debug izlaz za Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Kreiraj Wine '+relay' izvještaj." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Dozvoli Wine Gecko i Wine Mono unutar prefiksa." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -"Nije moguće testirati proširene atribute na lokaciji '${WINE_BROWSER}'." +"Nije moguće testirati proširene atribute na lokaciji '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -96,7 +100,7 @@ "omogućite opciju user_xattr za vaš sistem podataka i da nakon toga pokušate " "ponovo." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -104,6 +108,14 @@ "Desila se neočekivana greška prilikom testiranja proširenih svojstava " "sistema podataka." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Izvršavam lokalnu instalaciju..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Izvršavam nadogradnju profila..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/ca.po netflix-desktop-0.7.0~natty/po/ca.po --- netflix-desktop-0.6.1~natty/po/ca.po 2013-01-29 02:37:57.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/ca.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 22:21+0000\n" "Last-Translator: VPablo \n" "Language-Team: Catalan \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-23 05:06+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "vol descarregar-los ara? (necessita una connexió a Internet i permisos de " "super usuari)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -43,7 +43,7 @@ "descarregar-les i instal·lar-les ara? (necessita una connexió a Internet i " "permisos de super usuari)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -54,40 +54,44 @@ "acceptar l'acord de llicència i instal·lar estes fonts per a fer funcionar " "de forma correcta l'$SERVICE." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[opcions]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Opcions:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Mostra els resultats de depuració de Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Recull un registre de Wine '+relay'." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -96,7 +100,7 @@ "favor habilite la opció iser_xattr del seu arxiu de sistema i intente-ho de " "nou." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -104,6 +108,14 @@ "S'ha retornat un codi d'error inesperat quan s'estava provant els atributs " "del sistema d'arxius estès." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/da.po netflix-desktop-0.7.0~natty/po/da.po --- netflix-desktop-0.6.1~natty/po/da.po 2013-01-29 02:38:05.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/da.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 10:10+0000\n" "Last-Translator: Daniel Ejsing-Duun \n" "Language-Team: Danish \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-23 05:06+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "Ikke alle komponenter, der kræves af $SERVICE, blev hentet. Vil du hente dem " "nu? (kræver en internetforbindelse og sudo-rettigheder)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type-skrifttyperne er ikke installeret ordentligt. Vil du hente og " "installere dem nu? (kræver en internetforbindelse og sudo-rettigheder)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,40 +52,44 @@ "skrifttyperne. Du skal acceptere licensbetingelserne og installere " "skrifttyperne for at $SERVICE kan fungere ordentligt." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[tilvalg]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Tilvalg:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Vis fejlretningsmeddelelser fra Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Lav en '+relay'-log i Wine." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -93,7 +97,7 @@ "Det ser ud til, at du ikke har slået udvidede filsystemsattributter til. " "Brug venligst tilvalget user_xattr for dit filsystem og prøv igen." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -101,6 +105,14 @@ "En uventet fejlkode blev returneret, da der blev kontrolleret for udvidede " "filsystemsattributter." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." @@ -159,7 +171,7 @@ msgstr "Redbox skrivebord" #: debian/services:4 -#, fuzzy, sh-format +#, sh-format msgid "Maxdome Desktop" msgstr "Maxdome skrivebord" diff -Nru netflix-desktop-0.6.1~natty/po/de.po netflix-desktop-0.7.0~natty/po/de.po --- netflix-desktop-0.6.1~natty/po/de.po 2013-01-29 02:38:18.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/de.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2013-01-17 16:16+0000\n" "Last-Translator: Dennis Baudys \n" "Language-Team: German \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2013-01-18 06:21+0000\n" "X-Generator: Launchpad (build 16430)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "On-Demand-Wine-Browser" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "werden. Möchten Sie diese jetzt herunterladen? (Es werden eine " "Internetverbindung und Systemverwalterrechte benötigt.)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -43,7 +43,7 @@ "jetzt herunterladen und installieren? (Es werden eine Internetverbindung und " "Systemverwalterrechte benötigt.)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -54,7 +54,7 @@ "installiert hätten. Sie müssen die Lizenzbestimmungen akzeptieren und diese " "Schriften installieren, damit $SERVICE richtig funktioniert." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -63,34 +63,38 @@ "Compositing ist in der X11-Konfigurationsdatei deaktiviert. Bitte aktivieren " "Sie die Compositing-Unterstützung und starten Sie $SERVICE erneut." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Befehlszeilenargument »$arg« wurde nicht erkannt. Aufruf:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[Optionen]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Optionen:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Die Fehlerdiagnoseausgabe von Wine anzeigen." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Ein »+relay«-Protokoll von Wine erstellen lassen." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -"Erweiterte Attribute am Ort »${WINE_BROWSER}« können nicht getestet werden." +"Erweiterte Attribute am Ort »${WINEPREFIX}« können nicht getestet werden." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -99,7 +103,7 @@ "hätten. Bitte aktivieren Sie die user_xattr Option für Ihr Dateisystem und " "versuchen Sie es erneut." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -107,6 +111,14 @@ "Ein unerwarteter Fehlercode wurde beim Testen nach erweiterten " "Dateisystemattributen zurückgegeben." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/en.po netflix-desktop-0.7.0~natty/po/en.po --- netflix-desktop-0.6.1~natty/po/en.po 2013-01-29 02:35:46.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/en.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-12 12:36-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en\n" @@ -17,12 +17,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "On Demand Wine Browser" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "like to download them now? (requires an Internet connection and sudo " "permissions)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "need to accept the license agreement and install these fonts for $SERVICE to " "work properly." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Unrecognized command-line argument '$arg', usage:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Show Wine debug output." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Collect a Wine '+relay' log." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Allow Wine Gecko and Wine Mono within the prefix." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Unable to test extended attributes at location '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "An unexpected error code was returned when testing for extended file system " "attributes." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Performing local installation..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Performing profile upgrade..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/en_AU.po netflix-desktop-0.7.0~natty/po/en_AU.po --- netflix-desktop-0.6.1~natty/po/en_AU.po 2013-01-29 02:35:46.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/en_AU.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-12 12:36-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_AU\n" @@ -17,12 +17,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "On Demand Wine Browser" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "like to download them now? (requires an Internet connection and sudo " "permissions)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "need to accept the license agreement and install these fonts for $SERVICE to " "work properly." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Unrecognized command-line argument '$arg', usage:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Show Wine debug output." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Collect a Wine '+relay' log." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Allow Wine Gecko and Wine Mono within the prefix." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Unable to test extended attributes at location '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "An unexpected error code was returned when testing for extended file system " "attributes." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Performing local installation..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Performing profile upgrade..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/en_CA.po netflix-desktop-0.7.0~natty/po/en_CA.po --- netflix-desktop-0.6.1~natty/po/en_CA.po 2013-01-29 02:35:46.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/en_CA.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-12 12:36-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_CA\n" @@ -17,12 +17,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "On Demand Wine Browser" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "like to download them now? (requires an Internet connection and sudo " "permissions)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "need to accept the license agreement and install these fonts for $SERVICE to " "work properly." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Unrecognized command-line argument '$arg', usage:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Show Wine debug output." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Collect a Wine '+relay' log." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Allow Wine Gecko and Wine Mono within the prefix." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Unable to test extended attributes at location '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "An unexpected error code was returned when testing for extended file system " "attributes." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Performing local installation..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Performing profile upgrade..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/en_GB.po netflix-desktop-0.7.0~natty/po/en_GB.po --- netflix-desktop-0.6.1~natty/po/en_GB.po 2013-01-29 02:35:46.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/en_GB.po 2013-02-12 19:37:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-12 12:36-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_GB\n" @@ -17,12 +17,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "On Demand Wine Browser" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "like to download them now? (requires an Internet connection and sudo " "permissions)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "need to accept the license agreement and install these fonts for $SERVICE to " "work properly." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Unrecognized command-line argument '$arg', usage:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Show Wine debug output." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Collect a Wine '+relay' log." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Allow Wine Gecko and Wine Mono within the prefix." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Unable to test extended attributes at location '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "An unexpected error code was returned when testing for extended file system " "attributes." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Performing local installation..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Performing profile upgrade..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/en_US.po netflix-desktop-0.7.0~natty/po/en_US.po --- netflix-desktop-0.6.1~natty/po/en_US.po 2013-01-29 02:35:46.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/en_US.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-12 12:36-0700\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" "Language: en_US\n" @@ -17,12 +17,12 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "On Demand Wine Browser" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "like to download them now? (requires an Internet connection and sudo " "permissions)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "need to accept the license agreement and install these fonts for $SERVICE to " "work properly." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Unrecognized command-line argument '$arg', usage:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Show Wine debug output." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Collect a Wine '+relay' log." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Allow Wine Gecko and Wine Mono within the prefix." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Unable to test extended attributes at location '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "An unexpected error code was returned when testing for extended file system " "attributes." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Performing local installation..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Performing profile upgrade..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/es.po netflix-desktop-0.7.0~natty/po/es.po --- netflix-desktop-0.6.1~natty/po/es.po 2013-01-29 02:38:28.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/es.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 06:24+0000\n" "Last-Translator: Adolfo Jayme Barrientos \n" "Language-Team: Spanish \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-22 06:45+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "¿Desearía descargarlos ahora? (requiere una conexión a internet y permisos " "de súper usuario)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -43,7 +43,7 @@ "descargarlas ahora? (requiere una conexión a internet y permisos de súper " "usuario)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -54,40 +54,44 @@ "aceptar el acuerdo de licencia e instalar estas fuentes para que $SERVICE " "funcione correctamente." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[opciones]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Opciones:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Mostrar resultados de depuración de Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Recoger un registro de Wine '+relay'" -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -96,7 +100,7 @@ "extendido, por favor habilite la opción iser_xattr de su archivo de sistema " "e intente de nuevo." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -104,6 +108,14 @@ "Un error de código inesperado fue devuelto cuando se estaba probando los " "atributos del sistema de archivo extendido." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/eu.po netflix-desktop-0.7.0~natty/po/eu.po --- netflix-desktop-0.6.1~natty/po/eu.po 2013-01-29 02:38:37.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/eu.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 01:27+0000\n" "Last-Translator: Asier Iturralde Sarasola \n" "Language-Team: Basque \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-22 06:44+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "Ez dira deskargatu $SERVICE behar dituen osagai guztiak, orain deskargatu " "nahi dituzu? (Interneteko konexioa eta sudo baimena behar dira)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type letra-tipoak ez daude behar bezala instalatuta, deskargatu eta " "instalatu nahi dituzu? (Interneteko konexioa eta sudo baimena behar dira)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,40 +52,44 @@ "kontratua onartu eta letra-tipo hauek instalatu behar dituzu $SERVICE behar " "bezala funtziona dezan." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[aukerak]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Aukerak:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Erakutsi Wine-ren arazketako irteera." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Bildu Wine '+relay' loga." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -93,7 +97,7 @@ "Dirudienez ez dauzkazu fitxategi-sistemaren atributu hedatuak gaituta, " "mesedez gaitu user_xattr aukera zure fitxategi-sisteman eta saiatu berriro." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -101,6 +105,14 @@ "Ustekabeko errore-kode bat itzuli da fitxategi-sistemaren atributu hedatuak " "probatzean." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/fr.po netflix-desktop-0.7.0~natty/po/fr.po --- netflix-desktop-0.6.1~natty/po/fr.po 2013-01-29 02:38:49.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/fr.po 2013-04-18 21:34:37.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-12 09:15+0000\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-23 16:29+0000\n" "Last-Translator: zapman \n" "Language-Team: French \n" -"Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-13 05:26+0000\n" -"X-Generator: Launchpad (build 16420)\n" +"X-Launchpad-Export-Date: 2013-02-24 05:11+0000\n" +"X-Generator: Launchpad (build 16506)\n" +"Language: fr\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "Navigateur Wine à la demande" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "vous les télécharger maintenant ? (nécessite une connexion Internet et les " "permissions sudo)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -43,7 +43,7 @@ "les télécharger et les installer dès maintenant ? (nécessite une connexion " "Internet et les permissions sudo)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -54,7 +54,7 @@ "vous devez accepter la licence et installer ces polices pour que $SERVICE " "fonctionne correctement." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -63,34 +63,38 @@ "La composition est désactivée dans le fichier de configuration de X11, " "veuillez activer le support de la composition et relancer $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Argument de ligne de commande '$arg' non reconnu, utilisation :" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options :" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Afficher la sortie de débogage de Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Recueillir un journal Wine '+relay'." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Autoriser Wine Gecko et Wine Mono dans le préfixe." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -"Impossible de tester les attributs étendus à l'emplacement '${WINE_BROWSER}'." +"Impossible de tester les attributs étendus à l'emplacement '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -99,7 +103,7 @@ "fichiers, veuillez activer l'option user_xattr pour votre système de " "fichiers et réessayez." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -107,6 +111,14 @@ "Un code d'erreur inattendue a été renvoyé lors du test des attributs étendus " "du système de fichiers." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Installation locale en cours..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Mise à niveau du profil en cours..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/he.po netflix-desktop-0.7.0~natty/po/he.po --- netflix-desktop-0.6.1~natty/po/he.po 2013-01-29 02:39:04.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/he.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-25 06:11+0000\n" "Last-Translator: Yaron \n" "Language-Team: Hebrew \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-26 05:15+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "לא כל הרכיבים שנדרשים על ידי $SERVICE התקבלו, האם ברצונך להוריד אותם כעת? " "(נדרש חיבור לאינטרנט והרשאות להפעלת sudo)." -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "גופני ה־True Type של MS אינם מותקנים כראוי, האם ברצונך להוריד ולהתקין אותם " "כעת? (נדרש חיבור לאינטרנט והרשאות להפעלת sudo)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -51,40 +51,44 @@ "מסתבר כי לא התקנת את גופני ה־‏True Type מבית MS, עליך להסכים לתנאי הרישוי " "ולהתקין את הגופנים האלה כדי ש־$SERVICE יעבוד כראוי." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[אפשרויות]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "אפשרויות:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "הצגת פלט ניפוי השגיאות של Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "איסוף יומן '‎+relay' של Wine." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -92,12 +96,20 @@ "מסתבר כי במערכת שלך אין תכונות מורחבות למערכת הקבצים, נא להפעיל את האפשרות " "user_xattr במערכת הקבצים ולנסות שוב." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." msgstr "הוחזר קוד שגיאה בלתי צפוי בעת בדיקת תכונות מורחבות של מערכת הקבצים." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/ja.po netflix-desktop-0.7.0~natty/po/ja.po --- netflix-desktop-0.6.1~natty/po/ja.po 2013-01-29 02:39:12.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/ja.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2013-01-14 04:34+0000\n" "Last-Translator: Kentaro Kazuhama \n" "Language-Team: Japanese \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2013-01-15 05:31+0000\n" "X-Generator: Launchpad (build 16420)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "オンデマンドWineブラウザー" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "$SERVICE に必要な一部のコンポーネントをダウンロードできていません。今すぐダウ" "ンロードしますか?(インターネット接続とsudoの権限が必要です)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MSのTrueTypeフォントが適切にインストールされていません。今すぐダウンロードし" "ますか?(インターネット接続とsudoの権限が必要です)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "動作させるには、ライセンス使用許諾を承認してこれらのフォントをインストールす" "る必要があります。" -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "コンポジットがX11設定ファイルで無効になっています。コンポジットサポートを有効" "にして $SERVICE を再起動してください。" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "認識できないコマンドライン引数'$arg'です。使用法:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[オプション]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "オプション:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Wineのデバッグ出力を表示します。" -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Wineの'+relay'ログを収集します。" -#: wine-browser-installer/wine-browser:96 -#, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "拡張属性'${WINE_BROWSER}'の場所がテストできません。" +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:106 +#, fuzzy, sh-format +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "拡張属性'${WINEPREFIX}'の場所がテストできません。" + +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,13 +99,21 @@ "拡張ファイルシステム属性が有効になっていないようです。ファイルシステムの" "user_xattrオプションを有効にして再度試してください。" -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." msgstr "" "拡張ファイルシステム属性のテスト中に予期しないエラーコードが返されました。" +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/ms.po netflix-desktop-0.7.0~natty/po/ms.po --- netflix-desktop-0.6.1~natty/po/ms.po 2013-01-29 02:39:23.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/ms.po 2013-04-18 21:34:37.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-14 13:31+0000\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-18 11:14+0000\n" "Last-Translator: abuyop \n" "Language-Team: Malay \n" -"Language: ms\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-15 05:31+0000\n" -"X-Generator: Launchpad (build 16420)\n" +"X-Launchpad-Export-Date: 2013-02-19 05:31+0000\n" +"X-Generator: Launchpad (build 16491)\n" +"Language: ms\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "Pelayar Wine On Demand" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -34,7 +34,7 @@ "hendak muat turun ia sekarang? (perlukan sambungan Internet dan keizinan " "sudo)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -42,7 +42,7 @@ "Fon MS true type tidak dipasang dengan betul, anda hendak muat turun dan " "pasangnya sekarang? (memerlukan sambungan Internet dan keizinan sudo)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "Kelihatan anda masih tidak memasang fon MS true type, anda mesti menerima " "persetujuan lesen dan pasang fon ini supaya $SERVICE berfungsi dengan baik." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,33 +61,37 @@ "Penggubahan dilumpuhkan dalam fail konfigurasi X11, sila benarkan sokongan " "penggubahan dan lancar semula $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "argumen '$arg' baris perintah tidak dikenali, penggunaan:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[pilihan]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Pilihan:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Papar output nyahpepijat Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Kutip log Wine '+relay'." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Benarkan Wine Gecko dan Wine Mono di dalam awalan." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Tidak dapat uji atribut lanjutan pada lokasi '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Tidak dapat uji atribut lanjutan pada lokasi '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -95,7 +99,7 @@ "Kelihatan anda tidak mempunyai atribut fail lanjutan yang telah dibenarkan, " "sila benarkan pilihan user_xattr untuk sistem fail anda dan cuba lagi." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -103,6 +107,14 @@ "Kod ralat tidak dijangka telah dikembalikan bila menguji untuk atribut " "sistem fail lanjutan." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Membuat pemasangan setempat..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Membuat penataran profil..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/my.po netflix-desktop-0.7.0~natty/po/my.po --- netflix-desktop-0.6.1~natty/po/my.po 2013-01-29 02:39:32.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/my.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 12:28+0000\n" "Last-Translator: Pyae Sone \n" "Language-Team: Burmese \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-23 05:06+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "$SERVICE မှလိုအပ်သောအစိတ်အပိုင်းတစ်ချို့ကိုဒေါင်းလုတ်မဆွဲဖြစ်ပါ။ ကျန်ခဲ့သောအရာများကို " "ဒေါင်းလုတ်ဆွဲချင်ပါသလား။ (အင်တာနက်ကွန်နက်ရှင်နှင့် sudo ခွင့်ပြုချက်တော့လိုအပ်သည်။)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type စာလုံးပုံစံများကို သေချာမသွင်းထားပါ။ ထိုစာလုံးများကို ဒေါင်းလုတ်ဆွဲပြီး " "သွင်းချင်ပါသလား။ (အင်တာနက်ကွန်နက်ရှင်နှင့် sudo ခွင့်ပြုချက်တော့လိုအပ်သည်။)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -51,40 +51,44 @@ "MS true type စာကားလုံးပုံစံ မသွင်းရသေးပုံပေါ်သည်။ သင်လိုင်စင်သဘောတူညီချက်ကို လက်ခံရန်လိုအပ်သည်။ထို့နောက် " "$SERVICE ကောင်းမွန်စွာ အလုပ်လုပ်ရန် အတွက် ထိုစာကားလုံးပုံစံများကိုသွင်းပါ။" -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[options]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Options:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Wine debug output ကိုပြမည်" -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Wine '+relay' log များစုစည်းမည်" -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -92,7 +96,7 @@ "extended file system attributes ကိုမဖွင့်ရသေးဘူးဟုထင်မိပါသည်။ သင်၏စက်စနစ်အတွက် user_xattr " "option ကိုဖွင့်ပြီး ပြန်ကြိုးစားကြည့်ပါ။" -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -100,6 +104,14 @@ "extended file system attributes အတွက် စမ်းသပ်နေချိန်တွင် မမျှော်လင့်သော error code " "ဖြင့်ပြန်လာသည်။" +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/netflix-desktop.pot netflix-desktop-0.7.0~natty/po/netflix-desktop.pot --- netflix-desktop-0.6.1~natty/po/netflix-desktop.pot 2013-01-29 02:33:33.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/netflix-desktop.pot 2013-02-12 19:36:40.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: N/A\n" "Last-Translator: Automatically generated\n" "Language-Team: none\n" @@ -17,12 +17,12 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -30,13 +30,13 @@ "permissions)" msgstr "" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" msgstr "" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -44,51 +44,63 @@ "work properly." msgstr "" -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "" -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "" -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." msgstr "" -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." msgstr "" +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/pl.po netflix-desktop-0.7.0~natty/po/pl.po --- netflix-desktop-0.6.1~natty/po/pl.po 2013-01-29 02:39:46.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/pl.po 2013-04-18 21:34:37.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-21 17:24+0000\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-03-04 12:08+0000\n" "Last-Translator: Isamu715 \n" "Language-Team: Polish \n" -"Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-22 05:30+0000\n" -"X-Generator: Launchpad (build 16430)\n" +"X-Launchpad-Export-Date: 2013-03-05 05:37+0000\n" +"X-Generator: Launchpad (build 16514)\n" +"Language: pl\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "Przeglądarka Wine na żądanie" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "Nie wszystkie komponenty wymagane przez $SERVICE zostały pobrane, czy chcesz " "je pobrać teraz? (potrzebne jest połączenie z internetem i uprawnienia sudo)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -42,7 +42,7 @@ "zainstalować teraz? (potrzebne jest połączenie z internetem i uprawnienia " "sudo)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "Wygląda na to, że nadal nie zainstalowałeś czcionek MS true type, musisz " "zaakceptować licencję i zainstalować czcionki by $SERVICE działał poprawnie." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -61,34 +61,38 @@ "Kompozytowanie jest wyłączone w pliku konfiguracyjnym X11, włącz " "kompozytowanie i uruchom ponownie $SERVICE." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Nierozpoznany argument wiersza poleceń '$arg', użycie:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[opcje]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Opcje:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Pokaż komunikaty do debugowania Wine" -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Zbieraj dziennnik \"+relay\" aplikacji Wine" -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Zezwól na Wine Gecko i Wine Mono wewnątrz prefiksu" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -"Nie można przetestować rozszerzonych atrybutów w położeniu '${WINE_BROWSER}'." +"Nie można przetestować rozszerzonych atrybutów w położeniu '${WINEPREFIX}'." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -96,7 +100,7 @@ "Wygląda na to, że nie masz włączonych rozszerzonych atrybutów systemu " "plików, włącz opcję user_xattr dla swojego systemu plików i spróbuj ponownie." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -104,6 +108,14 @@ "Niespodziewany kod błędu został zwrócony podczas sprawdzania rozszerzonych " "atrybutów systemu plików." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Wykonywanie instalacji lokalnej..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Wykonywanie aktualizacji profilu" + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/pt_BR.po netflix-desktop-0.7.0~natty/po/pt_BR.po --- netflix-desktop-0.6.1~natty/po/pt_BR.po 2013-01-29 02:39:55.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/pt_BR.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 00:50+0000\n" "Last-Translator: Fábio Nogueira \n" "Language-Team: Brazilian Portuguese \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-22 06:45+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "Nem todos os componentes exigidos pelo $SERVICE foram baixados, gostaria de " "baixá-los agora? (requer uma conexão à Internet e permissões de sudo)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "Fontes true type da MS não estão devidamente instaladas, gostaria de baixar " "e instalá-las agora? (requer uma conexão à Internet e permissões de sudo)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,40 +52,44 @@ "precisa aceitar o contrato de licença e instalar essas fontes para o " "$SERVICE funcionar corretamente." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[opções]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Opções:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Mostrar saída de depuração do Wine." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Coletar um log '+relay' do Wine." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -94,7 +98,7 @@ "arquivos, por favor, habilite a opção user_xattr para seu sistema de " "arquivos e tente novamente." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -102,6 +106,14 @@ "Um código de erro inesperado foi retornado ao testar para os atributos " "estendidos do sistema de arquivo." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/tr.po netflix-desktop-0.7.0~natty/po/tr.po --- netflix-desktop-0.6.1~natty/po/tr.po 2013-01-29 02:40:04.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/tr.po 2013-04-18 21:34:37.000000000 +0000 @@ -7,23 +7,23 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" -"PO-Revision-Date: 2013-01-12 09:14+0000\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" +"PO-Revision-Date: 2013-02-23 16:32+0000\n" "Last-Translator: zapman \n" "Language-Team: Turkish \n" -"Language: tr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2013-01-13 05:26+0000\n" -"X-Generator: Launchpad (build 16420)\n" +"X-Launchpad-Export-Date: 2013-02-24 05:11+0000\n" +"X-Generator: Launchpad (build 16506)\n" +"Language: tr\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "İsteğe Bağlı Wine Tarayıcısı" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "$SERVICE'un ihtiyaç duyduğu bileşenlerin tümü indirilemedi, şimdi indirmek " "ister misiniz? (bir İnternet bağlantısı ve sudo yetkileri gerektirir)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type yazıtipleri gerektiği gibi kurulu değil, şimdi indirip kurmak " "ister misiniz? (bir İnternet bağlantısı ve sudo yetkileri gerektirir)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,7 +52,7 @@ "gerekiği gibi çalışması için lisansı kabul edip bu yazı tiplerini kurmanız " "lazımdır." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " @@ -62,33 +62,37 @@ "lütfen kompozisyon desteğini etkinleştirip $SERVICE unsurunu tekrar " "başlatınız." -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "Anlaşılamayan komut satırı argümanı '$arg', kullanım:" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[seçenekler]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "Seçenekler:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Wine hata ayıklama çıktısını görüntüle." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Wine '+relay' kütüğü topla." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "Wine Gecko ve Wine Mono'ya ön ekte izin ver." + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." -msgstr "Genişletilmiş öznitelikler '${WINE_BROWSER}' konumunda test edilemedi." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." +msgstr "Genişletilmiş öznitelikler '${WINEPREFIX}' konumunda test edilemedi." -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -97,7 +101,7 @@ "görünüyor, lütfen dosya sisteminiz için user_xattr seçeneğini etkinleştirip " "tekrar deneyiniz." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -105,6 +109,14 @@ "Genişletilmiş dosya sistemi özniteliklerinin denenmesi sırasında beklenmedik " "bir hata kodu alındı." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "Yerel kurulum yapılıyor..." + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "Profil yükseltmesi yapılıyor..." + #: wine-browser-installer/install-files:19 #, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/po/ug.po netflix-desktop-0.7.0~natty/po/ug.po --- netflix-desktop-0.6.1~natty/po/ug.po 2013-01-29 02:40:15.000000000 +0000 +++ netflix-desktop-0.7.0~natty/po/ug.po 2013-02-12 19:37:43.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: netflix-desktop\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-01-28 19:33-0700\n" +"POT-Creation-Date: 2013-02-12 12:36-0700\n" "PO-Revision-Date: 2012-12-22 15:15+0000\n" "Last-Translator: Sahran \n" "Language-Team: Uyghur \n" @@ -18,12 +18,12 @@ "X-Launchpad-Export-Date: 2012-12-23 05:06+0000\n" "X-Generator: Launchpad (build 16378)\n" -#: wine-browser-installer/wine-browser:20 +#: wine-browser-installer/wine-browser:19 #: wine-browser-installer/wine-browser-installer.install-files:12 msgid "On Demand Wine Browser" msgstr "" -#: wine-browser-installer/wine-browser:28 +#: wine-browser-installer/wine-browser:34 #, sh-format msgid "" "Not all of the components required by $SERVICE were downloaded, would you " @@ -33,7 +33,7 @@ "$SERVICE گە زۆرۈر بولغان ھەممە بۆلەكلەر چۈشۈرۈلمىگەن بولۇشى مۇمكىن، ئۇلارنى " "ھازىر چۈشۈرەمسىز؟ (بىر ئىنتېرنېت باغلىنىشى ۋە sudo ھوقۇقى بولۇشى زۆرۈر)" -#: wine-browser-installer/wine-browser:29 +#: wine-browser-installer/wine-browser:35 msgid "" "MS true type fonts are not properly installed, would you like to download " "and install them now? (requires an Internet connection and sudo permissions)" @@ -41,7 +41,7 @@ "MS true type خەت نۇسخىسى توغرا ئورنىتىلمىغان، ھازىر ئۇلارنى چۈشۈرۈپ " "ئورنىتامسىز؟ (بىر ئىنتېرنېت باغلىنىشى ۋە sudo ھوقۇقى بولۇشى زۆرۈر)" -#: wine-browser-installer/wine-browser:30 +#: wine-browser-installer/wine-browser:36 #, sh-format msgid "" "It appears that you still have not installed the MS true type fonts, you " @@ -52,40 +52,44 @@ "قوشۇلۇپ، $SERVICEنىڭ نورمال ئىجرا قىلىنىشى ئۈچۈن بۇ خەت نۇسخىلىرىنى " "ئورنىتىشڭىز كېرەك." -#: wine-browser-installer/wine-browser:31 +#: wine-browser-installer/wine-browser:37 #, sh-format msgid "" "Compositing is disabled in the X11 configuration file, please enable " "compositing support and relaunch $SERVICE." msgstr "" -#: wine-browser-installer/wine-browser:56 +#: wine-browser-installer/wine-browser:65 #, sh-format msgid "Unrecognized command-line argument '$arg', usage:" msgstr "" -#: wine-browser-installer/wine-browser:58 +#: wine-browser-installer/wine-browser:67 msgid "[options]" msgstr "[تاللانمىلار]" -#: wine-browser-installer/wine-browser:60 +#: wine-browser-installer/wine-browser:69 msgid "Options:" msgstr "تاللانمىلار:" -#: wine-browser-installer/wine-browser:61 +#: wine-browser-installer/wine-browser:70 msgid "Show Wine debug output." msgstr "Wine سازلاپ چىقىرىشنى كۆرسىتىدۇ." -#: wine-browser-installer/wine-browser:62 +#: wine-browser-installer/wine-browser:71 msgid "Collect a Wine '+relay' log." msgstr "Wine '+relay' خاتىرىسىنى توپلايدۇ." -#: wine-browser-installer/wine-browser:96 +#: wine-browser-installer/wine-browser:72 +msgid "Allow Wine Gecko and Wine Mono within the prefix." +msgstr "" + +#: wine-browser-installer/wine-browser:106 #, sh-format -msgid "Unable to test extended attributes at location '${WINE_BROWSER}'." +msgid "Unable to test extended attributes at location '${WINEPREFIX}'." msgstr "" -#: wine-browser-installer/wine-browser:98 +#: wine-browser-installer/wine-browser:108 msgid "" "It appears that you do not have extended file system attributes enabled, " "please enable the user_xattr option for your filesystem and try again." @@ -93,7 +97,7 @@ "سىز كېڭەيتىلگەن ھۆججەت سىستېما خاسلىقىنى قوزغاتمىغاندەك تۇرىسىز، ھۆججەت " "سىستېمىسىنىڭ user_xattr تاللانمىسىنى قوزغىتىپ، ئاندىن قايتا سىناڭ." -#: wine-browser-installer/wine-browser:100 +#: wine-browser-installer/wine-browser:110 msgid "" "An unexpected error code was returned when testing for extended file system " "attributes." @@ -101,6 +105,14 @@ "كېڭەيتىلگەن ھۆججەت سىستېما خاسلىقلىرىنى سىناۋاتقاندا ئويلاشمىغان بىر خاتالىق " "كودى قايتۇردى." +#: wine-browser-installer/wine-browser:165 +msgid "Performing local installation..." +msgstr "" + +#: wine-browser-installer/wine-browser:168 +msgid "Performing profile upgrade..." +msgstr "" + #: wine-browser-installer/install-files:19 #, fuzzy, sh-format msgid "$SERVICE is NOT fully installed." diff -Nru netflix-desktop-0.6.1~natty/wine-browser-installer/browser-profile/prefs.js netflix-desktop-0.7.0~natty/wine-browser-installer/browser-profile/prefs.js --- netflix-desktop-0.6.1~natty/wine-browser-installer/browser-profile/prefs.js 2012-10-31 17:48:03.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-browser-installer/browser-profile/prefs.js 2013-04-18 22:33:23.000000000 +0000 @@ -8,14 +8,19 @@ * To make a manual change to preferences, you can visit the URL about:config */ +user_pref("app.update.enabled", false); user_pref("app.update.lastUpdateTime.addon-background-update-timer", 0); user_pref("app.update.lastUpdateTime.background-update-timer", 0); user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 0); +user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1366324221); user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1351628024); user_pref("browser.bookmarks.restore_default_bookmarks", false); -user_pref("browser.cache.disk.capacity", 1048576); +user_pref("browser.cache.disk.capacity", 358400); user_pref("browser.cache.disk.smart_size.first_run", false); -user_pref("browser.migration.version", 6); +user_pref("browser.cache.disk.smart_size.use_old_max", false); +user_pref("browser.cache.disk.smart_size_cached_value", 358400); +user_pref("browser.migration.version", 8); +user_pref("browser.pagethumbnails.storage_version", 2); user_pref("browser.places.smartBookmarksVersion", 4); user_pref("browser.rights.3.shown", true); user_pref("browser.shell.checkDefaultBrowser", false); @@ -24,23 +29,26 @@ user_pref("browser.startup.homepage_override.mstone", "14.0.1"); user_pref("browser.tabs.autoHide", true); user_pref("distribution.mozilla13.bookmarksProcessed", true); -user_pref("extensions.blocklist.pingCountVersion", 0); +user_pref("extensions.blocklist.pingCountVersion", -1); user_pref("extensions.bootstrappedAddons", "{}"); -user_pref("extensions.databaseSchema", 12); -user_pref("extensions.enabledAddons", "{972ce4c6-7e08-4474-a285-3208198ce6fd}:14.0.1"); -user_pref("extensions.installCache", "[{\"name\":\"app-global\",\"addons\":{\"{972ce4c6-7e08-4474-a285-3208198ce6fd}\":{\"descriptor\":\"C:\\\\Program Files\\\\Mozilla Firefox\\\\extensions\\\\{972ce4c6-7e08-4474-a285-3208198ce6fd}\",\"mtime\":1351705438788}}}]"); -user_pref("extensions.lastAppVersion", "14.0.1"); -user_pref("extensions.lastPlatformVersion", "14.0.1"); +user_pref("extensions.databaseSchema", 14); +user_pref("extensions.enabledAddons", "%7B66e634b8-39da-11e2-bccc-0090f5c75ad5%7D:0.3.0,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:18.0.1"); +user_pref("extensions.installCache", "[{\"name\":\"app-global\",\"addons\":{\"{972ce4c6-7e08-4474-a285-3208198ce6fd}\":{\"descriptor\":\"C:\\\\Program Files\\\\Mozilla Firefox\\\\extensions\\\\{972ce4c6-7e08-4474-a285-3208198ce6fd}\",\"mtime\":1366324200459}}},{\"name\":\"app-profile\",\"addons\":{\"{66e634b8-39da-11e2-bccc-0090f5c75ad5}\":{\"descriptor\":\"Z:\\\\usr\\\\share\\\\wine-browser-installer\\\\fullscreen-close-plugin\",\"mtime\":1366324186891}}}]"); +user_pref("extensions.lastAppVersion", "18.0.1"); +user_pref("extensions.lastPlatformVersion", "18.0.1"); user_pref("extensions.pendingOperations", false); user_pref("extensions.shownSelectionUI", true); +user_pref("gecko.buildID", "20130116073211"); +user_pref("gecko.mstone", "18.0.1"); user_pref("intl.charsetmenu.browser.cache", "UTF-8"); user_pref("network.cookie.prefsMigrated", true); user_pref("places.history.expiration.transient_current_max_pages", 104858); user_pref("privacy.sanitize.migrateFx3Prefs", true); user_pref("signon.rememberSignons", false); -user_pref("toolkit.startup.last_success", 1351705615); +user_pref("toolkit.startup.last_success", 1366324381); user_pref("toolkit.telemetry.prompted", 2); user_pref("toolkit.telemetry.rejected", true); -user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1354219931); +user_pref("urlclassifier.keyupdatetime.https://sb-ssl.google.com/safebrowsing/newkey", 1368916224); user_pref("xpinstall.whitelist.add", ""); +user_pref("xpinstall.whitelist.add.180", ""); user_pref("xpinstall.whitelist.add.36", ""); diff -Nru netflix-desktop-0.6.1~natty/wine-browser-installer/browser-settings.ini netflix-desktop-0.7.0~natty/wine-browser-installer/browser-settings.ini --- netflix-desktop-0.6.1~natty/wine-browser-installer/browser-settings.ini 2012-12-03 20:42:12.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-browser-installer/browser-settings.ini 2013-04-18 21:31:00.000000000 +0000 @@ -2,4 +2,4 @@ QuickLaunchShortcut=false DesktopShortcut=false StartMenuShortcuts=false -; MaintenanceService=false +MaintenanceService=false diff -Nru netflix-desktop-0.6.1~natty/wine-browser-installer/wine-browser netflix-desktop-0.7.0~natty/wine-browser-installer/wine-browser --- netflix-desktop-0.6.1~natty/wine-browser-installer/wine-browser 2013-01-14 21:23:15.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-browser-installer/wine-browser 2013-04-18 22:09:59.000000000 +0000 @@ -1,29 +1,39 @@ #!/bin/sh +# Enable translation capabilities +. gettext.sh +export TEXTDOMAIN="netflix-desktop"; +export TEXTDOMAINDIR="/usr/share/locale"; + +# Overridable environment variables if [ "${PACKAGE}" = "" ]; then PACKAGE="wine-browser-installer"; fi +if [ "${WINEPREFIX}" = "" ]; then + WINEPREFIX="${HOME}/.wine-browser"; +fi +if [ "${URL}" = "" ]; then + URL="http://www.compholio.com/wine-browser/"; +fi +if [ "${SERVICE}" = "" ]; then + SERVICE=$(gettext "On Demand Wine Browser"); +fi +export WINEPREFIX; +# Static environment variables (or based on variables from above) INSTDIR="/usr/share/wine-browser-installer"; -WINE_BROWSER="${HOME}/.wine-browser"; OTHER_SUMS="${INSTDIR}/${PACKAGE}.sha256sums"; -LOCAL_SUMS="${WINE_BROWSER}/wine-browser.sha256sums"; +LOCAL_SUMS="${WINEPREFIX}/wine-browser.sha256sums"; GLOBAL_SUMS="${INSTDIR}/wine-browser-installer.sha256sums"; WINE="/opt/wine-compholio/bin/wine"; SHOWDEBUG="0"; RELAYLOG="0"; - -if [ "${URL}" = "" ]; then - URL="http://www.compholio.com/wine-browser/"; -fi -if [ "${SERVICE}" = "" ]; then - SERVICE=$(gettext "On Demand Wine Browser"); +ALLOW_ADDONS="0"; +SUDO=`which gksudo`; +if [ "${SUDO}" = "" ]; then + SUDO=`which kdesudo`; fi -# Enable translation capabilities -. gettext.sh -export TEXTDOMAIN="netflix-desktop"; -export TEXTDOMAINDIR="/usr/share/locale"; # General strings that are translatable gettext_download_missing=$(eval_gettext "Not all of the components required by \$SERVICE were downloaded, would you like to download them now? (requires an Internet connection and sudo permissions)"); gettext_fonts_needed=$(gettext "MS true type fonts are not properly installed, would you like to download and install them now? (requires an Internet connection and sudo permissions)"); @@ -52,6 +62,9 @@ SHOWDEBUG="1"; RELAYLOG="1"; ;; + --allowaddons) + ALLOW_ADDONS="1"; + ;; *) eval_gettext "Unrecognized command-line argument '\$arg', usage:"; echo; progname=`basename $0`; @@ -60,6 +73,7 @@ gettext "Options:"; echo; echo -n "\t--showdebug\t"; gettext "Show Wine debug output."; echo; echo -n "\t--relaylog\t"; gettext "Collect a Wine '+relay' log."; echo; + echo -n "\t--allowaddons\t"; gettext "Allow Wine Gecko and Wine Mono within the prefix."; echo; exit; ;; esac; @@ -83,17 +97,17 @@ if [ "$RET" -eq "1" ]; then exit; fi - # Use a separate script to download the file (gksudo takes forever to exit each time) - gksudo "${INSTDIR}/download-missing-files" ${PACKAGE} "${SERVICE}"; + # Use a separate script to download the file (graphical sudo takes forever to exit each time) + ${SUDO} "${INSTDIR}/download-missing-files" ${PACKAGE} "${SERVICE}"; fi done # Make sure that the filesystem supports extended file attributes -"${INSTDIR}/test-xattr" "${WINE_BROWSER}"; +"${INSTDIR}/test-xattr" "${WINEPREFIX}"; XATTR="$?"; if [ "${XATTR}" -ne "0" ]; then if [ "${XATTR}" -eq "1" ]; then - MESSAGE=$(eval_gettext "Unable to test extended attributes at location '\${WINE_BROWSER}'."); + MESSAGE=$(eval_gettext "Unable to test extended attributes at location '\${WINEPREFIX}'."); elif [ "${XATTR}" -eq "2" ]; then MESSAGE=$(gettext "It appears that you do not have extended file system attributes enabled, please enable the user_xattr option for your filesystem and try again."); else @@ -120,38 +134,42 @@ if [ "$RET" -eq "1" ]; then exit; fi - gksudo ${INSTDIR}/install-fonts; + ${SUDO} ${INSTDIR}/install-fonts; COREFONTS=`debconf-show ttf-mscorefonts-installer 2>/dev/null | grep "msttcorefonts/accepted-mscorefonts-eula: true"`; if [ "${COREFONTS}" = "" ]; then zenity --warning --title="${SERVICE}" --text "${gettext_fonts_still_needed}"; exit; fi - gksudo -- apt-get install --yes --reinstall ttf-mscorefonts-installer; + ${SUDO} -- apt-get install --yes --reinstall ttf-mscorefonts-installer; fi # Transition over old profiles (from before version 0.6.0) if [ -f "${HOME}/.netflix-desktop/netflix-desktop.sha256sums" ]; then - mv "${HOME}/.netflix-desktop" "${WINE_BROWSER}"; - mv "${WINE_BROWSER}/drive_c/netflix-profile" "${WINE_BROWSER}/drive_c/browser-profile"; - mv "${WINE_BROWSER}/netflix-desktop.sha256sums" "${LOCAL_SUMS}"; - cp -a "${INSTDIR}/browser-profile/extensions" "${WINE_BROWSER}/drive_c/browser-profile/"; + mv "${HOME}/.netflix-desktop" "${WINEPREFIX}"; + mv "${WINEPREFIX}/drive_c/netflix-profile" "${WINEPREFIX}/drive_c/browser-profile"; + mv "${WINEPREFIX}/netflix-desktop.sha256sums" "${LOCAL_SUMS}"; + cp -a "${INSTDIR}/browser-profile/extensions" "${WINEPREFIX}/drive_c/browser-profile/"; fi # Copy over the specially configured user profile if installation has never been performed previously if [ ! -f "${LOCAL_SUMS}" ]; then - mkdir -p "${WINE_BROWSER}/drive_c"; - cp -a "${INSTDIR}/browser-profile" "${WINE_BROWSER}/drive_c/browser-profile"; + mkdir -p "${WINEPREFIX}/drive_c"; + cp -a "${INSTDIR}/browser-profile" "${WINEPREFIX}/drive_c/browser-profile"; +fi + +# Disable installing Mono and Gecko +if [ "${ALLOW_ADDONS}" -eq "1" ]; then + export WINEDLLOVERRIDES="mscoree,mshtml="; fi -export WINEPREFIX="${WINE_BROWSER}"; CLIENT_SIDE_GRAPHICS_WORKAROUND=0; if [ "$(cmp "${LOCAL_SUMS}" "${GLOBAL_SUMS}" > /dev/null; echo $?)" -ne "0" ]; then # If no previous installation has been performed (or new installation packages are available) then install the software we need to the local prefix UPGRADE=0; - TASK="local installation"; + TASK=$(gettext "Performing local installation..."); if [ -f "${LOCAL_SUMS}" ]; then UPGRADE=1; - TASK="profile upgrade"; + TASK=$(gettext "Performing profile upgrade..."); fi ( echo "1"; @@ -159,7 +177,7 @@ ${WINE} "${INSTDIR}/FirefoxSetup.exe" /INI=Z:\\usr\\share\\wine-browser-installer\\browser-settings.ini > /dev/null; ${WINE} "${INSTDIR}/SilverlightSetup.exe" /q /doNotRequireDRMPrompt /noupdate > /dev/null; echo "100"; - ) | zenity --progress --pulsate --no-cancel --auto-close --text="Performing ${TASK}..."; + ) | zenity --progress --pulsate --no-cancel --auto-close --text="${TASK}"; # If not upgrading then make sure the installer fully finishes if [ "${UPGRADE}" -eq "0" ]; then until [ -f "${HOME}/.local/share/applications/wine/Programs/Microsoft Silverlight/Microsoft Silverlight.desktop" ]; do @@ -167,7 +185,7 @@ done; fi # Remove the Silverlight menu shortcut - rm "${WINE_BROWSER}/drive_c/users/ehoover/Start Menu/Programs/Microsoft Silverlight/Microsoft Silverlight.lnk"; + rm "${WINEPREFIX}/drive_c/users/ehoover/Start Menu/Programs/Microsoft Silverlight/Microsoft Silverlight.lnk"; rm "${HOME}/.local/share/applications/wine/Programs/Microsoft Silverlight/Microsoft Silverlight.desktop"; xdg-desktop-menu uninstall "${HOME}/.local/share/applications/wine/Programs/Microsoft Silverlight/Microsoft Silverlight.desktop"; # Install the hash file (indicates whether updates are necessary) @@ -175,20 +193,20 @@ else # If a previous installation exists then confirm that the profile is up-to-date EXTENSION_INSTALLED=0; - if [ -f "${WINE_BROWSER}/profile-settings" ]; then - . "${WINE_BROWSER}/profile-settings"; + if [ -f "${WINEPREFIX}/profile-settings" ]; then + . "${WINEPREFIX}/profile-settings"; fi WINEVERSION=`/opt/wine-compholio/bin/wine --version | sed -e 's/wine-//'`; - OLDVERSION=`cat "${WINE_BROWSER}/wine-version" 2> /dev/null`; + OLDVERSION=`cat "${WINEPREFIX}/wine-version" 2> /dev/null`; NEWWINE=`vercomp "${WINEVERSION}" "1.5.19"`; OLDPROFILE=`vercomp "${OLDVERSION}" "1.5.19"`; # Wipe the DRM folder if we're upgrading to Wine 1.5.19 or newer (new extended attribute format) if [ "${NEWWINE}" -ge "0" ] && [ "${OLDPROFILE}" -lt "0" ]; then - rm -Rf "${WINE_BROWSER}/drive_c/users/Public/Application Data/Microsoft/PlayReady/"*; + rm -Rf "${WINEPREFIX}/drive_c/users/Public/Application Data/Microsoft/PlayReady/"*; fi # Install the new window closing extension if [ "${EXTENSION_INSTALLED}" -ne "1" ]; then - cp -a "${INSTDIR}/browser-profile/extensions" "${WINE_BROWSER}/drive_c/browser-profile/"; + cp -a "${INSTDIR}/browser-profile/extensions" "${WINEPREFIX}/drive_c/browser-profile/"; fi fi # Install the workaround for Wine Bug #31812 @@ -198,11 +216,11 @@ ${WINE} regedit ${tmpfile}; rm ${tmpfile}; fi -echo "${WINEVERSION}" > "${WINE_BROWSER}/wine-version"; +echo "${WINEVERSION}" > "${WINEPREFIX}/wine-version"; echo "# Wine Browser profile settings (do not edit) EXTENSION_INSTALLED=1; CLIENT_SIDE_GRAPHICS_WORKAROUND=1; -" > "${WINE_BROWSER}/profile-settings"; +" > "${WINEPREFIX}/profile-settings"; # Setup our specially prepared profile if [ "${RELAYLOG}" -eq "1" ]; then @@ -226,7 +244,20 @@ echo "################################################################################" 1>>${OUTPUT}; echo "# OpenGL Diagnostics #" 1>>${OUTPUT}; echo "################################################################################" 1>>${OUTPUT}; - glxinfo | grep -e 'direct rendering:' -e 'server glx vendor string:' -e 'server glx version string:' 1>>${OUTPUT}; + GLXINFO=`glxinfo`; + DRENDER=`echo "${GLXINFO}" | grep 'direct rendering:' | sed 's/[^:]*: //'`; + GLVENDOR=`echo "${GLXINFO}" | grep 'server glx vendor string:' | sed 's/[^:]*: //'`; + GLVER=`echo "${GLXINFO}" | grep 'server glx version string:' | sed 's/[^:]*: //'`; + echo "Direct Rendering: ${DRENDER}" 1>>${OUTPUT}; + echo "OpenGL Vendor: ${GLVENDOR}" 1>>${OUTPUT}; + echo "GLX Version: ${GLVER}" 1>>${OUTPUT}; + DRIVERVER=""; + if [ "${GLVENDOR}" = "NVIDIA Corporation" ]; then + DRIVERVER=`nvidia-settings --version | grep version | sed 's/.*version \([^ ]*\) .*/\1/'`; + fi + if [ "${DRIVERVER}" != "" ]; then + echo "Driver Version: ${DRIVERVER}"; + fi echo "################################################################################" 1>>${OUTPUT}; echo "# Firefox #" 1>>${OUTPUT}; echo "################################################################################" 1>>${OUTPUT}; diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0001-server-Create-directories-with-the-specified-securit.patch netflix-desktop-0.7.0~natty/wine-patches/0001-server-Create-directories-with-the-specified-securit.patch --- netflix-desktop-0.6.1~natty/wine-patches/0001-server-Create-directories-with-the-specified-securit.patch 2013-01-18 23:38:48.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0001-server-Create-directories-with-the-specified-securit.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,201 +0,0 @@ -From 40856d277ab60dea2d6f5647036cb794c8cc6249 Mon Sep 17 00:00:00 2001 -From: Erich Hoover -Date: Fri, 18 Jan 2013 16:38:21 -0700 -Subject: server: Create directories with the specified security attributes. - ---- - dlls/kernel32/tests/directory.c | 131 +++++++++++++++++++++++++++++++++++++++ - server/fd.c | 2 +- - server/file.c | 7 ++- - 3 files changed, 138 insertions(+), 2 deletions(-) - -diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c -index 9baae47..0d286d2 100644 ---- a/dlls/kernel32/tests/directory.c -+++ b/dlls/kernel32/tests/directory.c -@@ -24,6 +24,15 @@ - #include "windef.h" - #include "winbase.h" - #include "winerror.h" -+#include "aclapi.h" -+ -+static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, -+ PSID*, PSID*, PACL*, PACL*, -+ PSECURITY_DESCRIPTOR*); -+static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); -+static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); -+static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); -+static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); - - /* If you change something in these tests, please do the same - * for GetSystemDirectory tests. -@@ -486,8 +495,128 @@ static void test_SetCurrentDirectoryA(void) - ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); - } - -+static void test_security_attributes(void) -+{ -+ char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], dacl[100], *user; -+ DWORD sid_size = sizeof(admin_ptr), user_size; -+ PSID admin_sid = (PSID) admin_ptr, user_sid; -+ char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; -+ PSECURITY_DESCRIPTOR pSD = &sd; -+ ACL_SIZE_INFORMATION acl_size; -+ PACL pDacl = (PACL) &dacl; -+ ACCESS_ALLOWED_ACE *ace; -+ SECURITY_ATTRIBUTES sa; -+ char tmpdir[MAX_PATH]; -+ struct _SID *owner; -+ BOOL bret = TRUE; -+ HANDLE token; -+ DWORD error; -+ -+ if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) -+ { -+ win_skip("Required functions are not available\n"); -+ return; -+ } -+ -+ if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) -+ { -+ if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; -+ else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; -+ } -+ if (!bret) -+ { -+ win_skip("Failed to get current user token\n"); -+ return; -+ } -+ bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); -+ ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), -+ "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); -+ user = HeapAlloc(GetProcessHeap(), 0, user_size); -+ bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); -+ ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); -+ CloseHandle( token ); -+ user_sid = ((TOKEN_USER *)user)->User.Sid; -+ -+ sa.nLength = sizeof(sa); -+ sa.lpSecurityDescriptor = pSD; -+ sa.bInheritHandle = TRUE; -+ InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); -+ pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); -+ bret = InitializeAcl(pDacl, sizeof(dacl), ACL_REVISION); -+ ok(bret, "Failed to initialize ACL.\n"); -+ bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, -+ GENERIC_ALL, user_sid); -+ ok(bret, "Failed to add Current User to ACL.\n"); -+ bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, -+ GENERIC_ALL, admin_sid); -+ ok(bret, "Failed to add Administrator Group to ACL.\n"); -+ bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); -+ ok(bret, "Failed to add ACL to security desciptor.\n"); -+ -+ GetTempPathA(MAX_PATH, tmpdir); -+ lstrcatA(tmpdir, "Please Remove Me"); -+ bret = CreateDirectoryA(tmpdir, &sa); -+ ok(bret == TRUE, "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError()); -+ -+ SetLastError(0xdeadbeef); -+ error = pGetNamedSecurityInfoA(tmpdir, SE_FILE_OBJECT, -+ OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, -+ NULL, &pDacl, NULL, &pSD); -+ if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) -+ { -+ win_skip("GetNamedSecurityInfoA is not implemented\n"); -+ goto done; -+ } -+ ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); -+ -+ bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); -+ ok(bret, "GetAclInformation failed\n"); -+ ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", -+ acl_size.AceCount); -+ if (acl_size.AceCount > 0) -+ { -+ bret = pGetAce(pDacl, 0, (VOID **)&ace); -+ ok(bret, "Failed to get Current User ACE.\n"); -+ bret = EqualSid(&ace->SidStart, user_sid); -+ todo_wine ok(bret, "Current User ACE != Current User SID.\n"); -+ ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), -+ "Current User ACE has unexpected flags (0x%x != 0x03)\n", ((ACE_HEADER *)ace)->AceFlags); -+ ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", -+ ace->Mask); -+ } -+ if (acl_size.AceCount > 1) -+ { -+ bret = pGetAce(pDacl, 1, (VOID **)&ace); -+ ok(bret, "Failed to get Administators Group ACE.\n"); -+ bret = EqualSid(&ace->SidStart, admin_sid); -+ todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); -+ ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), -+ "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", ((ACE_HEADER *)ace)->AceFlags); -+ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", -+ ace->Mask); -+ } -+ -+done: -+ HeapFree(GetProcessHeap(), 0, user); -+ bret = RemoveDirectoryA(tmpdir); -+ ok(bret == TRUE, "RemoveDirectoryA should always succeed\n"); -+} -+ -+void init(void) -+{ -+ HMODULE hmod = GetModuleHandle("advapi32.dll"); -+ -+ pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); -+ pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); -+ pCreateWellKnownSid = (void *)GetProcAddress(hmod, "CreateWellKnownSid"); -+ pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); -+ pGetAce = (void *)GetProcAddress(hmod, "GetAce"); -+} -+ - START_TEST(directory) - { -+ init(); -+ - test_GetWindowsDirectoryA(); - test_GetWindowsDirectoryW(); - -@@ -501,4 +630,6 @@ START_TEST(directory) - test_RemoveDirectoryW(); - - test_SetCurrentDirectoryA(); -+ -+ test_security_attributes(); - } -diff --git a/server/fd.c b/server/fd.c -index f3e42bd..248f15a 100644 ---- a/server/fd.c -+++ b/server/fd.c -@@ -1765,7 +1765,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, - /* create the directory if needed */ - if ((options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) - { -- if (mkdir( name, 0777 ) == -1) -+ if (mkdir( name, *mode ) == -1) - { - if (errno != EEXIST || (flags & O_EXCL)) - { -diff --git a/server/file.c b/server/file.c -index 02a1e37..3a8c964 100644 ---- a/server/file.c -+++ b/server/file.c -@@ -219,7 +219,12 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si - mode = sd_to_mode( sd, owner ); - } - else -- mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; -+ { -+ if (options & FILE_NON_DIRECTORY_FILE) -+ mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; -+ else -+ mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777; -+ } - - if (len >= 4 && - (!strcasecmp( name + len - 4, ".exe" ) || !strcasecmp( name + len - 4, ".com" ))) --- -1.7.9.5 - diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0001-user32-SetTimer-should-respect-the-minimum-and-maxim.patch netflix-desktop-0.7.0~natty/wine-patches/0001-user32-SetTimer-should-respect-the-minimum-and-maxim.patch --- netflix-desktop-0.6.1~natty/wine-patches/0001-user32-SetTimer-should-respect-the-minimum-and-maxim.patch 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0001-user32-SetTimer-should-respect-the-minimum-and-maxim.patch 2013-04-13 02:21:09.000000000 +0000 @@ -0,0 +1,85 @@ +From 39a3a20cd08a72f7288907ac427167782288212e Mon Sep 17 00:00:00 2001 +From: Erich Hoover +Date: Fri, 12 Apr 2013 20:20:30 -0600 +Subject: user32: SetTimer should respect the minimum and maximum timeout + limits. + +--- + dlls/user32/message.c | 7 ++++++- + dlls/user32/tests/msg.c | 14 ++++++++++++++ + include/winuser.h | 4 ++++ + 3 files changed, 24 insertions(+), 1 deletion(-) + +diff --git a/dlls/user32/message.c b/dlls/user32/message.c +index 09a4cb3..339d552 100644 +--- a/dlls/user32/message.c ++++ b/dlls/user32/message.c +@@ -4385,12 +4385,17 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) + + if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); + ++ if (timeout < USER_TIMER_MINIMUM) ++ timeout = USER_TIMER_MINIMUM; ++ else if (timeout > USER_TIMER_MAXIMUM) ++ timeout = USER_TIMER_MAXIMUM; ++ + SERVER_START_REQ( set_win_timer ) + { + req->win = wine_server_user_handle( hwnd ); + req->msg = WM_TIMER; + req->id = id; +- req->rate = max( timeout, SYS_TIMER_RATE ); ++ req->rate = timeout; + req->lparam = (ULONG_PTR)winproc; + if (!wine_server_call_err( req )) + { +diff --git a/dlls/user32/tests/msg.c b/dlls/user32/tests/msg.c +index ac3ba16..57c0fa3 100644 +--- a/dlls/user32/tests/msg.c ++++ b/dlls/user32/tests/msg.c +@@ -8215,6 +8215,7 @@ static VOID CALLBACK callback_count( + static void test_timers_no_wnd(void) + { + UINT_PTR id, id2; ++ DWORD start; + MSG msg; + + count = 0; +@@ -8232,6 +8233,19 @@ static void test_timers_no_wnd(void) + Sleep(250); + while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); + ok(count == 1, "killing replaced timer did not work (%i).\n", count); ++ ++ /* Check the minimum allowed timeout for a timer. MSDN indicates that it should be 10.0 ms, ++ * but testing indicates that the minimum timeout is actually about 15.6 ms. Since there is ++ * some measurement error between test runs we're allowing for ±8 counts (~2 ms). ++ */ ++ count = 0; ++ id = SetTimer(NULL, 0, 0, callback_count); ++ ok(id != 0, "did not get id from SetTimer.\n"); ++ start = GetTickCount(); ++ while (GetTickCount()-start < 1001) ++ while (PeekMessage(&msg, NULL, 0, 0, PM_REMOVE)) DispatchMessage(&msg); ++ ok(abs(count-64) < 9, "did not get expected count for minimum timeout (%i != ~64).\n", count); ++ KillTimer(NULL, id); + } + + /* Various win events with arbitrary parameters */ +diff --git a/include/winuser.h b/include/winuser.h +index 59d5b8e..296a2a4 100644 +--- a/include/winuser.h ++++ b/include/winuser.h +@@ -2521,6 +2521,10 @@ typedef struct tagMINIMIZEDMETRICS { + #define PM_QS_PAINT (QS_PAINT << 16) + #define PM_QS_SENDMESSAGE (QS_SENDMESSAGE << 16) + ++/* SetTimer() limits */ ++#define USER_TIMER_MINIMUM 0x0000000F ++#define USER_TIMER_MAXIMUM 0x7FFFFFFF ++ + /* AnimateWindow() flags */ + #define AW_SLIDE 0x00040000 + #define AW_ACTIVATE 0x00020000 +-- +1.7.9.5 + diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0002-server-Store-and-return-security-attributes-with-ext.patch netflix-desktop-0.7.0~natty/wine-patches/0002-server-Store-and-return-security-attributes-with-ext.patch --- netflix-desktop-0.6.1~natty/wine-patches/0002-server-Store-and-return-security-attributes-with-ext.patch 2013-01-18 23:38:48.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0002-server-Store-and-return-security-attributes-with-ext.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,480 +0,0 @@ -From be6cc7e4522f8a55704957c860159f896dacf517 Mon Sep 17 00:00:00 2001 -From: Erich Hoover -Date: Fri, 18 Jan 2013 16:38:25 -0700 -Subject: server: Store and return security attributes with extended file - attributes. - ---- - configure.ac | 1 + - dlls/advapi32/tests/security.c | 9 +- - dlls/kernel32/tests/directory.c | 4 +- - server/change.c | 11 ++- - server/fd.c | 68 ++++++++++++++- - server/file.c | 176 ++++++++++++++++++++++++++++++++++++++- - server/file.h | 5 +- - 7 files changed, 258 insertions(+), 16 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fd760cf..c08d578 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -417,6 +417,7 @@ AC_CHECK_HEADERS(\ - arpa/inet.h \ - arpa/nameser.h \ - asm/types.h \ -+ attr/xattr.h \ - capi20.h \ - curses.h \ - direct.h \ -diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c -index 0e0730f..1e1aeab 100644 ---- a/dlls/advapi32/tests/security.c -+++ b/dlls/advapi32/tests/security.c -@@ -3156,7 +3156,7 @@ static void test_GetNamedSecurityInfoA(void) - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); -- todo_wine ok(bret, "Current User ACE != Current User SID.\n"); -+ ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == 0, - "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", -@@ -3167,8 +3167,7 @@ static void test_GetNamedSecurityInfoA(void) - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); -- todo_wine ok(bret || broken(!bret) /* win2k */, -- "Administators Group ACE != Administators Group SID.\n"); -+ ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == 0, - "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, -@@ -3749,7 +3748,7 @@ static void test_GetSecurityInfo(void) - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); -- todo_wine ok(bret, "Current User ACE != Current User SID.\n"); -+ ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == 0, - "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", -@@ -3760,7 +3759,7 @@ static void test_GetSecurityInfo(void) - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); -- todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); -+ ok(bret, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == 0, - "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", -diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c -index 0d286d2..99d8fd1 100644 ---- a/dlls/kernel32/tests/directory.c -+++ b/dlls/kernel32/tests/directory.c -@@ -578,7 +578,7 @@ static void test_security_attributes(void) - bret = pGetAce(pDacl, 0, (VOID **)&ace); - ok(bret, "Failed to get Current User ACE.\n"); - bret = EqualSid(&ace->SidStart, user_sid); -- todo_wine ok(bret, "Current User ACE != Current User SID.\n"); -+ ok(bret, "Current User ACE != Current User SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Current User ACE has unexpected flags (0x%x != 0x03)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", -@@ -589,7 +589,7 @@ static void test_security_attributes(void) - bret = pGetAce(pDacl, 1, (VOID **)&ace); - ok(bret, "Failed to get Administators Group ACE.\n"); - bret = EqualSid(&ace->SidStart, admin_sid); -- todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); -+ ok(bret, "Administators Group ACE != Administators Group SID.\n"); - ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), - "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", ((ACE_HEADER *)ace)->AceFlags); - ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", -diff --git a/server/change.c b/server/change.c -index f6d56b0..022c780 100644 ---- a/server/change.c -+++ b/server/change.c -@@ -286,6 +286,7 @@ static int get_dir_unix_fd( struct dir *dir ) - static struct security_descriptor *dir_get_sd( struct object *obj ) - { - struct dir *dir = (struct dir *)obj; -+ const SID *user, *group; - int unix_fd; - struct stat st; - struct security_descriptor *sd; -@@ -302,9 +303,11 @@ static struct security_descriptor *dir_get_sd( struct object *obj ) - (st.st_uid == dir->uid)) - return obj->sd; - -- sd = mode_to_sd( st.st_mode, -- security_unix_uid_to_sid( st.st_uid ), -- token_get_primary_group( current->process->token )); -+ user = security_unix_uid_to_sid( st.st_uid ); -+ group = token_get_primary_group( current->process->token ); -+ sd = get_file_acls( unix_fd, user, group ); -+ if (!sd) -+ sd = mode_to_sd( st.st_mode, user, group ); - if (!sd) return obj->sd; - - dir->mode = st.st_mode; -@@ -353,6 +356,8 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, - mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); - mode |= sd_to_mode( sd, owner ); - -+ set_file_acls( unix_fd, sd ); -+ - if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) - { - file_set_error(); -diff --git a/server/fd.c b/server/fd.c -index 248f15a..687d4a9 100644 ---- a/server/fd.c -+++ b/server/fd.c -@@ -88,6 +88,9 @@ - #include - #include - #include -+#ifdef HAVE_ATTR_XATTR_H -+#include -+#endif - - #include "ntstatus.h" - #define WIN32_NO_STATUS -@@ -96,6 +99,7 @@ - #include "handle.h" - #include "process.h" - #include "request.h" -+#include "security.h" - - #include "winternl.h" - #include "winioctl.h" -@@ -1723,9 +1727,69 @@ static char *dup_fd_name( struct fd *root, const char *name ) - return ret; - } - -+void set_file_acls( int fd, const struct security_descriptor *sd ) -+{ -+#ifdef HAVE_ATTR_XATTR_H -+ char buffer[XATTR_SIZE_MAX], *p = buffer; -+ const ACE_HEADER *ace; -+ int present, i, j, n; -+ const ACL *dacl; -+ -+ if (!sd) return; -+ dacl = sd_get_dacl( sd, &present ); -+ if (!present || !dacl) return; -+ ace = (const ACE_HEADER *)(dacl + 1); -+ -+ for (i = 0; i < dacl->AceCount; i++, ace = ace_next( ace )) -+ { -+ BYTE type = ace->AceType, flags; -+ const ACCESS_ALLOWED_ACE *aaa; -+ const ACCESS_DENIED_ACE *ada; -+ char sidtxt[100], *s; -+ const SID *sid; -+ DWORD mask; -+ -+ if (type & INHERIT_ONLY_ACE) continue; -+ -+ switch (type) -+ { -+ case ACCESS_DENIED_ACE_TYPE: -+ ada = (const ACCESS_DENIED_ACE *)ace; -+ flags = ada->Header.AceFlags; -+ mask = ada->Mask; -+ sid = (const SID *)&ada->SidStart; -+ break; -+ case ACCESS_ALLOWED_ACE_TYPE: -+ aaa = (const ACCESS_ALLOWED_ACE *)ace; -+ flags = aaa->Header.AceFlags; -+ mask = aaa->Mask; -+ sid = (const SID *)&aaa->SidStart; -+ break; -+ default: -+ continue; -+ } -+ n = sprintf( sidtxt, "S-%u-%d", sid->Revision, -+ MAKELONG( -+ MAKEWORD( sid->IdentifierAuthority.Value[5], -+ sid->IdentifierAuthority.Value[4] ), -+ MAKEWORD( sid->IdentifierAuthority.Value[3], -+ sid->IdentifierAuthority.Value[2] ) -+ ) ); -+ s = sidtxt + n; -+ for( j=0; jSubAuthorityCount; j++ ) -+ s += sprintf( s, "-%u", sid->SubAuthority[j] ); -+ -+ p += snprintf( p, XATTR_SIZE_MAX-(p-buffer), "%s%x,%x,%x,%s", -+ (p != buffer ? ";" : ""), type, flags, mask, sidtxt ); -+ } -+ -+ fsetxattr( fd, "user.wine.acl", buffer, p-buffer, 0 ); -+#endif -+} -+ - /* open() wrapper that returns a struct fd with no fd user set */ - struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, unsigned int access, -- unsigned int sharing, unsigned int options ) -+ unsigned int sharing, unsigned int options, const struct security_descriptor *sd ) - { - struct stat st; - struct closed_fd *closed_fd; -@@ -1801,6 +1865,8 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, - } - } - -+ set_file_acls( fd->unix_fd, sd ); -+ - closed_fd->unix_fd = fd->unix_fd; - closed_fd->unlink[0] = 0; - fstat( fd->unix_fd, &st ); -diff --git a/server/file.c b/server/file.c -index 3a8c964..3fd1f42 100644 ---- a/server/file.c -+++ b/server/file.c -@@ -32,6 +32,7 @@ - #include - #include - #include -+#include - #include - #ifdef HAVE_UTIME_H - #include -@@ -39,6 +40,9 @@ - #ifdef HAVE_POLL_H - #include - #endif -+#ifdef HAVE_ATTR_XATTR_H -+#include -+#endif - - #include "ntstatus.h" - #define WIN32_NO_STATUS -@@ -240,7 +244,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si - access = generic_file_map_access( access ); - - /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ -- fd = open_fd( root, name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); -+ fd = open_fd( root, name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options, sd ); - if (!fd) goto done; - - if (S_ISDIR(mode)) -@@ -435,9 +439,169 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID - return sd; - } - -+struct security_descriptor *get_file_acls( int fd, const SID *user, const SID *group ) -+{ -+#ifdef HAVE_ATTR_XATTR_H -+ int ace_count = 0, dacl_size = sizeof(ACL), i, n; -+ char buffer[XATTR_SIZE_MAX], *p = buffer, *pn; -+ struct security_descriptor *sd; -+ ACE_HEADER *current_ace; -+ ACCESS_ALLOWED_ACE *aaa; -+ ACCESS_DENIED_ACE *ada; -+ int type, flags, mask; -+ ACL *dacl; -+ char *ptr; -+ -+ n = fgetxattr( fd, "user.wine.acl", buffer, sizeof(buffer) ); -+ if (n == -1) return NULL; -+ buffer[n] = 0; -+ -+ do -+ { -+ int sub_authority_count = 0; -+ -+ pn = strchr(p, ';'); -+ if (pn) pn++; -+ sscanf(p, "%x", &type); -+ do -+ { -+ p = strchr(p, '-'); -+ if (p) p++; -+ sub_authority_count++; -+ } -+ while(p && (!pn || p < pn)); -+ sub_authority_count -= 3; /* Revision and IdentifierAuthority don't count */ -+ -+ switch (type) -+ { -+ case ACCESS_DENIED_ACE_TYPE: -+ dacl_size += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + -+ FIELD_OFFSET(SID, SubAuthority[sub_authority_count]); -+ break; -+ case ACCESS_ALLOWED_ACE_TYPE: -+ dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + -+ FIELD_OFFSET(SID, SubAuthority[sub_authority_count]); -+ break; -+ default: -+ continue; -+ } -+ ace_count++; -+ p = pn; -+ } -+ while(p); -+ -+ sd = mem_alloc( sizeof(struct security_descriptor) + -+ FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) + -+ FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]) + -+ dacl_size ); -+ -+ sd->control = SE_DACL_PRESENT; -+ sd->owner_len = FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); -+ sd->group_len = FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]); -+ sd->sacl_len = 0; -+ sd->dacl_len = dacl_size; -+ -+ ptr = (char *)(sd + 1); -+ memcpy( ptr, user, sd->owner_len ); -+ ptr += sd->owner_len; -+ memcpy( ptr, group, sd->group_len ); -+ ptr += sd->group_len; -+ -+ dacl = (ACL *)ptr; -+ dacl->AclRevision = ACL_REVISION; -+ dacl->Sbz1 = 0; -+ dacl->AclSize = dacl_size; -+ dacl->AceCount = ace_count; -+ dacl->Sbz2 = 0; -+ aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); -+ current_ace = &aaa->Header; -+ -+ p = buffer; -+ for(i=0; iHeader; -+ } -+ pn = strchr(p, ';'); -+ if (pn) pn++; -+ sscanf(p, "%x,%x,%x,%[^;]", &type, &flags, &mask, sidtxt); -+ sscanf(sidtxt, "S-%u-%d", &rev, &ia); -+ sid->Revision = rev; -+ sid->IdentifierAuthority.Value[0] = 0; -+ sid->IdentifierAuthority.Value[1] = 0; -+ sid->IdentifierAuthority.Value[2] = HIBYTE(HIWORD(ia)); -+ sid->IdentifierAuthority.Value[3] = LOBYTE(HIWORD(ia)); -+ sid->IdentifierAuthority.Value[4] = HIBYTE(LOWORD(ia)); -+ sid->IdentifierAuthority.Value[5] = LOBYTE(LOWORD(ia)); -+ p = strchr(sidtxt, '-')+1; -+ p = strchr(p, '-')+1; /* Revision doesn't count */ -+ p = strchr(p, '-')+1; /* IdentifierAuthority doesn't count */ -+ do -+ { -+ sscanf(p, "%u", &sa); -+ sid->SubAuthority[sub_authority_count] = sa; -+ p = strchr(p, '-'); -+ if (p) p++; -+ sub_authority_count++; -+ } -+ while(p); -+ sid->SubAuthorityCount = sub_authority_count; -+ -+ /* Convert generic rights into standard access rights */ -+ if (mask & GENERIC_ALL) -+ mask |= WRITE_DAC | WRITE_OWNER | DELETE | FILE_DELETE_CHILD; -+ if (mask & (GENERIC_ALL|GENERIC_READ)) -+ mask |= FILE_GENERIC_READ; -+ if (mask & (GENERIC_ALL|GENERIC_WRITE)) -+ mask |= FILE_GENERIC_WRITE; -+ if (mask & (GENERIC_ALL|GENERIC_EXECUTE)) -+ mask |= FILE_GENERIC_EXECUTE; -+ mask &= 0x0FFFFFFF; -+ -+ /* Handle the specific ACE */ -+ switch (type) -+ { -+ case ACCESS_DENIED_ACE_TYPE: -+ ada = (ACCESS_DENIED_ACE *)aaa; -+ ada->Header.AceType = type; -+ ada->Header.AceFlags = flags; -+ ada->Header.AceSize = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + -+ FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]); -+ ada->Mask = mask; -+ memcpy( &ada->SidStart, sid, FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) ); -+ break; -+ case ACCESS_ALLOWED_ACE_TYPE: -+ aaa->Header.AceType = type; -+ aaa->Header.AceFlags = flags; -+ aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + -+ FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]); -+ aaa->Mask = mask; -+ memcpy( &aaa->SidStart, sid, FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) ); -+ break; -+ default: -+ continue; -+ } -+ p = pn; -+ } -+ -+ return sd; -+#else -+ return NULL; -+#endif -+} -+ - static struct security_descriptor *file_get_sd( struct object *obj ) - { - struct file *file = (struct file *)obj; -+ const SID *user, *group; - struct stat st; - int unix_fd; - struct security_descriptor *sd; -@@ -454,9 +618,11 @@ static struct security_descriptor *file_get_sd( struct object *obj ) - (st.st_uid == file->uid)) - return obj->sd; - -- sd = mode_to_sd( st.st_mode, -- security_unix_uid_to_sid( st.st_uid ), -- token_get_primary_group( current->process->token )); -+ user = security_unix_uid_to_sid( st.st_uid ); -+ group = token_get_primary_group( current->process->token ); -+ sd = get_file_acls( unix_fd, user, group ); -+ if (!sd) -+ sd = mode_to_sd( st.st_mode, user, group); - if (!sd) return obj->sd; - - file->mode = st.st_mode; -@@ -586,6 +752,8 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd - mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); - mode |= sd_to_mode( sd, owner ); - -+ set_file_acls( unix_fd, sd ); -+ - if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) - { - file_set_error(); -diff --git a/server/file.h b/server/file.h -index ead356d..77737e8 100644 ---- a/server/file.h -+++ b/server/file.h -@@ -56,7 +56,8 @@ extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct obje - unsigned int options ); - extern void set_no_fd_status( struct fd *fd, unsigned int status ); - extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, -- unsigned int access, unsigned int sharing, unsigned int options ); -+ unsigned int access, unsigned int sharing, unsigned int options, -+ const struct security_descriptor *sd ); - extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, - int unix_fd, struct object *user, unsigned int options ); - extern struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, -@@ -122,6 +123,8 @@ extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, - extern void file_set_error(void); - extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); - extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); -+extern void set_file_acls( int fd, const struct security_descriptor *sd ); -+extern struct security_descriptor *get_file_acls( int fd, const SID *user, const SID *group ); - - /* file mapping functions */ - --- -1.7.9.5 - diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0002-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch netflix-desktop-0.7.0~natty/wine-patches/0002-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch --- netflix-desktop-0.6.1~natty/wine-patches/0002-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0002-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch 2013-04-13 02:21:09.000000000 +0000 @@ -0,0 +1,39 @@ +From ede95b89d4705b60c088d112ea0ccf1bc2821ac6 Mon Sep 17 00:00:00 2001 +From: Erich Hoover +Date: Fri, 12 Apr 2013 20:20:45 -0600 +Subject: ws2_32: Implement SIO_ADDRESS_LIST_CHANGE with NotifyAddrChange. + +--- + dlls/ws2_32/socket.c | 15 ++++++++++++--- + 1 file changed, 12 insertions(+), 3 deletions(-) + +diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c +index a6a1b4c..28e7396 100644 +--- a/dlls/ws2_32/socket.c ++++ b/dlls/ws2_32/socket.c +@@ -3403,10 +3403,19 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID + } + + case WS_SIO_ADDRESS_LIST_CHANGE: +- FIXME("-> SIO_ADDRESS_LIST_CHANGE request: stub\n"); +- /* FIXME: error and return code depend on whether socket was created +- * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */ ++ { ++ BOOL is_blocking; ++ HANDLE handle; ++ ++ TRACE("-> SIO_ADDRESS_LIST_CHANGE request\n"); ++ ++ if (overlapped || (_is_blocking( s, &is_blocking ) && is_blocking)) ++ status = NotifyAddrChange(&handle, overlapped); ++ else ++ status = WSAEWOULDBLOCK; ++ overlapped = NULL; /* managed by NotifyAddrChange */ + break; ++ } + + case WS_SIO_ADDRESS_LIST_QUERY: + { +-- +1.7.9.5 + diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0003-ntdll-Inherit-security-attributes-from-parent-direct.patch netflix-desktop-0.7.0~natty/wine-patches/0003-ntdll-Inherit-security-attributes-from-parent-direct.patch --- netflix-desktop-0.6.1~natty/wine-patches/0003-ntdll-Inherit-security-attributes-from-parent-direct.patch 2013-01-18 23:38:48.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0003-ntdll-Inherit-security-attributes-from-parent-direct.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,180 +0,0 @@ -From d25ee3cfc648a0c999ef16c78d677939eef5845f Mon Sep 17 00:00:00 2001 -From: Erich Hoover -Date: Fri, 18 Jan 2013 16:38:30 -0700 -Subject: ntdll: Inherit security attributes from parent directories. - ---- - dlls/kernel32/tests/directory.c | 40 +++++++++++++++++- - dlls/ntdll/file.c | 85 ++++++++++++++++++++++++++++++++++++++- - 2 files changed, 123 insertions(+), 2 deletions(-) - -diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c -index 99d8fd1..73fb857 100644 ---- a/dlls/kernel32/tests/directory.c -+++ b/dlls/kernel32/tests/directory.c -@@ -506,10 +506,11 @@ static void test_security_attributes(void) - PACL pDacl = (PACL) &dacl; - ACCESS_ALLOWED_ACE *ace; - SECURITY_ATTRIBUTES sa; -+ char tmpfile[MAX_PATH]; - char tmpdir[MAX_PATH]; -+ HANDLE token, hTemp; - struct _SID *owner; - BOOL bret = TRUE; -- HANDLE token; - DWORD error; - - if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) -@@ -596,6 +597,43 @@ static void test_security_attributes(void) - ace->Mask); - } - -+ /* Test inheritance of ACLs */ -+ strcpy(tmpfile, tmpdir); -+ lstrcatA(tmpfile, "/tmpfile"); -+ hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, -+ FILE_FLAG_DELETE_ON_CLOSE, NULL); -+ error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, -+ OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, -+ NULL, &pDacl, NULL, &pSD); -+ ok(error == ERROR_SUCCESS, "Failed to get permissions on file.\n"); -+ bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); -+ ok(bret, "GetAclInformation failed\n"); -+ ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", -+ acl_size.AceCount); -+ if (acl_size.AceCount > 0) -+ { -+ bret = pGetAce(pDacl, 0, (VOID **)&ace); -+ ok(bret, "Inherited Failed to get Current User ACE.\n"); -+ bret = EqualSid(&ace->SidStart, user_sid); -+ ok(bret, "Inherited Current User ACE != Current User SID.\n"); -+ ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, -+ "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); -+ ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", -+ ace->Mask); -+ } -+ if (acl_size.AceCount > 1) -+ { -+ bret = pGetAce(pDacl, 1, (VOID **)&ace); -+ ok(bret, "Inherited Failed to get Administators Group ACE.\n"); -+ bret = EqualSid(&ace->SidStart, admin_sid); -+ ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); -+ ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, -+ "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); -+ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", -+ ace->Mask); -+ } -+ CloseHandle(hTemp); -+ - done: - HeapFree(GetProcessHeap(), 0, user); - bret = RemoveDirectoryA(tmpdir); -diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c -index 791570e..2ed28dc 100644 ---- a/dlls/ntdll/file.c -+++ b/dlls/ntdll/file.c -@@ -93,6 +93,81 @@ mode_t FILE_umask = 0; - #define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY) - - -+static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIBUTES attr, -+ PIO_STATUS_BLOCK io, PLARGE_INTEGER alloc_size, -+ ULONG attributes, ULONG sharing, ULONG disposition, -+ ULONG options, PVOID ea_buffer, ULONG ea_length ); -+ -+struct security_descriptor *FILE_get_parent_sd(UNICODE_STRING *filenameW) -+{ -+ SECURITY_INFORMATION info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION -+ |DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION; -+ PSECURITY_DESCRIPTOR parentsd = NULL; -+ ACL_SIZE_INFORMATION acl_size; -+ BOOLEAN present, defaulted; -+ WCHAR *p, parent[MAX_PATH]; -+ OBJECT_ATTRIBUTES pattr; -+ UNICODE_STRING parentW; -+ IO_STATUS_BLOCK io; -+ NTSTATUS status; -+ HANDLE hparent; -+ ULONG n1, n2; -+ PACL pDacl; -+ int i; -+ -+ parentW.Buffer = parent; -+ parentW.Length = filenameW->Length; -+ memcpy(parentW.Buffer, filenameW->Buffer, filenameW->Length); -+ if ((p = strrchrW(parent, '\\')) != NULL) -+ { -+ p[0] = 0; -+ parentW.Length = (p-parent)*sizeof(WCHAR); -+ } -+ memset(&pattr, 0x0, sizeof(pattr)); -+ pattr.Length = sizeof(pattr); -+ pattr.Attributes = OBJ_CASE_INSENSITIVE; -+ pattr.ObjectName = &parentW; -+ status = FILE_CreateFile( &hparent, READ_CONTROL|ACCESS_SYSTEM_SECURITY, &pattr, &io, NULL, -+ FILE_FLAG_BACKUP_SEMANTICS, -+ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, -+ FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); -+ if (status == STATUS_SUCCESS) -+ status = NtQuerySecurityObject( hparent, info, NULL, 0, &n1 ); -+ if (status == STATUS_BUFFER_TOO_SMALL && (parentsd = RtlAllocateHeap( GetProcessHeap(), 0, n1 )) != NULL) -+ status = NtQuerySecurityObject( hparent, info, parentsd, n1, &n2 ); -+ if (status == STATUS_SUCCESS) -+ status = NtQuerySecurityObject( hparent, info, parentsd, n1, &n2 ); -+ if (hparent != INVALID_HANDLE_VALUE) -+ NtClose( hparent ); -+ if (status != STATUS_SUCCESS) return NULL; -+ status = RtlGetDaclSecurityDescriptor(parentsd, &present, &pDacl, &defaulted); -+ if (status != STATUS_SUCCESS || !present) return NULL; -+ status = RtlQueryInformationAcl(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); -+ if (status != STATUS_SUCCESS) return NULL; -+ -+ for (i=acl_size.AceCount-1; i>=0; i--) -+ { -+ DWORD inheritance_mask = INHERIT_ONLY_ACE|OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE; -+ ACE_HEADER *ace; -+ -+ status = RtlGetAce(pDacl, i, (VOID **)&ace); -+ if (status != STATUS_SUCCESS || !(ace->AceFlags & inheritance_mask)) -+ { -+ RtlDeleteAce(pDacl, i); -+ acl_size.AceCount--; -+ } -+ else -+ ace->AceFlags = (ace->AceFlags & ~inheritance_mask) | INHERITED_ACE; -+ } -+ -+ if (!acl_size.AceCount) -+ { -+ return NULL; -+ } -+ return parentsd; -+} -+ -+ - /************************************************************************** - * FILE_CreateFile (internal) - * Open a file. -@@ -151,10 +226,18 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT - { - struct security_descriptor *sd; - struct object_attributes objattr; -+ PSECURITY_DESCRIPTOR parentsd = NULL, psd; - - objattr.rootdir = wine_server_obj_handle( attr->RootDirectory ); - objattr.name_len = 0; -- io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); -+ psd = attr->SecurityDescriptor; -+ if (!psd && (disposition == FILE_CREATE||disposition == FILE_OVERWRITE_IF)) -+ parentsd = FILE_get_parent_sd( attr->ObjectName ); -+ if (parentsd) -+ psd = parentsd; -+ io->u.Status = NTDLL_create_struct_sd( psd, &sd, &objattr.sd_len ); -+ if (parentsd) -+ RtlFreeHeap( GetProcessHeap(), 0, parentsd ); - if (io->u.Status != STATUS_SUCCESS) - { - RtlFreeAnsiString( &unix_name ); --- -1.7.9.5 - diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0003-server-Create-directories-with-the-specified-securit.patch netflix-desktop-0.7.0~natty/wine-patches/0003-server-Create-directories-with-the-specified-securit.patch --- netflix-desktop-0.6.1~natty/wine-patches/0003-server-Create-directories-with-the-specified-securit.patch 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0003-server-Create-directories-with-the-specified-securit.patch 2013-04-13 02:21:09.000000000 +0000 @@ -0,0 +1,205 @@ +From c26fca95d054a4a7a89a8b38a4acacacf005da06 Mon Sep 17 00:00:00 2001 +From: Erich Hoover +Date: Fri, 12 Apr 2013 20:20:49 -0600 +Subject: server: Create directories with the specified security attributes. + +--- + dlls/kernel32/tests/directory.c | 135 +++++++++++++++++++++++++++++++++++++++ + server/fd.c | 2 +- + server/file.c | 7 +- + 3 files changed, 142 insertions(+), 2 deletions(-) + +diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c +index 9baae47..df434b6 100644 +--- a/dlls/kernel32/tests/directory.c ++++ b/dlls/kernel32/tests/directory.c +@@ -24,6 +24,15 @@ + #include "windef.h" + #include "winbase.h" + #include "winerror.h" ++#include "aclapi.h" ++ ++static DWORD (WINAPI *pGetNamedSecurityInfoA)(LPSTR, SE_OBJECT_TYPE, SECURITY_INFORMATION, ++ PSID*, PSID*, PACL*, PACL*, ++ PSECURITY_DESCRIPTOR*); ++static BOOL (WINAPI *pGetAclInformation)(PACL,LPVOID,DWORD,ACL_INFORMATION_CLASS); ++static BOOL (WINAPI *pCreateWellKnownSid)(WELL_KNOWN_SID_TYPE,PSID,PSID,DWORD*); ++static BOOL (WINAPI *pAddAccessAllowedAceEx)(PACL, DWORD, DWORD, DWORD, PSID); ++static BOOL (WINAPI *pGetAce)(PACL,DWORD,LPVOID*); + + /* If you change something in these tests, please do the same + * for GetSystemDirectory tests. +@@ -486,8 +495,132 @@ static void test_SetCurrentDirectoryA(void) + ok( GetLastError() == ERROR_PATH_NOT_FOUND, "wrong error %d\n", GetLastError() ); + } + ++static void test_security_attributes(void) ++{ ++ char admin_ptr[sizeof(SID)+sizeof(ULONG)*SID_MAX_SUB_AUTHORITIES], *user; ++ DWORD sid_size = sizeof(admin_ptr), user_size; ++ PSID admin_sid = (PSID) admin_ptr, user_sid; ++ char sd[SECURITY_DESCRIPTOR_MIN_LENGTH]; ++ PSECURITY_DESCRIPTOR pSD = &sd; ++ ACL_SIZE_INFORMATION acl_size; ++ ACCESS_ALLOWED_ACE *ace; ++ SECURITY_ATTRIBUTES sa; ++ char tmpdir[MAX_PATH]; ++ struct _SID *owner; ++ BOOL bret = TRUE; ++ HANDLE token; ++ DWORD error; ++ PACL pDacl; ++ ++ if (!pGetNamedSecurityInfoA || !pCreateWellKnownSid) ++ { ++ win_skip("Required functions are not available\n"); ++ return; ++ } ++ ++ if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token)) ++ { ++ if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE; ++ else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE; ++ } ++ if (!bret) ++ { ++ win_skip("Failed to get current user token\n"); ++ return; ++ } ++ bret = GetTokenInformation(token, TokenUser, NULL, 0, &user_size); ++ ok(!bret && (GetLastError() == ERROR_INSUFFICIENT_BUFFER), ++ "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); ++ user = HeapAlloc(GetProcessHeap(), 0, user_size); ++ bret = GetTokenInformation(token, TokenUser, user, user_size, &user_size); ++ ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError()); ++ CloseHandle( token ); ++ user_sid = ((TOKEN_USER *)user)->User.Sid; ++ ++ sa.nLength = sizeof(sa); ++ sa.lpSecurityDescriptor = pSD; ++ sa.bInheritHandle = TRUE; ++ InitializeSecurityDescriptor(pSD, SECURITY_DESCRIPTOR_REVISION); ++ pCreateWellKnownSid(WinBuiltinAdministratorsSid, NULL, admin_sid, &sid_size); ++ pDacl = HeapAlloc(GetProcessHeap(), 0, 100); ++ bret = InitializeAcl(pDacl, 100, ACL_REVISION); ++ ok(bret, "Failed to initialize ACL.\n"); ++ bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, ++ GENERIC_ALL, user_sid); ++ ok(bret, "Failed to add Current User to ACL.\n"); ++ bret = pAddAccessAllowedAceEx(pDacl, ACL_REVISION, OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE, ++ GENERIC_ALL, admin_sid); ++ ok(bret, "Failed to add Administrator Group to ACL.\n"); ++ bret = SetSecurityDescriptorDacl(pSD, TRUE, pDacl, FALSE); ++ ok(bret, "Failed to add ACL to security desciptor.\n"); ++ ++ GetTempPathA(MAX_PATH, tmpdir); ++ lstrcatA(tmpdir, "Please Remove Me"); ++ bret = CreateDirectoryA(tmpdir, &sa); ++ ok(bret == TRUE, "CreateDirectoryA(%s) failed err=%d\n", tmpdir, GetLastError()); ++ HeapFree(GetProcessHeap(), 0, pDacl); ++ ++ SetLastError(0xdeadbeef); ++ error = pGetNamedSecurityInfoA(tmpdir, SE_FILE_OBJECT, ++ OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, ++ NULL, &pDacl, NULL, &pSD); ++ if (error != ERROR_SUCCESS && (GetLastError() == ERROR_CALL_NOT_IMPLEMENTED)) ++ { ++ win_skip("GetNamedSecurityInfoA is not implemented\n"); ++ goto done; ++ } ++ ok(!error, "GetNamedSecurityInfo failed with error %d\n", error); ++ ++ bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ++ ok(bret, "GetAclInformation failed\n"); ++ ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", ++ acl_size.AceCount); ++ if (acl_size.AceCount > 0) ++ { ++ bret = pGetAce(pDacl, 0, (VOID **)&ace); ++ ok(bret, "Failed to get Current User ACE.\n"); ++ bret = EqualSid(&ace->SidStart, user_sid); ++ todo_wine ok(bret, "Current User ACE != Current User SID.\n"); ++ todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), ++ "Current User ACE has unexpected flags (0x%x != 0x03)\n", ++ ((ACE_HEADER *)ace)->AceFlags); ++ ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ++ ace->Mask); ++ } ++ if (acl_size.AceCount > 1) ++ { ++ bret = pGetAce(pDacl, 1, (VOID **)&ace); ++ ok(bret, "Failed to get Administators Group ACE.\n"); ++ bret = EqualSid(&ace->SidStart, admin_sid); ++ todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); ++ todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), ++ "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", ++ ((ACE_HEADER *)ace)->AceFlags); ++ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ++ ace->Mask); ++ } ++ ++done: ++ HeapFree(GetProcessHeap(), 0, user); ++ bret = RemoveDirectoryA(tmpdir); ++ ok(bret == TRUE, "RemoveDirectoryA should always succeed\n"); ++} ++ ++void init(void) ++{ ++ HMODULE hmod = GetModuleHandle("advapi32.dll"); ++ ++ pGetNamedSecurityInfoA = (void *)GetProcAddress(hmod, "GetNamedSecurityInfoA"); ++ pAddAccessAllowedAceEx = (void *)GetProcAddress(hmod, "AddAccessAllowedAceEx"); ++ pCreateWellKnownSid = (void *)GetProcAddress(hmod, "CreateWellKnownSid"); ++ pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation"); ++ pGetAce = (void *)GetProcAddress(hmod, "GetAce"); ++} ++ + START_TEST(directory) + { ++ init(); ++ + test_GetWindowsDirectoryA(); + test_GetWindowsDirectoryW(); + +@@ -501,4 +634,6 @@ START_TEST(directory) + test_RemoveDirectoryW(); + + test_SetCurrentDirectoryA(); ++ ++ test_security_attributes(); + } +diff --git a/server/fd.c b/server/fd.c +index f3e42bd..248f15a 100644 +--- a/server/fd.c ++++ b/server/fd.c +@@ -1765,7 +1765,7 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, + /* create the directory if needed */ + if ((options & FILE_DIRECTORY_FILE) && (flags & O_CREAT)) + { +- if (mkdir( name, 0777 ) == -1) ++ if (mkdir( name, *mode ) == -1) + { + if (errno != EEXIST || (flags & O_EXCL)) + { +diff --git a/server/file.c b/server/file.c +index 2ecf97c..9c6cb80 100644 +--- a/server/file.c ++++ b/server/file.c +@@ -219,7 +219,12 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si + mode = sd_to_mode( sd, owner ); + } + else +- mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; ++ { ++ if (options & FILE_NON_DIRECTORY_FILE) ++ mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0444 : 0666; ++ else ++ mode = (attrs & FILE_ATTRIBUTE_READONLY) ? 0555 : 0777; ++ } + + if (len >= 4 && + (!strcasecmp( name + len - 4, ".exe" ) || !strcasecmp( name + len - 4, ".com" ))) +-- +1.7.9.5 + diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0004-server-Store-and-return-security-attributes-with-ext.patch netflix-desktop-0.7.0~natty/wine-patches/0004-server-Store-and-return-security-attributes-with-ext.patch --- netflix-desktop-0.6.1~natty/wine-patches/0004-server-Store-and-return-security-attributes-with-ext.patch 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0004-server-Store-and-return-security-attributes-with-ext.patch 2013-04-13 02:21:09.000000000 +0000 @@ -0,0 +1,491 @@ +From 053534d8f499852516ba8c8476dff999ec96544d Mon Sep 17 00:00:00 2001 +From: Erich Hoover +Date: Fri, 12 Apr 2013 20:20:55 -0600 +Subject: server: Store and return security attributes with extended file + attributes. + +--- + configure.ac | 1 + + dlls/advapi32/tests/security.c | 9 +- + dlls/kernel32/tests/directory.c | 15 ++-- + server/change.c | 11 ++- + server/fd.c | 68 ++++++++++++++- + server/file.c | 176 ++++++++++++++++++++++++++++++++++++++- + server/file.h | 5 +- + 7 files changed, 263 insertions(+), 22 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 084a2d6..93c82af 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -415,6 +415,7 @@ AC_CHECK_HEADERS(\ + arpa/inet.h \ + arpa/nameser.h \ + asm/types.h \ ++ attr/xattr.h \ + capi20.h \ + curses.h \ + direct.h \ +diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c +index 7dd0501..9ad5c26 100644 +--- a/dlls/advapi32/tests/security.c ++++ b/dlls/advapi32/tests/security.c +@@ -3160,7 +3160,7 @@ static void test_GetNamedSecurityInfoA(void) + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); +- todo_wine ok(bret, "Current User ACE != Current User SID.\n"); ++ ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", +@@ -3171,8 +3171,7 @@ static void test_GetNamedSecurityInfoA(void) + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); +- todo_wine ok(bret || broken(!bret) /* win2k */, +- "Administators Group ACE != Administators Group SID.\n"); ++ ok(bret || broken(!bret) /* win2k */, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff || broken(ace->Mask == GENERIC_ALL) /* win2k */, +@@ -3774,7 +3773,7 @@ static void test_GetSecurityInfo(void) + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); +- todo_wine ok(bret, "Current User ACE != Current User SID.\n"); ++ ok(bret, "Current User ACE != Current User SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Current User ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", +@@ -3785,7 +3784,7 @@ static void test_GetSecurityInfo(void) + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); +- todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); ++ ok(bret, "Administators Group ACE != Administators Group SID.\n"); + ok(((ACE_HEADER *)ace)->AceFlags == 0, + "Administators Group ACE has unexpected flags (0x%x != 0x0)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", +diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c +index df434b6..a8dfa81 100644 +--- a/dlls/kernel32/tests/directory.c ++++ b/dlls/kernel32/tests/directory.c +@@ -580,10 +580,9 @@ static void test_security_attributes(void) + bret = pGetAce(pDacl, 0, (VOID **)&ace); + ok(bret, "Failed to get Current User ACE.\n"); + bret = EqualSid(&ace->SidStart, user_sid); +- todo_wine ok(bret, "Current User ACE != Current User SID.\n"); +- todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), +- "Current User ACE has unexpected flags (0x%x != 0x03)\n", +- ((ACE_HEADER *)ace)->AceFlags); ++ ok(bret, "Current User ACE != Current User SID.\n"); ++ ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), ++ "Current User ACE has unexpected flags (0x%x != 0x03)\n", ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } +@@ -592,10 +591,10 @@ static void test_security_attributes(void) + bret = pGetAce(pDacl, 1, (VOID **)&ace); + ok(bret, "Failed to get Administators Group ACE.\n"); + bret = EqualSid(&ace->SidStart, admin_sid); +- todo_wine ok(bret, "Administators Group ACE != Administators Group SID.\n"); +- todo_wine ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), +- "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", +- ((ACE_HEADER *)ace)->AceFlags); ++ ok(bret, "Administators Group ACE != Administators Group SID.\n"); ++ ok(((ACE_HEADER *)ace)->AceFlags == (OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE), ++ "Administators Group ACE has unexpected flags (0x%x != 0x03)\n", ++ ((ACE_HEADER *)ace)->AceFlags); + ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", + ace->Mask); + } +diff --git a/server/change.c b/server/change.c +index f6d56b0..022c780 100644 +--- a/server/change.c ++++ b/server/change.c +@@ -286,6 +286,7 @@ static int get_dir_unix_fd( struct dir *dir ) + static struct security_descriptor *dir_get_sd( struct object *obj ) + { + struct dir *dir = (struct dir *)obj; ++ const SID *user, *group; + int unix_fd; + struct stat st; + struct security_descriptor *sd; +@@ -302,9 +303,11 @@ static struct security_descriptor *dir_get_sd( struct object *obj ) + (st.st_uid == dir->uid)) + return obj->sd; + +- sd = mode_to_sd( st.st_mode, +- security_unix_uid_to_sid( st.st_uid ), +- token_get_primary_group( current->process->token )); ++ user = security_unix_uid_to_sid( st.st_uid ); ++ group = token_get_primary_group( current->process->token ); ++ sd = get_file_acls( unix_fd, user, group ); ++ if (!sd) ++ sd = mode_to_sd( st.st_mode, user, group ); + if (!sd) return obj->sd; + + dir->mode = st.st_mode; +@@ -353,6 +356,8 @@ static int dir_set_sd( struct object *obj, const struct security_descriptor *sd, + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); + mode |= sd_to_mode( sd, owner ); + ++ set_file_acls( unix_fd, sd ); ++ + if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) + { + file_set_error(); +diff --git a/server/fd.c b/server/fd.c +index 248f15a..687d4a9 100644 +--- a/server/fd.c ++++ b/server/fd.c +@@ -88,6 +88,9 @@ + #include + #include + #include ++#ifdef HAVE_ATTR_XATTR_H ++#include ++#endif + + #include "ntstatus.h" + #define WIN32_NO_STATUS +@@ -96,6 +99,7 @@ + #include "handle.h" + #include "process.h" + #include "request.h" ++#include "security.h" + + #include "winternl.h" + #include "winioctl.h" +@@ -1723,9 +1727,69 @@ static char *dup_fd_name( struct fd *root, const char *name ) + return ret; + } + ++void set_file_acls( int fd, const struct security_descriptor *sd ) ++{ ++#ifdef HAVE_ATTR_XATTR_H ++ char buffer[XATTR_SIZE_MAX], *p = buffer; ++ const ACE_HEADER *ace; ++ int present, i, j, n; ++ const ACL *dacl; ++ ++ if (!sd) return; ++ dacl = sd_get_dacl( sd, &present ); ++ if (!present || !dacl) return; ++ ace = (const ACE_HEADER *)(dacl + 1); ++ ++ for (i = 0; i < dacl->AceCount; i++, ace = ace_next( ace )) ++ { ++ BYTE type = ace->AceType, flags; ++ const ACCESS_ALLOWED_ACE *aaa; ++ const ACCESS_DENIED_ACE *ada; ++ char sidtxt[100], *s; ++ const SID *sid; ++ DWORD mask; ++ ++ if (type & INHERIT_ONLY_ACE) continue; ++ ++ switch (type) ++ { ++ case ACCESS_DENIED_ACE_TYPE: ++ ada = (const ACCESS_DENIED_ACE *)ace; ++ flags = ada->Header.AceFlags; ++ mask = ada->Mask; ++ sid = (const SID *)&ada->SidStart; ++ break; ++ case ACCESS_ALLOWED_ACE_TYPE: ++ aaa = (const ACCESS_ALLOWED_ACE *)ace; ++ flags = aaa->Header.AceFlags; ++ mask = aaa->Mask; ++ sid = (const SID *)&aaa->SidStart; ++ break; ++ default: ++ continue; ++ } ++ n = sprintf( sidtxt, "S-%u-%d", sid->Revision, ++ MAKELONG( ++ MAKEWORD( sid->IdentifierAuthority.Value[5], ++ sid->IdentifierAuthority.Value[4] ), ++ MAKEWORD( sid->IdentifierAuthority.Value[3], ++ sid->IdentifierAuthority.Value[2] ) ++ ) ); ++ s = sidtxt + n; ++ for( j=0; jSubAuthorityCount; j++ ) ++ s += sprintf( s, "-%u", sid->SubAuthority[j] ); ++ ++ p += snprintf( p, XATTR_SIZE_MAX-(p-buffer), "%s%x,%x,%x,%s", ++ (p != buffer ? ";" : ""), type, flags, mask, sidtxt ); ++ } ++ ++ fsetxattr( fd, "user.wine.acl", buffer, p-buffer, 0 ); ++#endif ++} ++ + /* open() wrapper that returns a struct fd with no fd user set */ + struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, unsigned int access, +- unsigned int sharing, unsigned int options ) ++ unsigned int sharing, unsigned int options, const struct security_descriptor *sd ) + { + struct stat st; + struct closed_fd *closed_fd; +@@ -1801,6 +1865,8 @@ struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, + } + } + ++ set_file_acls( fd->unix_fd, sd ); ++ + closed_fd->unix_fd = fd->unix_fd; + closed_fd->unlink[0] = 0; + fstat( fd->unix_fd, &st ); +diff --git a/server/file.c b/server/file.c +index 9c6cb80..f4d97fd 100644 +--- a/server/file.c ++++ b/server/file.c +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #ifdef HAVE_UTIME_H + #include +@@ -39,6 +40,9 @@ + #ifdef HAVE_POLL_H + #include + #endif ++#ifdef HAVE_ATTR_XATTR_H ++#include ++#endif + + #include "ntstatus.h" + #define WIN32_NO_STATUS +@@ -240,7 +244,7 @@ static struct object *create_file( struct fd *root, const char *nameptr, data_si + access = generic_file_map_access( access ); + + /* FIXME: should set error to STATUS_OBJECT_NAME_COLLISION if file existed before */ +- fd = open_fd( root, name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options ); ++ fd = open_fd( root, name, flags | O_NONBLOCK | O_LARGEFILE, &mode, access, sharing, options, sd ); + if (!fd) goto done; + + if (S_ISDIR(mode)) +@@ -427,9 +431,169 @@ struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID + return sd; + } + ++struct security_descriptor *get_file_acls( int fd, const SID *user, const SID *group ) ++{ ++#ifdef HAVE_ATTR_XATTR_H ++ int ace_count = 0, dacl_size = sizeof(ACL), i, n; ++ char buffer[XATTR_SIZE_MAX], *p = buffer, *pn; ++ struct security_descriptor *sd; ++ ACE_HEADER *current_ace; ++ ACCESS_ALLOWED_ACE *aaa; ++ ACCESS_DENIED_ACE *ada; ++ int type, flags, mask; ++ ACL *dacl; ++ char *ptr; ++ ++ n = fgetxattr( fd, "user.wine.acl", buffer, sizeof(buffer) ); ++ if (n == -1) return NULL; ++ buffer[n] = 0; ++ ++ do ++ { ++ int sub_authority_count = 0; ++ ++ pn = strchr(p, ';'); ++ if (pn) pn++; ++ sscanf(p, "%x", &type); ++ do ++ { ++ p = strchr(p, '-'); ++ if (p) p++; ++ sub_authority_count++; ++ } ++ while(p && (!pn || p < pn)); ++ sub_authority_count -= 3; /* Revision and IdentifierAuthority don't count */ ++ ++ switch (type) ++ { ++ case ACCESS_DENIED_ACE_TYPE: ++ dacl_size += FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + ++ FIELD_OFFSET(SID, SubAuthority[sub_authority_count]); ++ break; ++ case ACCESS_ALLOWED_ACE_TYPE: ++ dacl_size += FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + ++ FIELD_OFFSET(SID, SubAuthority[sub_authority_count]); ++ break; ++ default: ++ continue; ++ } ++ ace_count++; ++ p = pn; ++ } ++ while(p); ++ ++ sd = mem_alloc( sizeof(struct security_descriptor) + ++ FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]) + ++ FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]) + ++ dacl_size ); ++ ++ sd->control = SE_DACL_PRESENT; ++ sd->owner_len = FIELD_OFFSET(SID, SubAuthority[user->SubAuthorityCount]); ++ sd->group_len = FIELD_OFFSET(SID, SubAuthority[group->SubAuthorityCount]); ++ sd->sacl_len = 0; ++ sd->dacl_len = dacl_size; ++ ++ ptr = (char *)(sd + 1); ++ memcpy( ptr, user, sd->owner_len ); ++ ptr += sd->owner_len; ++ memcpy( ptr, group, sd->group_len ); ++ ptr += sd->group_len; ++ ++ dacl = (ACL *)ptr; ++ dacl->AclRevision = ACL_REVISION; ++ dacl->Sbz1 = 0; ++ dacl->AclSize = dacl_size; ++ dacl->AceCount = ace_count; ++ dacl->Sbz2 = 0; ++ aaa = (ACCESS_ALLOWED_ACE *)(dacl + 1); ++ current_ace = &aaa->Header; ++ ++ p = buffer; ++ for(i=0; iHeader; ++ } ++ pn = strchr(p, ';'); ++ if (pn) pn++; ++ sscanf(p, "%x,%x,%x,%[^;]", &type, &flags, &mask, sidtxt); ++ sscanf(sidtxt, "S-%u-%d", &rev, &ia); ++ sid->Revision = rev; ++ sid->IdentifierAuthority.Value[0] = 0; ++ sid->IdentifierAuthority.Value[1] = 0; ++ sid->IdentifierAuthority.Value[2] = HIBYTE(HIWORD(ia)); ++ sid->IdentifierAuthority.Value[3] = LOBYTE(HIWORD(ia)); ++ sid->IdentifierAuthority.Value[4] = HIBYTE(LOWORD(ia)); ++ sid->IdentifierAuthority.Value[5] = LOBYTE(LOWORD(ia)); ++ p = strchr(sidtxt, '-')+1; ++ p = strchr(p, '-')+1; /* Revision doesn't count */ ++ p = strchr(p, '-')+1; /* IdentifierAuthority doesn't count */ ++ do ++ { ++ sscanf(p, "%u", &sa); ++ sid->SubAuthority[sub_authority_count] = sa; ++ p = strchr(p, '-'); ++ if (p) p++; ++ sub_authority_count++; ++ } ++ while(p); ++ sid->SubAuthorityCount = sub_authority_count; ++ ++ /* Convert generic rights into standard access rights */ ++ if (mask & GENERIC_ALL) ++ mask |= WRITE_DAC | WRITE_OWNER | DELETE | FILE_DELETE_CHILD; ++ if (mask & (GENERIC_ALL|GENERIC_READ)) ++ mask |= FILE_GENERIC_READ; ++ if (mask & (GENERIC_ALL|GENERIC_WRITE)) ++ mask |= FILE_GENERIC_WRITE; ++ if (mask & (GENERIC_ALL|GENERIC_EXECUTE)) ++ mask |= FILE_GENERIC_EXECUTE; ++ mask &= 0x0FFFFFFF; ++ ++ /* Handle the specific ACE */ ++ switch (type) ++ { ++ case ACCESS_DENIED_ACE_TYPE: ++ ada = (ACCESS_DENIED_ACE *)aaa; ++ ada->Header.AceType = type; ++ ada->Header.AceFlags = flags; ++ ada->Header.AceSize = FIELD_OFFSET(ACCESS_DENIED_ACE, SidStart) + ++ FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]); ++ ada->Mask = mask; ++ memcpy( &ada->SidStart, sid, FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) ); ++ break; ++ case ACCESS_ALLOWED_ACE_TYPE: ++ aaa->Header.AceType = type; ++ aaa->Header.AceFlags = flags; ++ aaa->Header.AceSize = FIELD_OFFSET(ACCESS_ALLOWED_ACE, SidStart) + ++ FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]); ++ aaa->Mask = mask; ++ memcpy( &aaa->SidStart, sid, FIELD_OFFSET(SID, SubAuthority[sid->SubAuthorityCount]) ); ++ break; ++ default: ++ continue; ++ } ++ p = pn; ++ } ++ ++ return sd; ++#else ++ return NULL; ++#endif ++} ++ + static struct security_descriptor *file_get_sd( struct object *obj ) + { + struct file *file = (struct file *)obj; ++ const SID *user, *group; + struct stat st; + int unix_fd; + struct security_descriptor *sd; +@@ -446,9 +610,11 @@ static struct security_descriptor *file_get_sd( struct object *obj ) + (st.st_uid == file->uid)) + return obj->sd; + +- sd = mode_to_sd( st.st_mode, +- security_unix_uid_to_sid( st.st_uid ), +- token_get_primary_group( current->process->token )); ++ user = security_unix_uid_to_sid( st.st_uid ); ++ group = token_get_primary_group( current->process->token ); ++ sd = get_file_acls( unix_fd, user, group ); ++ if (!sd) ++ sd = mode_to_sd( st.st_mode, user, group); + if (!sd) return obj->sd; + + file->mode = st.st_mode; +@@ -578,6 +744,8 @@ static int file_set_sd( struct object *obj, const struct security_descriptor *sd + mode = st.st_mode & (S_ISUID|S_ISGID|S_ISVTX); + mode |= sd_to_mode( sd, owner ); + ++ set_file_acls( unix_fd, sd ); ++ + if (((st.st_mode ^ mode) & (S_IRWXU|S_IRWXG|S_IRWXO)) && fchmod( unix_fd, mode ) == -1) + { + file_set_error(); +diff --git a/server/file.h b/server/file.h +index ead356d..77737e8 100644 +--- a/server/file.h ++++ b/server/file.h +@@ -56,7 +56,8 @@ extern struct fd *alloc_pseudo_fd( const struct fd_ops *fd_user_ops, struct obje + unsigned int options ); + extern void set_no_fd_status( struct fd *fd, unsigned int status ); + extern struct fd *open_fd( struct fd *root, const char *name, int flags, mode_t *mode, +- unsigned int access, unsigned int sharing, unsigned int options ); ++ unsigned int access, unsigned int sharing, unsigned int options, ++ const struct security_descriptor *sd ); + extern struct fd *create_anonymous_fd( const struct fd_ops *fd_user_ops, + int unix_fd, struct object *user, unsigned int options ); + extern struct fd *dup_fd_object( struct fd *orig, unsigned int access, unsigned int sharing, +@@ -122,6 +123,8 @@ extern struct file *create_file_for_fd_obj( struct fd *fd, unsigned int access, + extern void file_set_error(void); + extern struct security_descriptor *mode_to_sd( mode_t mode, const SID *user, const SID *group ); + extern mode_t sd_to_mode( const struct security_descriptor *sd, const SID *owner ); ++extern void set_file_acls( int fd, const struct security_descriptor *sd ); ++extern struct security_descriptor *get_file_acls( int fd, const SID *user, const SID *group ); + + /* file mapping functions */ + +-- +1.7.9.5 + diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0004-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch netflix-desktop-0.7.0~natty/wine-patches/0004-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch --- netflix-desktop-0.6.1~natty/wine-patches/0004-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch 2013-01-18 23:38:48.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0004-ws2_32-Implement-SIO_ADDRESS_LIST_CHANGE-with-Notify.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -From 5237c6564a38bbaec92ae8d8a34a3fce354b4f73 Mon Sep 17 00:00:00 2001 -From: Erich Hoover -Date: Fri, 18 Jan 2013 16:38:35 -0700 -Subject: ws2_32: Implement SIO_ADDRESS_LIST_CHANGE with NotifyAddrChange. - ---- - dlls/ws2_32/socket.c | 14 +++++++++++--- - 1 file changed, 11 insertions(+), 3 deletions(-) - -diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c -index c390828..6fd3a2e 100644 ---- a/dlls/ws2_32/socket.c -+++ b/dlls/ws2_32/socket.c -@@ -3386,10 +3386,18 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID - } - - case WS_SIO_ADDRESS_LIST_CHANGE: -- FIXME("-> SIO_ADDRESS_LIST_CHANGE request: stub\n"); -- /* FIXME: error and return code depend on whether socket was created -- * with WSA_FLAG_OVERLAPPED, but there is no easy way to get this */ -+ { -+ HANDLE handle; -+ -+ TRACE("-> SIO_ADDRESS_LIST_CHANGE request\n"); -+ -+ if (overlapped || _is_blocking(s)) -+ status = NotifyAddrChange(&handle, overlapped); -+ else -+ status = WSAEWOULDBLOCK; -+ overlapped = NULL; /* managed by NotifyAddrChange */ - break; -+ } - - case WS_SIO_ADDRESS_LIST_QUERY: - { --- -1.7.9.5 - diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0005-ntdll-Inherit-security-attributes-from-parent-direct.patch netflix-desktop-0.7.0~natty/wine-patches/0005-ntdll-Inherit-security-attributes-from-parent-direct.patch --- netflix-desktop-0.6.1~natty/wine-patches/0005-ntdll-Inherit-security-attributes-from-parent-direct.patch 1970-01-01 00:00:00.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0005-ntdll-Inherit-security-attributes-from-parent-direct.patch 2013-04-13 02:21:09.000000000 +0000 @@ -0,0 +1,180 @@ +From cfb95baa7204232b5a8afb6fdc28297f2b27349b Mon Sep 17 00:00:00 2001 +From: Erich Hoover +Date: Fri, 12 Apr 2013 20:21:02 -0600 +Subject: ntdll: Inherit security attributes from parent directories. + +--- + dlls/kernel32/tests/directory.c | 40 +++++++++++++++++- + dlls/ntdll/file.c | 85 ++++++++++++++++++++++++++++++++++++++- + 2 files changed, 123 insertions(+), 2 deletions(-) + +diff --git a/dlls/kernel32/tests/directory.c b/dlls/kernel32/tests/directory.c +index a8dfa81..a3a9580 100644 +--- a/dlls/kernel32/tests/directory.c ++++ b/dlls/kernel32/tests/directory.c +@@ -505,10 +505,11 @@ static void test_security_attributes(void) + ACL_SIZE_INFORMATION acl_size; + ACCESS_ALLOWED_ACE *ace; + SECURITY_ATTRIBUTES sa; ++ char tmpfile[MAX_PATH]; + char tmpdir[MAX_PATH]; ++ HANDLE token, hTemp; + struct _SID *owner; + BOOL bret = TRUE; +- HANDLE token; + DWORD error; + PACL pDacl; + +@@ -599,6 +600,43 @@ static void test_security_attributes(void) + ace->Mask); + } + ++ /* Test inheritance of ACLs */ ++ strcpy(tmpfile, tmpdir); ++ lstrcatA(tmpfile, "/tmpfile"); ++ hTemp = CreateFileA(tmpfile, GENERIC_WRITE, FILE_SHARE_READ, NULL, CREATE_NEW, ++ FILE_FLAG_DELETE_ON_CLOSE, NULL); ++ error = pGetNamedSecurityInfoA(tmpfile, SE_FILE_OBJECT, ++ OWNER_SECURITY_INFORMATION|DACL_SECURITY_INFORMATION, (PSID*)&owner, ++ NULL, &pDacl, NULL, &pSD); ++ ok(error == ERROR_SUCCESS, "Failed to get permissions on file.\n"); ++ bret = pGetAclInformation(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ++ ok(bret, "GetAclInformation failed\n"); ++ ok(acl_size.AceCount == 2, "GetAclInformation returned unexpected entry count (%d != 2).\n", ++ acl_size.AceCount); ++ if (acl_size.AceCount > 0) ++ { ++ bret = pGetAce(pDacl, 0, (VOID **)&ace); ++ ok(bret, "Inherited Failed to get Current User ACE.\n"); ++ bret = EqualSid(&ace->SidStart, user_sid); ++ ok(bret, "Inherited Current User ACE != Current User SID.\n"); ++ ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, ++ "Inherited Current User ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); ++ ok(ace->Mask == 0x1f01ff, "Current User ACE has unexpected mask (0x%x != 0x1f01ff)\n", ++ ace->Mask); ++ } ++ if (acl_size.AceCount > 1) ++ { ++ bret = pGetAce(pDacl, 1, (VOID **)&ace); ++ ok(bret, "Inherited Failed to get Administators Group ACE.\n"); ++ bret = EqualSid(&ace->SidStart, admin_sid); ++ ok(bret, "Inherited Administators Group ACE != Administators Group SID.\n"); ++ ok(((ACE_HEADER *)ace)->AceFlags == INHERITED_ACE, ++ "Inherited Administators Group ACE has unexpected flags (0x%x != 0x10)\n", ((ACE_HEADER *)ace)->AceFlags); ++ ok(ace->Mask == 0x1f01ff, "Administators Group ACE has unexpected mask (0x%x != 0x1f01ff)\n", ++ ace->Mask); ++ } ++ CloseHandle(hTemp); ++ + done: + HeapFree(GetProcessHeap(), 0, user); + bret = RemoveDirectoryA(tmpdir); +diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c +index 5147ef5..79a700c 100644 +--- a/dlls/ntdll/file.c ++++ b/dlls/ntdll/file.c +@@ -94,6 +94,81 @@ mode_t FILE_umask = 0; + + static const WCHAR ntfsW[] = {'N','T','F','S'}; + ++static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATTRIBUTES attr, ++ PIO_STATUS_BLOCK io, PLARGE_INTEGER alloc_size, ++ ULONG attributes, ULONG sharing, ULONG disposition, ++ ULONG options, PVOID ea_buffer, ULONG ea_length ); ++ ++struct security_descriptor *FILE_get_parent_sd(UNICODE_STRING *filenameW) ++{ ++ SECURITY_INFORMATION info = OWNER_SECURITY_INFORMATION|GROUP_SECURITY_INFORMATION ++ |DACL_SECURITY_INFORMATION|SACL_SECURITY_INFORMATION; ++ PSECURITY_DESCRIPTOR parentsd = NULL; ++ ACL_SIZE_INFORMATION acl_size; ++ BOOLEAN present, defaulted; ++ WCHAR *p, parent[MAX_PATH]; ++ OBJECT_ATTRIBUTES pattr; ++ UNICODE_STRING parentW; ++ IO_STATUS_BLOCK io; ++ NTSTATUS status; ++ HANDLE hparent; ++ ULONG n1, n2; ++ PACL pDacl; ++ int i; ++ ++ parentW.Buffer = parent; ++ parentW.Length = filenameW->Length; ++ memcpy(parentW.Buffer, filenameW->Buffer, filenameW->Length); ++ if ((p = strrchrW(parent, '\\')) != NULL) ++ { ++ p[0] = 0; ++ parentW.Length = (p-parent)*sizeof(WCHAR); ++ } ++ memset(&pattr, 0x0, sizeof(pattr)); ++ pattr.Length = sizeof(pattr); ++ pattr.Attributes = OBJ_CASE_INSENSITIVE; ++ pattr.ObjectName = &parentW; ++ status = FILE_CreateFile( &hparent, READ_CONTROL|ACCESS_SYSTEM_SECURITY, &pattr, &io, NULL, ++ FILE_FLAG_BACKUP_SEMANTICS, ++ FILE_SHARE_READ|FILE_SHARE_WRITE|FILE_SHARE_DELETE, FILE_OPEN, ++ FILE_OPEN_FOR_BACKUP_INTENT, NULL, 0 ); ++ if (status == STATUS_SUCCESS) ++ status = NtQuerySecurityObject( hparent, info, NULL, 0, &n1 ); ++ if (status == STATUS_BUFFER_TOO_SMALL && (parentsd = RtlAllocateHeap( GetProcessHeap(), 0, n1 )) != NULL) ++ status = NtQuerySecurityObject( hparent, info, parentsd, n1, &n2 ); ++ if (status == STATUS_SUCCESS) ++ status = NtQuerySecurityObject( hparent, info, parentsd, n1, &n2 ); ++ if (hparent != INVALID_HANDLE_VALUE) ++ NtClose( hparent ); ++ if (status != STATUS_SUCCESS) return NULL; ++ status = RtlGetDaclSecurityDescriptor(parentsd, &present, &pDacl, &defaulted); ++ if (status != STATUS_SUCCESS || !present) return NULL; ++ status = RtlQueryInformationAcl(pDacl, &acl_size, sizeof(acl_size), AclSizeInformation); ++ if (status != STATUS_SUCCESS) return NULL; ++ ++ for (i=acl_size.AceCount-1; i>=0; i--) ++ { ++ DWORD inheritance_mask = INHERIT_ONLY_ACE|OBJECT_INHERIT_ACE|CONTAINER_INHERIT_ACE; ++ ACE_HEADER *ace; ++ ++ status = RtlGetAce(pDacl, i, (VOID **)&ace); ++ if (status != STATUS_SUCCESS || !(ace->AceFlags & inheritance_mask)) ++ { ++ RtlDeleteAce(pDacl, i); ++ acl_size.AceCount--; ++ } ++ else ++ ace->AceFlags = (ace->AceFlags & ~inheritance_mask) | INHERITED_ACE; ++ } ++ ++ if (!acl_size.AceCount) ++ { ++ return NULL; ++ } ++ return parentsd; ++} ++ ++ + /************************************************************************** + * FILE_CreateFile (internal) + * Open a file. +@@ -152,10 +227,18 @@ static NTSTATUS FILE_CreateFile( PHANDLE handle, ACCESS_MASK access, POBJECT_ATT + { + struct security_descriptor *sd; + struct object_attributes objattr; ++ PSECURITY_DESCRIPTOR parentsd = NULL, psd; + + objattr.rootdir = wine_server_obj_handle( attr->RootDirectory ); + objattr.name_len = 0; +- io->u.Status = NTDLL_create_struct_sd( attr->SecurityDescriptor, &sd, &objattr.sd_len ); ++ psd = attr->SecurityDescriptor; ++ if (!psd && (disposition == FILE_CREATE||disposition == FILE_OVERWRITE_IF)) ++ parentsd = FILE_get_parent_sd( attr->ObjectName ); ++ if (parentsd) ++ psd = parentsd; ++ io->u.Status = NTDLL_create_struct_sd( psd, &sd, &objattr.sd_len ); ++ if (parentsd) ++ RtlFreeHeap( GetProcessHeap(), 0, parentsd ); + if (io->u.Status != STATUS_SUCCESS) + { + RtlFreeAnsiString( &unix_name ); +-- +1.7.9.5 + diff -Nru netflix-desktop-0.6.1~natty/wine-patches/0005-user32-SetTimer-should-respect-the-minimum-and-maxim.patch netflix-desktop-0.7.0~natty/wine-patches/0005-user32-SetTimer-should-respect-the-minimum-and-maxim.patch --- netflix-desktop-0.6.1~natty/wine-patches/0005-user32-SetTimer-should-respect-the-minimum-and-maxim.patch 2013-01-18 23:38:48.000000000 +0000 +++ netflix-desktop-0.7.0~natty/wine-patches/0005-user32-SetTimer-should-respect-the-minimum-and-maxim.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -From efc4cba32335ce69e5da6c77b314c254eacaa1b4 Mon Sep 17 00:00:00 2001 -From: Erich Hoover -Date: Fri, 18 Jan 2013 16:38:39 -0700 -Subject: user32: SetTimer should respect the minimum and maximum timeout - limits. - ---- - dlls/user32/message.c | 7 ++++++- - include/winuser.h | 4 ++++ - 2 files changed, 10 insertions(+), 1 deletion(-) - -diff --git a/dlls/user32/message.c b/dlls/user32/message.c -index 79066a8..0567b0c 100644 ---- a/dlls/user32/message.c -+++ b/dlls/user32/message.c -@@ -4383,12 +4383,17 @@ UINT_PTR WINAPI SetTimer( HWND hwnd, UINT_PTR id, UINT timeout, TIMERPROC proc ) - - if (proc) winproc = WINPROC_AllocProc( (WNDPROC)proc, FALSE ); - -+ if (timeout < USER_TIMER_MINIMUM) -+ timeout = USER_TIMER_MINIMUM; -+ else if (timeout > USER_TIMER_MAXIMUM) -+ timeout = USER_TIMER_MAXIMUM; -+ - SERVER_START_REQ( set_win_timer ) - { - req->win = wine_server_user_handle( hwnd ); - req->msg = WM_TIMER; - req->id = id; -- req->rate = max( timeout, SYS_TIMER_RATE ); -+ req->rate = timeout; - req->lparam = (ULONG_PTR)winproc; - if (!wine_server_call_err( req )) - { -diff --git a/include/winuser.h b/include/winuser.h -index c8ffe6d..ec15ef4 100644 ---- a/include/winuser.h -+++ b/include/winuser.h -@@ -2521,6 +2521,10 @@ typedef struct tagMINIMIZEDMETRICS { - #define PM_QS_PAINT (QS_PAINT << 16) - #define PM_QS_SENDMESSAGE (QS_SENDMESSAGE << 16) - -+/* SetTimer() limits */ -+#define USER_TIMER_MINIMUM 0x0000000A -+#define USER_TIMER_MAXIMUM 0x7FFFFFFF -+ - /* AnimateWindow() flags */ - #define AW_SLIDE 0x00040000 - #define AW_ACTIVATE 0x00020000 --- -1.7.9.5 -