Rebase against 6d323d81b2a604b89c612928a573b290c945df75.

This commit is contained in:
Sebastian Lackner 2015-05-11 18:10:47 +02:00
parent d3dbcb9165
commit 5215a311fe
4 changed files with 113 additions and 153 deletions

View File

@ -1,4 +1,4 @@
From afa71d7e68a223ab929924a33cac06dfb9c69fdd Mon Sep 17 00:00:00 2001
From 7e1ae1f21953e5d07cc981d9265245ac71426a12 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 29 Nov 2014 21:02:57 +0100
Subject: winedbg: Change bug reporting URL to Wine Staging.
@ -54,10 +54,10 @@ Subject: winedbg: Change bug reporting URL to Wine Staging.
47 files changed, 83 insertions(+), 83 deletions(-)
diff --git a/po/ar.po b/po/ar.po
index d13fba4..df2265c 100644
index f62d86d..426d3b6 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -13730,12 +13730,12 @@ msgstr "تفاصيل خطأ البرنامج"
@@ -13726,12 +13726,12 @@ msgstr "تفاصيل خطأ البرنامج"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -73,10 +73,10 @@ index d13fba4..df2265c 100644
#: winedbg.rc:38
diff --git a/po/bg.po b/po/bg.po
index 6c96994..68cd5c2 100644
index f0821de..662c8c7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -13572,7 +13572,7 @@ msgstr "Program Files"
@@ -13569,7 +13569,7 @@ msgstr "Program Files"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -86,10 +86,10 @@ index 6c96994..68cd5c2 100644
msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 7e46602..8528a9f 100644
index ab2938a..97977d3 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -13991,12 +13991,12 @@ msgstr "Detalls d'Error de Programa"
@@ -13841,12 +13841,12 @@ msgstr "Detalls d'error de programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -98,17 +98,17 @@ index 7e46602..8528a9f 100644
"and attach that file to the report."
msgstr ""
"Si aquest problema no està present en el Windows i encara no s'ha reportat, "
"podeu desar la informació detallada a un fitxer mediant el botó \"Anomenar i "
-"Desar\", després <a href=\"http://wiki.winehq.org/Bugs\">presentar un "
+"Desar\", després <a href=\"http://bugs.wine-staging.com\">presentar un "
"informe d'error</a> i ajuntar aquest fitxer a l'informe."
"podeu desar la informació detallada a un fitxer utilitzant el botó "
-"\"Anomenar i Desar\", i llavors <a href=\"http://wiki.winehq.org/Bugs"
+"\"Anomenar i Desar\", i llavors <a href=\"http://bugs.wine-staging.com"
"\">presentar un informe d'error</a> i ajuntar aquest fitxer a l'informe."
#: winedbg.rc:38
diff --git a/po/cs.po b/po/cs.po
index 56bd765..b3afe1f 100644
index 90a1185..6774d42 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -13618,12 +13618,12 @@ msgstr "Podrobnosti chyby programu"
@@ -13614,12 +13614,12 @@ msgstr "Podrobnosti chyby programu"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -124,10 +124,10 @@ index 56bd765..b3afe1f 100644
#: winedbg.rc:38
diff --git a/po/da.po b/po/da.po
index bfaa555..62b1ac1 100644
index c3512e7..7fb9908 100644
--- a/po/da.po
+++ b/po/da.po
@@ -13880,7 +13880,7 @@ msgstr "Programfejl detaljer"
@@ -13876,7 +13876,7 @@ msgstr "Programfejl detaljer"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -137,10 +137,10 @@ index bfaa555..62b1ac1 100644
msgstr ""
"Hvis dette problem ikke er til stede under Windows, og det endnu ikke er "
diff --git a/po/de.po b/po/de.po
index f99a105..dd50b32 100644
index 63a2bea..29e1f6e 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13820,12 +13820,12 @@ msgstr "Programmfehler-Details"
@@ -13815,12 +13815,12 @@ msgstr "Programmfehler-Details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -156,10 +156,10 @@ index f99a105..dd50b32 100644
#: winedbg.rc:38
diff --git a/po/el.po b/po/el.po
index 7561eae..3dd97a7 100644
index 064ad61..6bc2818 100644
--- a/po/el.po
+++ b/po/el.po
@@ -13315,7 +13315,7 @@ msgstr ""
@@ -13313,7 +13313,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -169,10 +169,10 @@ index 7561eae..3dd97a7 100644
msgstr ""
diff --git a/po/en.po b/po/en.po
index 37774c9..44fffea 100644
index d115da0..c8ed8f5 100644
--- a/po/en.po
+++ b/po/en.po
@@ -13720,12 +13720,12 @@ msgstr "Program Error Details"
@@ -13716,12 +13716,12 @@ msgstr "Program Error Details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -188,10 +188,10 @@ index 37774c9..44fffea 100644
#: winedbg.rc:38
diff --git a/po/en_US.po b/po/en_US.po
index bb379a9..57a76c6 100644
index e9f16b9..355cecc 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -13720,12 +13720,12 @@ msgstr "Program Error Details"
@@ -13716,12 +13716,12 @@ msgstr "Program Error Details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -207,10 +207,10 @@ index bb379a9..57a76c6 100644
#: winedbg.rc:38
diff --git a/po/eo.po b/po/eo.po
index aa88ae9..1bf2425 100644
index 638a08c..f3d6e9b 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -13184,7 +13184,7 @@ msgstr "Detaloj pri programa eraro"
@@ -13180,7 +13180,7 @@ msgstr "Detaloj pri programa eraro"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -220,10 +220,10 @@ index aa88ae9..1bf2425 100644
msgstr ""
diff --git a/po/es.po b/po/es.po
index e0fc4e8..9fa9871 100644
index ab62ced..0cd7838 100644
--- a/po/es.po
+++ b/po/es.po
@@ -13976,12 +13976,12 @@ msgstr "Detalles del error de programa"
@@ -13972,12 +13972,12 @@ msgstr "Detalles del error de programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -239,10 +239,10 @@ index e0fc4e8..9fa9871 100644
#: winedbg.rc:38
diff --git a/po/fa.po b/po/fa.po
index 983b78b..b6170e2 100644
index c7b4ad1..7c0e129 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -13324,7 +13324,7 @@ msgstr ""
@@ -13321,7 +13321,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -252,10 +252,10 @@ index 983b78b..b6170e2 100644
msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 6c4918a..caed7be 100644
index ee88075..c27e0c6 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -13704,13 +13704,13 @@ msgstr "Ohjelman virhetiedot"
@@ -13691,13 +13691,13 @@ msgstr "Ohjelman virhetiedot"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -273,10 +273,10 @@ index 6c4918a..caed7be 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/fr.po b/po/fr.po
index 9826d64..efdc015 100644
index a61ec2f..615f48d 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -13898,13 +13898,13 @@ msgstr "Détails de l'erreur du programme"
@@ -13890,13 +13890,13 @@ msgstr "Détails de l'erreur du programme"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -294,10 +294,10 @@ index 9826d64..efdc015 100644
#: winedbg.rc:38
diff --git a/po/he.po b/po/he.po
index f073882..cf07b98 100644
index bd9f084..b102e62 100644
--- a/po/he.po
+++ b/po/he.po
@@ -14016,7 +14016,7 @@ msgstr ""
@@ -14014,7 +14014,7 @@ msgstr ""
"לכתובת http://appdb.winehq.org לקבלת עצות להרצת יישום זה.\n"
"\n"
"אם תקלה זו אינה קיימת בעת הרצת Windows ולא דווח עליה עדיין, ניתן לדווח עליה "
@ -306,7 +306,7 @@ index f073882..cf07b98 100644
#: winedbg.rc:61
#, fuzzy
@@ -14032,7 +14032,7 @@ msgstr "שגיאה בתכנית"
@@ -14030,7 +14030,7 @@ msgstr "שגיאה בתכנית"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -316,10 +316,10 @@ index f073882..cf07b98 100644
msgstr ""
diff --git a/po/hi.po b/po/hi.po
index 5bc60bd..309a41a 100644
index a13c0ba..9079d10 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -13093,7 +13093,7 @@ msgstr "सूचना (&o)"
@@ -13089,7 +13089,7 @@ msgstr "सूचना (&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -329,10 +329,10 @@ index 5bc60bd..309a41a 100644
msgstr ""
diff --git a/po/hr.po b/po/hr.po
index 8c9cb34..feff815 100644
index b96dfc7..49b9329 100644
--- a/po/hr.po
+++ b/po/hr.po
@@ -13417,7 +13417,7 @@ msgstr "Detalji greške programa"
@@ -13413,7 +13413,7 @@ msgstr "Detalji greške programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -342,10 +342,10 @@ index 8c9cb34..feff815 100644
msgstr ""
diff --git a/po/hu.po b/po/hu.po
index 8b00920..b75139f 100644
index c44140f..3677a0e 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -13889,12 +13889,12 @@ msgstr "Program hibarészletező"
@@ -13885,12 +13885,12 @@ msgstr "Program hibarészletező"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -361,10 +361,10 @@ index 8b00920..b75139f 100644
#: winedbg.rc:38
diff --git a/po/it.po b/po/it.po
index 7f12d61..05980ad 100644
index fbd7d3a..2a72f94 100644
--- a/po/it.po
+++ b/po/it.po
@@ -13980,12 +13980,12 @@ msgstr "Dettagli dell'errore del programma"
@@ -13976,12 +13976,12 @@ msgstr "Dettagli dell'errore del programma"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -380,10 +380,10 @@ index 7f12d61..05980ad 100644
#: winedbg.rc:38
diff --git a/po/ja.po b/po/ja.po
index 597fcbd..58e1338 100644
index a8b8fcb..df9c8e1 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -13720,12 +13720,12 @@ msgstr "プログラム エラーの詳細"
@@ -13712,12 +13712,12 @@ msgstr "プログラム エラーの詳細"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -400,10 +400,10 @@ index 597fcbd..58e1338 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/ko.po b/po/ko.po
index 5814eea..00ec87c 100644
index 2841e16..2f9e3b2 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -13760,12 +13760,12 @@ msgstr "자세한 프로그램 에러"
@@ -13756,12 +13756,12 @@ msgstr "자세한 프로그램 에러"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -419,10 +419,10 @@ index 5814eea..00ec87c 100644
#: winedbg.rc:38
diff --git a/po/lt.po b/po/lt.po
index 87c8616..d6ff962 100644
index fd969b5..4fa54d2 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -13736,13 +13736,13 @@ msgstr "Išsamiau apie programos klaidą"
@@ -13730,13 +13730,13 @@ msgstr "Išsamiau apie programos klaidą"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -440,10 +440,10 @@ index 87c8616..d6ff962 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/ml.po b/po/ml.po
index 808850e..52bea5d 100644
index e99615d..48cfedb 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -13093,7 +13093,7 @@ msgstr "വി_വര"
@@ -13089,7 +13089,7 @@ msgstr "വി_വര"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -453,10 +453,10 @@ index 808850e..52bea5d 100644
msgstr ""
diff --git a/po/nb_NO.po b/po/nb_NO.po
index 1cbfac9..7076243 100644
index ac2b82f..5d00699 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -13783,12 +13783,12 @@ msgstr "Detaljer for programfeil"
@@ -13779,12 +13779,12 @@ msgstr "Detaljer for programfeil"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -472,10 +472,10 @@ index 1cbfac9..7076243 100644
#: winedbg.rc:38
diff --git a/po/nl.po b/po/nl.po
index d447119..ad6c229 100644
index 6f05f9a..be13ba0 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -13935,7 +13935,7 @@ msgstr ""
@@ -13931,7 +13931,7 @@ msgstr ""
"Database</a> naar tips voor dit programma.\n"
"\n"
"Als dit probleem niet optreedt onder Windows en nog niet is gerapporteerd, "
@ -484,7 +484,7 @@ index d447119..ad6c229 100644
#: winedbg.rc:61
msgid "Show &Details"
@@ -13949,13 +13949,13 @@ msgstr "Programmafout details"
@@ -13945,13 +13945,13 @@ msgstr "Programmafout details"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -501,10 +501,10 @@ index d447119..ad6c229 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/or.po b/po/or.po
index 44e1558..6a0aa4f 100644
index 8c091dd..9648d3e 100644
--- a/po/or.po
+++ b/po/or.po
@@ -13093,7 +13093,7 @@ msgstr "ସୂଚନା (&o)"
@@ -13089,7 +13089,7 @@ msgstr "ସୂଚନା (&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -514,10 +514,10 @@ index 44e1558..6a0aa4f 100644
msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 863eb02..18da35b 100644
index 9b3300e..665942e 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -13093,7 +13093,7 @@ msgstr "ਜਾਣਕਾਰੀ(&o)"
@@ -13089,7 +13089,7 @@ msgstr "ਜਾਣਕਾਰੀ(&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -527,10 +527,10 @@ index 863eb02..18da35b 100644
msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 83c2198..df13302 100644
index 4767698..c36d0b4 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -13792,12 +13792,12 @@ msgstr "Szczegóły błędu programu"
@@ -13788,12 +13788,12 @@ msgstr "Szczegóły błędu programu"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -546,10 +546,10 @@ index 83c2198..df13302 100644
#: winedbg.rc:38
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 807ffba..3490be8 100644
index 57c77a2..5d10ce0 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -13806,13 +13806,13 @@ msgstr "Detalhes do Erro do Programa"
@@ -13802,13 +13802,13 @@ msgstr "Detalhes do Erro do Programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -567,10 +567,10 @@ index 807ffba..3490be8 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/pt_PT.po b/po/pt_PT.po
index 0916f7a..c4a57a8 100644
index ea77aba..2806ae1 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -13767,7 +13767,7 @@ msgstr "Detalhes do erro no programa"
@@ -13763,7 +13763,7 @@ msgstr "Detalhes do erro no programa"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -580,10 +580,10 @@ index 0916f7a..c4a57a8 100644
msgstr ""
diff --git a/po/rm.po b/po/rm.po
index b29b8f7..8b10611 100644
index fcb9129..243a739 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -13190,7 +13190,7 @@ msgstr ""
@@ -13187,7 +13187,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -593,10 +593,10 @@ index b29b8f7..8b10611 100644
msgstr ""
diff --git a/po/ro.po b/po/ro.po
index a21837a..fa4bc10 100644
index 6581c88..830967c 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -13975,7 +13975,7 @@ msgstr "Detalii eroare de program"
@@ -13971,7 +13971,7 @@ msgstr "Detalii eroare de program"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -606,10 +606,10 @@ index a21837a..fa4bc10 100644
msgstr ""
diff --git a/po/ru.po b/po/ru.po
index d6640e2..866c94d 100644
index 7c80b4a..77222ed 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -13739,13 +13739,13 @@ msgstr "Подробности об ошибке"
@@ -13724,13 +13724,13 @@ msgstr "Подробности об ошибке"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -627,10 +627,10 @@ index d6640e2..866c94d 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/sk.po b/po/sk.po
index e85f894..d4487e0 100644
index 7fdef48..bc5ffdc 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -13366,7 +13366,7 @@ msgstr ""
@@ -13362,7 +13362,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -640,10 +640,10 @@ index e85f894..d4487e0 100644
msgstr ""
diff --git a/po/sl.po b/po/sl.po
index 42b62e7..b5777a0 100644
index 446ee95..8ecac63 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -13915,13 +13915,13 @@ msgstr "Podrobnosti napake v programu"
@@ -13911,13 +13911,13 @@ msgstr "Podrobnosti napake v programu"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -661,10 +661,10 @@ index 42b62e7..b5777a0 100644
#: winedbg.rc:38
msgid "Wine program crash"
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 4bb2989..2705836 100644
index c32bab5..470d09e 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -13866,7 +13866,7 @@ msgstr ""
@@ -13864,7 +13864,7 @@ msgstr ""
"http://appdb.winehq.org за савете о покретању овог програма.\n"
"\n"
"Ако овај проблем није присутан под Windows-ом и још увек није пријављен, "
@ -673,7 +673,7 @@ index 4bb2989..2705836 100644
#: winedbg.rc:61
#, fuzzy
@@ -13882,7 +13882,7 @@ msgstr "Програмска грешка"
@@ -13880,7 +13880,7 @@ msgstr "Програмска грешка"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -683,10 +683,10 @@ index 4bb2989..2705836 100644
msgstr ""
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 9f36f5e..64bad0b 100644
index 06eb3ba..bb8fccf 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -14011,7 +14011,7 @@ msgstr ""
@@ -14005,7 +14005,7 @@ msgstr ""
"http://appdb.winehq.org za savete o pokretanju ovog programa.\n"
"\n"
"Ako ovaj problem nije prisutan pod Windows-om i još uvek nije prijavljen, "
@ -695,7 +695,7 @@ index 9f36f5e..64bad0b 100644
#: winedbg.rc:61
#, fuzzy
@@ -14027,7 +14027,7 @@ msgstr "Programska greška"
@@ -14021,7 +14021,7 @@ msgstr "Programska greška"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -705,10 +705,10 @@ index 9f36f5e..64bad0b 100644
msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 7e1f146..935959b 100644
index 780a756..31fde4c 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -13669,12 +13669,12 @@ msgstr "Detaljer om programfel"
@@ -13665,12 +13665,12 @@ msgstr "Detaljer om programfel"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -724,10 +724,10 @@ index 7e1f146..935959b 100644
#: winedbg.rc:38
diff --git a/po/te.po b/po/te.po
index a88f9e3..42b5cb0 100644
index e85c5c7..4b65d58 100644
--- a/po/te.po
+++ b/po/te.po
@@ -13093,7 +13093,7 @@ msgstr "సమాచారము (&o)"
@@ -13089,7 +13089,7 @@ msgstr "సమాచారము (&o)"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -737,10 +737,10 @@ index a88f9e3..42b5cb0 100644
msgstr ""
diff --git a/po/th.po b/po/th.po
index c6e43a2..c0af854 100644
index c55ff68..1dbdbfd 100644
--- a/po/th.po
+++ b/po/th.po
@@ -13359,7 +13359,7 @@ msgstr "ปรับแต่งนาฬิกา"
@@ -13357,7 +13357,7 @@ msgstr "ปรับแต่งนาฬิกา"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -750,10 +750,10 @@ index c6e43a2..c0af854 100644
msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 514cfe9..a20899d 100644
index a19121f..4dedb4a 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -13724,12 +13724,12 @@ msgstr "Program Hata Detayları"
@@ -13720,12 +13720,12 @@ msgstr "Program Hata Detayları"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -769,10 +769,10 @@ index 514cfe9..a20899d 100644
#: winedbg.rc:38
diff --git a/po/uk.po b/po/uk.po
index 37d9a08..7c2982a 100644
index c8a6b5b..a4bc08b 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -13820,12 +13820,12 @@ msgstr "Дані про помилку програми"
@@ -13807,12 +13807,12 @@ msgstr "Дані про помилку програми"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -788,10 +788,10 @@ index 37d9a08..7c2982a 100644
#: winedbg.rc:38
diff --git a/po/wa.po b/po/wa.po
index 2cd44bc..f305e98 100644
index 8dd6d6d..a396272 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -13261,7 +13261,7 @@ msgstr "&Propietés"
@@ -13259,7 +13259,7 @@ msgstr "&Propietés"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -801,10 +801,10 @@ index 2cd44bc..f305e98 100644
msgstr ""
diff --git a/po/wine.pot b/po/wine.pot
index c079885..7816173 100644
index 0e42192..1b85662 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -13024,7 +13024,7 @@ msgstr ""
@@ -13020,7 +13020,7 @@ msgstr ""
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -814,10 +814,10 @@ index c079885..7816173 100644
msgstr ""
diff --git a/po/zh_CN.po b/po/zh_CN.po
index e3d9636..2e5622a 100644
index 40c4901..02c7a46 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -13240,11 +13240,11 @@ msgstr "程序错误详情"
@@ -13236,11 +13236,11 @@ msgstr "程序错误详情"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -832,10 +832,10 @@ index e3d9636..2e5622a 100644
#: winedbg.rc:38
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 9635357..c18c718 100644
index 45912e7..3944c89 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -13632,11 +13632,11 @@ msgstr "程式錯誤詳細資訊"
@@ -13628,11 +13628,11 @@ msgstr "程式錯誤詳細資訊"
msgid ""
"If this problem is not present under Windows and has not been reported yet, "
"you can save the detailed information to a file using the \"Save As\" "
@ -863,5 +863,5 @@ index 7514f9d..11de95d 100644
IDC_STATIC_TXT2,"SysLink",0,6,285,388,32
DEFPUSHBUTTON "Close", IDOK, 326, 320, 70, 16, WS_TABSTOP
--
2.3.0
2.4.0

View File

@ -1,4 +1,4 @@
From 15dc0e88f4fcd63c876d9037204074ed7506dd51 Mon Sep 17 00:00:00 2001
From 599947d1aaf88c78ed5affe2609c431db14bccd4 Mon Sep 17 00:00:00 2001
From: Louis Lenders <xerox_xerox2000@yahoo.co.uk>
Date: Sun, 27 Jul 2014 11:42:28 -0600
Subject: kernel32: Add tests for GetSystemTimes.
@ -8,7 +8,7 @@ Subject: kernel32: Add tests for GetSystemTimes.
1 file changed, 76 insertions(+)
diff --git a/dlls/kernel32/tests/time.c b/dlls/kernel32/tests/time.c
index 55d4be9..c524343 100644
index 378941d..1937e65 100644
--- a/dlls/kernel32/tests/time.c
+++ b/dlls/kernel32/tests/time.c
@@ -22,9 +22,11 @@
@ -22,10 +22,10 @@ index 55d4be9..c524343 100644
+static BOOL (WINAPI *pGetSystemTimes)(LPFILETIME, LPFILETIME, LPFILETIME);
static int (WINAPI *pGetCalendarInfoA)(LCID,CALID,CALTYPE,LPSTR,int,LPDWORD);
static int (WINAPI *pGetCalendarInfoW)(LCID,CALID,CALTYPE,LPWSTR,int,LPDWORD);
@@ -732,12 +734,85 @@ static void test_GetCalendarInfo(void)
ok( ret == ret2, "got %d, expected %d\n", ret, ret2 );
static DWORD (WINAPI *pGetDynamicTimeZoneInformation)(DYNAMIC_TIME_ZONE_INFORMATION*);
@@ -760,12 +762,85 @@ static void test_GetDynamicTimeZoneInformation(void)
ok(dyninfo.TimeZoneKeyName[0] != 0, "got empty tz keyname\n");
trace("Dyn TimeZoneKeyName %s\n", wine_dbgstr_w(dyninfo.TimeZoneKeyName));
}
+static void test_GetSystemTimes(void)
+{
@ -108,15 +108,15 @@ index 55d4be9..c524343 100644
+ pGetSystemTimes = (void *)GetProcAddress( hKernel, "GetSystemTimes");
pGetCalendarInfoA = (void *)GetProcAddress(hKernel, "GetCalendarInfoA");
pGetCalendarInfoW = (void *)GetProcAddress(hKernel, "GetCalendarInfoW");
@@ -747,6 +822,7 @@ START_TEST(time)
pGetDynamicTimeZoneInformation = (void *)GetProcAddress(hKernel, "GetDynamicTimeZoneInformation");
@@ -776,6 +851,7 @@ START_TEST(time)
test_FileTimeToSystemTime();
test_FileTimeToLocalFileTime();
test_TzSpecificLocalTimeToSystemTime();
+ test_GetSystemTimes();
test_FileTimeToDosDateTime();
test_GetCalendarInfo();
}
test_GetDynamicTimeZoneInformation();
--
2.1.0
2.4.0

View File

@ -55,7 +55,7 @@ version()
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
echo ""
echo "Patchset to be applied on upstream Wine:"
echo " commit 3ec3fa5eb7d4eefd3157dfce31dbe561a6cda474"
echo " commit 6d323d81b2a604b89c612928a573b290c945df75"
echo ""
}
@ -197,7 +197,6 @@ patch_enable_all ()
enable_secur32_ANSI_NTLM_Credentials="$1"
enable_server_ACL_Compat="$1"
enable_server_Address_List_Change="$1"
enable_server_Async_Leak="$1"
enable_server_ClipCursor="$1"
enable_server_CreateProcess_ACLs="$1"
enable_server_Delete_On_Close="$1"
@ -652,9 +651,6 @@ patch_enable ()
server-Address_List_Change)
enable_server_Address_List_Change="$2"
;;
server-Async_Leak)
enable_server_Async_Leak="$2"
;;
server-ClipCursor)
enable_server_ClipCursor="$2"
;;
@ -4414,18 +4410,6 @@ if test "$enable_server_Address_List_Change" -eq 1; then
) >> "$patchlist"
fi
# Patchset server-Async_Leak
# |
# | Modified files:
# | * server/named_pipe.c
# |
if test "$enable_server_Async_Leak" -eq 1; then
patch_apply server-Async_Leak/0001-server-Fix-leak-of-async-handle-in-pipe_server_flush.patch
(
echo '+ { "Sebastian Lackner", "server: Fix leak of async handle in pipe_server_flush.", 1 },';
) >> "$patchlist"
fi
# Patchset server-ClipCursor
# |
# | This patchset fixes the following Wine bugs:

View File

@ -1,24 +0,0 @@
From fb7b3dde4dc3687643cbf9d66c0e0e3da27d1ad2 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Fri, 8 May 2015 18:02:20 +0200
Subject: server: Fix leak of async handle in pipe_server_flush.
---
server/named_pipe.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/server/named_pipe.c b/server/named_pipe.c
index c698a87..f5e536c 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -563,6 +563,7 @@ static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async_
if (!server->flush_poll)
server->flush_poll = add_timeout_user( -TICKS_PER_SEC / 10, check_flushed, server );
if (blocking) handle = alloc_handle( current->process, async, SYNCHRONIZE, 0 );
+ release_object( async );
set_error( STATUS_PENDING );
}
return handle;
--
2.4.0