From 99282428af8e60b98991cac98cab36a02b6de328 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 28 Dec 2017 11:43:12 +0100 Subject: Refresh patches --- debian/changelog | 3 + debian/patches/0170-typo.patch | 243 +++++++++++++++++++++ debian/patches/0900-i18n_po_update_es_add_gl.patch | 2 +- 3 files changed, 247 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 9a4ca8e..a1108e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -17,6 +17,9 @@ xsane (0.999-6) UNRELEASED; urgency=medium - Remove override_dh_strip from debian/rules. * Drop dh-autoreconf from build-depends and dh --with arguments because this is all defaults when using dh compat 10. + * Refresh patches: + - patches/0170-typo.patch + - patches/0900-i18n_po_update_es_add_gl.patch -- Jörg Frings-Fürst Fri, 19 May 2017 18:24:37 +0200 diff --git a/debian/patches/0170-typo.patch b/debian/patches/0170-typo.patch index ed8b537..bcf8dcf 100644 --- a/debian/patches/0170-typo.patch +++ b/debian/patches/0170-typo.patch @@ -17,6 +17,15 @@ Index: trunk/src/xsane-text.h #define DESC_OVERWRITE_WARNING _("Warn before overwriting an existing file") #define DESC_SKIP_EXISTING _("If filename counter is automatically increased, used numbers are skipped") #define DESC_SAVE_PS_FLATEDECODED _("compress postscript image with zlib algorithm (flatedecode). " \ +@@ -737,7 +737,7 @@ + #define ERR_CHANGE_WORKING_DIR _("Failed to change working directory to") + #define ERR_FILENAME_TOO_LONG _("Filename too long") + #define ERR_CREATE_TEMP_FILE _("Could not create temporary file.\n\ +-Open Menue Preferences->Setup Tab Save and\n\ ++Open Menu Preferences->Setup Tab Save and\n\ + select a temporary directory where you have\n\ + write permissions." ) + #define ERR_SET_OPTION _("Failed to set value of option") @@ -854,7 +854,7 @@ The format of [DEVICE] is backendname:de -n, --no-mode-selection disable menu for XSane mode selection\n\ \n\ @@ -92,6 +101,15 @@ Index: trunk/po/sv.po msgstr "Spara enhetsberoende inställningar i standardfilen när xsane avslutas" #. DESC_OVERWRITE_WARNING +@@ -2632,7 +2632,7 @@ msgstr "Filnamnet är för långt" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/tr.po =================================================================== --- trunk.orig/po/tr.po @@ -105,6 +123,15 @@ Index: trunk/po/tr.po msgstr "Xsane'den çıkarken öntanımlı dosyadaki aygıt bağımlı tercihleri sakla" #. DESC_OVERWRITE_WARNING +@@ -2617,7 +2617,7 @@ msgstr "Dosya adı çok uzun" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/vi.po =================================================================== --- trunk.orig/po/vi.po @@ -118,6 +145,15 @@ Index: trunk/po/vi.po msgstr "" "Lưu các tùy thích phụ thuộc thiết bị vào tập tin mặc định khi thoát khỏi " "XSane" +@@ -2646,7 +2646,7 @@ msgstr "Tên tập tin quá dài" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/zh.po =================================================================== --- trunk.orig/po/zh.po @@ -131,6 +167,15 @@ Index: trunk/po/zh.po msgstr "" #. DESC_OVERWRITE_WARNING +@@ -2562,7 +2562,7 @@ msgstr "檔名太長" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/zh_CN.po =================================================================== --- trunk.orig/po/zh_CN.po @@ -144,6 +189,15 @@ Index: trunk/po/zh_CN.po msgstr "" #. DESC_OVERWRITE_WARNING +@@ -2537,7 +2537,7 @@ msgstr "档名太长" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ca.po =================================================================== --- trunk.orig/po/ca.po @@ -157,6 +211,15 @@ Index: trunk/po/ca.po msgstr "" "En sortir de l'XSane, desa les preferències que depenen del dispositiu en el " "fitxer per defecte" +@@ -2553,7 +2553,7 @@ msgstr "Nom de fitxer massa llarg" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/cs.po =================================================================== --- trunk.orig/po/cs.po @@ -170,6 +233,15 @@ Index: trunk/po/cs.po msgstr "" "Při skončení zapsat do standardního souboru předvolby závislé na zařízení" +@@ -2603,7 +2603,7 @@ msgstr "Jméno souboru je příliš dlou + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/da.po =================================================================== --- trunk.orig/po/da.po @@ -183,6 +255,15 @@ Index: trunk/po/da.po msgstr "Gem enhedsafhængige værdier i standardfil, ved afslutning af XSane" #. DESC_OVERWRITE_WARNING +@@ -2516,7 +2516,7 @@ msgstr "Filnavn er for langt" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/de.po =================================================================== --- trunk.orig/po/de.po @@ -196,6 +277,15 @@ Index: trunk/po/de.po msgstr "" "Geräteabhängige Einstellungen werden in der Default-Datei beim Beenden von " "xsane gespeichert" +@@ -2530,7 +2530,7 @@ msgstr "Dateiname zu lang" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/es.po =================================================================== --- trunk.orig/po/es.po @@ -209,6 +299,15 @@ Index: trunk/po/es.po msgstr "" "Guardar preferencias dependientes del dispositivo en archivo por omisión al " "salir de XSane" +@@ -2660,7 +2660,7 @@ msgstr "Archivo demasiado grande" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/fi.po =================================================================== --- trunk.orig/po/fi.po @@ -222,6 +321,15 @@ Index: trunk/po/fi.po msgstr "" "Tallenna laiteriippuvaiset asetukset oletustiedostoon poistuttaessa xsanesta" +@@ -2506,7 +2506,7 @@ msgstr "Liian pitkä tiedostonimi" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/fr.po =================================================================== --- trunk.orig/po/fr.po @@ -235,6 +343,15 @@ Index: trunk/po/fr.po msgstr "" "Enregister les paramètres du scanner dans le fichier par défaut en quittant " "XSane" +@@ -2648,7 +2648,7 @@ msgstr "Nom de fichier trop long" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/hu.po =================================================================== --- trunk.orig/po/hu.po @@ -248,6 +365,15 @@ Index: trunk/po/hu.po msgstr "" "Az eszközfüggő beállításokat kilépéskor mentsük el az alapértelmezett fájlba" +@@ -2596,7 +2596,7 @@ msgstr "A fájlnév túl hosszú" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/it.po =================================================================== --- trunk.orig/po/it.po @@ -261,6 +387,15 @@ Index: trunk/po/it.po msgstr "" "Salva le impostazioni del dispositivo nel file prestabilito all'uscita da " "XSane" +@@ -2546,7 +2546,7 @@ msgstr "Il nome file è troppo lungo" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ja.po =================================================================== --- trunk.orig/po/ja.po @@ -274,6 +409,15 @@ Index: trunk/po/ja.po msgstr "XSane終了時にデバイス依存の設定を既定値としてファイル保存" #. DESC_OVERWRITE_WARNING +@@ -2602,7 +2602,7 @@ msgstr "ファイル名が長すぎま + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/nl.po =================================================================== --- trunk.orig/po/nl.po @@ -287,6 +431,15 @@ Index: trunk/po/nl.po msgstr "" "Bewaar apparaatspecifieke instellingen in standaard bestand als XSane eindigt" +@@ -2612,7 +2612,7 @@ msgstr "Bestandsnaam te lang" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pa.po =================================================================== --- trunk.orig/po/pa.po @@ -300,6 +453,15 @@ Index: trunk/po/pa.po msgstr "xsane ਬੰਦ ਕਰਨ ਸਮੇਂ ਡਿਫਾਲਟ ਫਾਇਲ ਵਿੱਚ ਜੰਤਰ ਨਿਰਭਰਤਾ ਪਸੰਦ ਸੰਭਾਲੋ" #. DESC_OVERWRITE_WARNING +@@ -2483,7 +2483,7 @@ msgstr "ਫਾਇਲ ਨਾਂ ਬਹੁ + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pl.po =================================================================== --- trunk.orig/po/pl.po @@ -313,6 +475,15 @@ Index: trunk/po/pl.po msgstr "" "Zapisz ustawienia urządzenia w domyślnym pliku przy wychodzeniu z XSane" +@@ -2630,7 +2630,7 @@ msgstr "Zbyt długa nazwa pliku" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pt.po =================================================================== --- trunk.orig/po/pt.po @@ -326,6 +497,15 @@ Index: trunk/po/pt.po msgstr "" "Salva preferências dependentes do dispositivo em arquivo padrão na saída do " "xsane" +@@ -2643,7 +2643,7 @@ msgstr "Nome de arquivo longo demais" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/pt_BR.po =================================================================== --- trunk.orig/po/pt_BR.po @@ -339,6 +519,15 @@ Index: trunk/po/pt_BR.po msgstr "" "Salva preferências dependentes do dispositivo em arquivo padrão na saída do " "xsane" +@@ -2643,7 +2643,7 @@ msgstr "Nome de arquivo longo demais" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ro.po =================================================================== --- trunk.orig/po/ro.po @@ -352,6 +541,15 @@ Index: trunk/po/ro.po msgstr "" "Salvează preferinţele dependente de dispozitiv în fişierul implicit la " "terminarea XSane" +@@ -2648,7 +2648,7 @@ msgstr "Nume fişier prea lung" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/ru.po =================================================================== --- trunk.orig/po/ru.po @@ -365,6 +563,15 @@ Index: trunk/po/ru.po msgstr "" "Сохранять параметры устройства в файле по умолчанию при выходе из XSane" +@@ -2629,7 +2629,7 @@ msgstr "Название файла сл + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/sk.po =================================================================== --- trunk.orig/po/sk.po @@ -378,6 +585,15 @@ Index: trunk/po/sk.po msgstr "" "Uložiť nastavenia závislé na zariadení v štandardnom súbore pri ukončení " "XSane" +@@ -2528,7 +2528,7 @@ msgstr "Názov súboru príliš dlhý" + #, fuzzy + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/sl.po =================================================================== --- trunk.orig/po/sl.po @@ -391,6 +607,15 @@ Index: trunk/po/sl.po msgstr "Shrani odgovarjajoče nastavitve naprave v privzeto datoteko ob izhodu" #. DESC_OVERWRITE_WARNING +@@ -2602,7 +2602,7 @@ msgstr "Predolgo ime datoteke" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/sr.po =================================================================== --- trunk.orig/po/sr.po @@ -404,6 +629,15 @@ Index: trunk/po/sr.po msgstr "" "Памти одговарајуће конфигурације уређаја у подразумеваној фајли при " "напуштању XSane" +@@ -2506,7 +2506,7 @@ msgstr "Назив фајле је пр + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" Index: trunk/po/xsane.pot =================================================================== --- trunk.orig/po/xsane.pot @@ -417,3 +651,12 @@ Index: trunk/po/xsane.pot msgstr "" #. DESC_OVERWRITE_WARNING +@@ -2433,7 +2433,7 @@ msgstr "" + #. ERR_CREATE_TEMP_FILE + msgid "" + "Could not create temporary file.\n" +-"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" + "select a temporary directory where you have\n" + "write permissions." + msgstr "" diff --git a/debian/patches/0900-i18n_po_update_es_add_gl.patch b/debian/patches/0900-i18n_po_update_es_add_gl.patch index 7c730db..965f50a 100644 --- a/debian/patches/0900-i18n_po_update_es_add_gl.patch +++ b/debian/patches/0900-i18n_po_update_es_add_gl.patch @@ -5726,7 +5726,7 @@ Index: trunk/po/gl.po +#. ERR_CREATE_TEMP_FILE +msgid "" +"Could not create temporary file.\n" -+"Open Menue Preferences->Setup Tab Save and\n" ++"Open Menu Preferences->Setup Tab Save and\n" +"select a temporary directory where you have\n" +"write permissions." +msgstr "" -- cgit v1.2.3