[pkg-wine-party] [SCM] Debian Wine packaging branch, wheezy, updated. wine-1.4-7-302-gb61b690
The following commit has been merged in the wheezy branch:
commit 5cffa36af745d244605672469676c1fbee43ff09
Author: Francois Gouget <fgouget@free.fr>
Date: Fri May 4 01:06:43 2012 +0200
wldap32: An English (United States) spelling fix.
(cherry picked from commit 3bbf585b5c83235f850c7bf342c6cd6f60e837c4)
diff --git a/dlls/wldap32/wldap32.rc b/dlls/wldap32/wldap32.rc
index 59b2bf4..17914e4 100644
--- a/dlls/wldap32/wldap32.rc
+++ b/dlls/wldap32/wldap32.rc
@@ -112,7 +112,7 @@ STRINGTABLE
85 "Timeout"
86 "Auth Unknown"
87 "Filter Error"
- 88 "User Cancelled"
+ 88 "User Canceled"
89 "Parameter Error"
90 "No Memory"
91 "Can't connect to the LDAP server"
diff --git a/po/ar.po b/po/ar.po
index c7bc112..9f39287 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -8988,7 +8988,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/bg.po b/po/bg.po
index ba59f0e..a9f7e78 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -9113,7 +9113,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/ca.po b/po/ca.po
index 1b93b71..93aad85 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -9152,7 +9152,7 @@ msgid "Filter Error"
msgstr "Error de Filtre"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Cancel·lat per Usuari"
#: wldap32.rc:116
diff --git a/po/cs.po b/po/cs.po
index 1d244d9..d411440 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -9281,7 +9281,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/da.po b/po/da.po
index 4e84d49..2b89fb1 100644
--- a/po/da.po
+++ b/po/da.po
@@ -9103,7 +9103,7 @@ msgid "Filter Error"
msgstr "Filter fejl"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Bruger afbrød"
#: wldap32.rc:116
diff --git a/po/de.po b/po/de.po
index c7af162..31d4f37 100644
--- a/po/de.po
+++ b/po/de.po
@@ -9152,7 +9152,7 @@ msgid "Filter Error"
msgstr "Filterfehler"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Benutzerabbruch"
#: wldap32.rc:116
diff --git a/po/el.po b/po/el.po
index bba11e3..fb6c3ea 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8980,7 +8980,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/en.po b/po/en.po
index aeaf0f1..868d013 100644
--- a/po/en.po
+++ b/po/en.po
@@ -8955,7 +8955,7 @@ msgid "Filter Error"
msgstr "Filter Error"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "User Cancelled"
#: wldap32.rc:116
diff --git a/po/en_US.po b/po/en_US.po
index 4bebd9d..8a4ef9d 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -9106,8 +9106,8 @@ msgid "Filter Error"
msgstr "Filter Error"
#: wldap32.rc:115
-msgid "User Cancelled"
-msgstr "User Cancelled"
+msgid "User Canceled"
+msgstr "User Canceled"
#: wldap32.rc:116
msgid "Parameter Error"
diff --git a/po/eo.po b/po/eo.po
index 5e9a931..953ba68 100644
--- a/po/eo.po
+++ b/po/eo.po
@@ -8830,7 +8830,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/es.po b/po/es.po
index 2033ca9..c0512c2 100644
--- a/po/es.po
+++ b/po/es.po
@@ -9156,7 +9156,7 @@ msgid "Filter Error"
msgstr "Error de filtro"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Cancelado por el usuario"
#: wldap32.rc:116
diff --git a/po/fa.po b/po/fa.po
index 2da5cc0..6d4f11c 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -8989,7 +8989,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/fi.po b/po/fi.po
index d904a99..1569638 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -9083,7 +9083,7 @@ msgid "Filter Error"
msgstr "Suodatinvirhe"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Käyttäjän peruma"
#: wldap32.rc:116
diff --git a/po/fr.po b/po/fr.po
index 191922b..8b6e267 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9182,7 +9182,7 @@ msgid "Filter Error"
msgstr "Erreur de filtrage"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Annulation par l'utilisateur"
#: wldap32.rc:116
diff --git a/po/he.po b/po/he.po
index c23c1bb..673a7a6 100644
--- a/po/he.po
+++ b/po/he.po
@@ -9227,7 +9227,7 @@ msgid "Filter Error"
msgstr "שגיאת מסנן"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "המשתמש ביטל"
#: wldap32.rc:116
diff --git a/po/hi.po b/po/hi.po
index b4b751c..5de5ba6 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -8845,7 +8845,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/hu.po b/po/hu.po
index 2c51fc8..0b888ba 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -9097,7 +9097,7 @@ msgid "Filter Error"
msgstr "Szűrő hiba"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Felhasználó megszakította"
#: wldap32.rc:116
diff --git a/po/it.po b/po/it.po
index fc58885..dc88e87 100644
--- a/po/it.po
+++ b/po/it.po
@@ -9145,7 +9145,7 @@ msgid "Filter Error"
msgstr "Errore del filtro"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Utente eliminato"
#: wldap32.rc:116
diff --git a/po/ja.po b/po/ja.po
index cd0c28a..b756e60 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -9089,7 +9089,7 @@ msgid "Filter Error"
msgstr "フィルタ エラー"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "ユーザがキャンセル"
#: wldap32.rc:116
diff --git a/po/ko.po b/po/ko.po
index 491ef64..a057d35 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -9068,7 +9068,7 @@ msgid "Filter Error"
msgstr "필터 오류"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "사용자가 취소함"
#: wldap32.rc:116
diff --git a/po/lt.po b/po/lt.po
index ef1d840..24902ab 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -9122,7 +9122,7 @@ msgid "Filter Error"
msgstr "Filtro klaida"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Nutraukta naudotojo"
#: wldap32.rc:116
diff --git a/po/ml.po b/po/ml.po
index 1da8335..3ffb8a3 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -8845,7 +8845,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/nb_NO.po b/po/nb_NO.po
index f083c84..7cf9565 100644
--- a/po/nb_NO.po
+++ b/po/nb_NO.po
@@ -9411,7 +9411,7 @@ msgid "Filter Error"
msgstr "Filterfeil"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Bruker avbrøt"
#: wldap32.rc:116
diff --git a/po/nl.po b/po/nl.po
index 49af3c9..5866967 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -9185,7 +9185,7 @@ msgid "Filter Error"
msgstr "Filterfout"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Afgebroken door gebruiker"
#: wldap32.rc:116
diff --git a/po/or.po b/po/or.po
index 7600790..eae540b 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8845,7 +8845,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/pa.po b/po/pa.po
index d3e1fcd..27a341d 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -8845,7 +8845,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/pl.po b/po/pl.po
index c101116..c2511d2 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -9142,7 +9142,7 @@ msgid "Filter Error"
msgstr "Błąd filtru"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Akcja anulowana przez użytkownika"
#: wldap32.rc:116
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f1dcfb7..bf4cf33 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -9146,7 +9146,7 @@ msgid "Filter Error"
msgstr "Erro de Filtro"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Cancelado pelo Usuário"
#: wldap32.rc:116
diff --git a/po/pt_PT.po b/po/pt_PT.po
index cbc61e5..b862468 100644
--- a/po/pt_PT.po
+++ b/po/pt_PT.po
@@ -9116,7 +9116,7 @@ msgid "Filter Error"
msgstr "Erro de Filtro"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Cancelado pelo Utilizador"
#: wldap32.rc:116
diff --git a/po/rm.po b/po/rm.po
index c0d6f45..2e63858 100644
--- a/po/rm.po
+++ b/po/rm.po
@@ -8903,7 +8903,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/ro.po b/po/ro.po
index 2b9fd79..404af56 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -9386,7 +9386,7 @@ msgid "Filter Error"
msgstr "Eroare de filtrare"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Anulat de utilizator"
#: wldap32.rc:116
diff --git a/po/ru.po b/po/ru.po
index fdf24bb..a431634 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -9109,7 +9109,7 @@ msgid "Filter Error"
msgstr "Ошибка фильтра"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Отменено пользователем"
#: wldap32.rc:116
diff --git a/po/sk.po b/po/sk.po
index 6c59c58..7b59bc2 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -8948,7 +8948,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/sl.po b/po/sl.po
index 4bf2022..aaf7205 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -9097,7 +9097,7 @@ msgid "Filter Error"
msgstr "Napaka filtra"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Uporabnik je preklical"
#: wldap32.rc:116
diff --git a/po/sr_RS@cyrillic.po b/po/sr_RS@cyrillic.po
index 40a2838..5a887d9 100644
--- a/po/sr_RS@cyrillic.po
+++ b/po/sr_RS@cyrillic.po
@@ -9295,7 +9295,7 @@ msgid "Filter Error"
msgstr "Грешка у филтеру"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Корисник је отказан"
#: wldap32.rc:116
diff --git a/po/sr_RS@latin.po b/po/sr_RS@latin.po
index 10d11ff..e712be9 100644
--- a/po/sr_RS@latin.po
+++ b/po/sr_RS@latin.po
@@ -9395,7 +9395,7 @@ msgid "Filter Error"
msgstr "Greška u filteru"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Korisnik je otkazan"
#: wldap32.rc:116
diff --git a/po/sv.po b/po/sv.po
index 5c1af68..c35862f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -9074,7 +9074,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/te.po b/po/te.po
index 6f8b2ec..2e04120 100644
--- a/po/te.po
+++ b/po/te.po
@@ -8845,7 +8845,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/th.po b/po/th.po
index e6ead06..d10679e 100644
--- a/po/th.po
+++ b/po/th.po
@@ -8997,7 +8997,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/tr.po b/po/tr.po
index 8e11095..827ac53 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8940,7 +8940,7 @@ msgid "Filter Error"
msgstr "Süzme Hatası"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Kullanıcı İptal Etti"
#: wldap32.rc:116
diff --git a/po/uk.po b/po/uk.po
index 4d8daac..82092dc 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -9102,7 +9102,7 @@ msgid "Filter Error"
msgstr "Помилка фільтру"
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "Відмінено користувачем"
#: wldap32.rc:116
diff --git a/po/wa.po b/po/wa.po
index c4cd3bb..68f05fe 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -8943,7 +8943,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/wine.pot b/po/wine.pot
index 1c52dfd..9e92559 100644
--- a/po/wine.pot
+++ b/po/wine.pot
@@ -8792,7 +8792,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/zh_CN.po b/po/zh_CN.po
index cf6d28f..5e661d4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -8875,7 +8875,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr ""
#: wldap32.rc:116
diff --git a/po/zh_TW.po b/po/zh_TW.po
index f993298..218d3fe 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -8828,7 +8828,7 @@ msgid "Filter Error"
msgstr ""
#: wldap32.rc:115
-msgid "User Cancelled"
+msgid "User Canceled"
msgstr "使用者已取消"
#: wldap32.rc:116
--
Debian Wine packaging
Reply to: