[Pkg-owncloud-commits] [owncloud-client] 05/13: remove patch that was applied upstream
Sandro Knauß
hefee-guest at moszumanska.debian.org
Tue May 10 23:26:16 UTC 2016
This is an automated email from the git hooks/post-receive script.
hefee-guest pushed a commit to branch experimental
in repository owncloud-client.
commit c7c2a49bb5c7a0b4fdd5f264a2f3dea94ab61a69
Author: Sandro Knauß <bugs at sandroknauss.de>
Date: Tue May 10 22:04:52 2016 +0200
remove patch that was applied upstream
---
debian/patches/fix_typo.patch | 424 ------------------------------------------
debian/patches/series | 1 -
2 files changed, 425 deletions(-)
diff --git a/debian/patches/fix_typo.patch b/debian/patches/fix_typo.patch
deleted file mode 100644
index 729354e..0000000
--- a/debian/patches/fix_typo.patch
+++ /dev/null
@@ -1,424 +0,0 @@
-Description: A simple typo fix
-Author: Sandro Knauß
-Origin: debian
-Forwarded: not-needed
-Applied-Upstream: https://github.com/owncloud/client/commit/74f74e03632f6a30035752d7790cbfeef073449e
-Last-Update: 2016-02-20
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: owncloud-client/translations/client_ca.ts
-===================================================================
---- owncloud-client.orig/translations/client_ca.ts 2016-02-16 01:27:21.565114796 +0100
-+++ owncloud-client/translations/client_ca.ts 2016-02-20 10:37:03.398151982 +0100
-@@ -2168,7 +2168,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>S'ha produit un error en carregar la llista de subcarpetes.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_cs.ts
-===================================================================
---- owncloud-client.orig/translations/client_cs.ts 2016-02-16 01:27:21.569114750 +0100
-+++ owncloud-client/translations/client_cs.ts 2016-02-20 10:37:03.402151996 +0100
-@@ -2177,7 +2177,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Došlo k chybě v průběhu načítání seznamu podadresářů.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_de.ts
-===================================================================
---- owncloud-client.orig/translations/client_de.ts 2016-02-16 01:27:21.569114750 +0100
-+++ owncloud-client/translations/client_de.ts 2016-02-20 10:37:03.410152029 +0100
-@@ -2175,7 +2175,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Ein Fehler ist aufgetreten, während die Liste der Unterordner geladen wurde.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_el.ts
-===================================================================
---- owncloud-client.orig/translations/client_el.ts 2016-02-16 01:27:21.573114703 +0100
-+++ owncloud-client/translations/client_el.ts 2016-02-20 10:37:03.414152044 +0100
-@@ -2178,7 +2178,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Προέκυψε σφάλμα κατά τη φόρτωση της λίστας υποφακέλων.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_en.ts
-===================================================================
---- owncloud-client.orig/translations/client_en.ts 2016-02-16 01:27:21.573114703 +0100
-+++ owncloud-client/translations/client_en.ts 2016-02-20 10:37:03.422152076 +0100
-@@ -2170,7 +2170,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"></translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_es.ts
-===================================================================
---- owncloud-client.orig/translations/client_es.ts 2016-02-16 01:27:21.573114703 +0100
-+++ owncloud-client/translations/client_es.ts 2016-02-20 10:37:03.434152122 +0100
-@@ -2173,7 +2173,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Ocurrió un error cuando se cargaba la lista de subcarpetas.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_es_AR.ts
-===================================================================
---- owncloud-client.orig/translations/client_es_AR.ts 2016-02-16 01:27:21.577114656 +0100
-+++ owncloud-client/translations/client_es_AR.ts 2016-02-20 10:37:03.426152091 +0100
-@@ -2159,7 +2159,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_et.ts
-===================================================================
---- owncloud-client.orig/translations/client_et.ts 2016-02-16 01:27:21.577114656 +0100
-+++ owncloud-client/translations/client_et.ts 2016-02-20 10:37:03.438152138 +0100
-@@ -2161,7 +2161,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_eu.ts
-===================================================================
---- owncloud-client.orig/translations/client_eu.ts 2016-02-16 01:27:21.577114656 +0100
-+++ owncloud-client/translations/client_eu.ts 2016-02-20 10:37:03.442152154 +0100
-@@ -2167,7 +2167,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_fa.ts
-===================================================================
---- owncloud-client.orig/translations/client_fa.ts 2016-02-16 01:27:21.581114610 +0100
-+++ owncloud-client/translations/client_fa.ts 2016-02-20 10:37:03.450152185 +0100
-@@ -2160,7 +2160,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_fi.ts
-===================================================================
---- owncloud-client.orig/translations/client_fi.ts 2016-02-16 01:27:21.581114610 +0100
-+++ owncloud-client/translations/client_fi.ts 2016-02-20 10:37:03.454152201 +0100
-@@ -2168,7 +2168,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Virhe alihakemistolistausta ladattaessa.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_fr.ts
-===================================================================
---- owncloud-client.orig/translations/client_fr.ts 2016-02-16 01:27:21.585114562 +0100
-+++ owncloud-client/translations/client_fr.ts 2016-02-20 10:37:03.462152232 +0100
-@@ -2177,7 +2177,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Une erreur est survenue lors du chargement de la liste des sous-dossiers.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_gl.ts
-===================================================================
---- owncloud-client.orig/translations/client_gl.ts 2016-02-16 01:27:21.585114562 +0100
-+++ owncloud-client/translations/client_gl.ts 2016-02-20 10:37:03.466152248 +0100
-@@ -2170,7 +2170,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Produciuse un erro mentres se cargaba a lista de subcartafoles.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_hu.ts
-===================================================================
---- owncloud-client.orig/translations/client_hu.ts 2016-02-16 01:27:21.585114562 +0100
-+++ owncloud-client/translations/client_hu.ts 2016-02-20 10:37:03.470152263 +0100
-@@ -2164,7 +2164,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_it.ts
-===================================================================
---- owncloud-client.orig/translations/client_it.ts 2016-02-16 01:27:21.589114516 +0100
-+++ owncloud-client/translations/client_it.ts 2016-02-20 10:37:03.478152294 +0100
-@@ -2174,7 +2174,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Si è verificato un errore durante il caricamento dell'elenco delle sottocartelle.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_ja.ts
-===================================================================
---- owncloud-client.orig/translations/client_ja.ts 2016-02-16 01:27:21.589114516 +0100
-+++ owncloud-client/translations/client_ja.ts 2016-02-20 10:37:03.482152310 +0100
-@@ -2171,7 +2171,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>サーバーからフォルダーのリスト取得時にエラーが発生しました。</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_nb_NO.ts
-===================================================================
---- owncloud-client.orig/translations/client_nb_NO.ts 2016-02-16 01:27:21.589114516 +0100
-+++ owncloud-client/translations/client_nb_NO.ts 2016-02-20 10:37:03.490152341 +0100
-@@ -2175,7 +2175,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Det oppstod en feil ved lasting av liste av undermapper.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_nl.ts
-===================================================================
---- owncloud-client.orig/translations/client_nl.ts 2016-02-16 01:27:21.593114469 +0100
-+++ owncloud-client/translations/client_nl.ts 2016-02-20 10:37:03.494152357 +0100
-@@ -2176,7 +2176,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Er trad een fout op bij het laden van de lijst met submappen.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_pl.ts
-===================================================================
---- owncloud-client.orig/translations/client_pl.ts 2016-02-16 01:27:21.593114469 +0100
-+++ owncloud-client/translations/client_pl.ts 2016-02-20 10:37:03.502152388 +0100
-@@ -2162,7 +2162,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_pt.ts
-===================================================================
---- owncloud-client.orig/translations/client_pt.ts 2016-02-16 01:27:21.597114422 +0100
-+++ owncloud-client/translations/client_pt.ts 2016-02-20 10:37:03.514152435 +0100
-@@ -2174,7 +2174,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_pt_BR.ts
-===================================================================
---- owncloud-client.orig/translations/client_pt_BR.ts 2016-02-16 01:27:21.597114422 +0100
-+++ owncloud-client/translations/client_pt_BR.ts 2016-02-20 10:37:03.506152404 +0100
-@@ -2174,7 +2174,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Ocorreu um erro ao carregar a lista de sub-pastas.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_ru.ts
-===================================================================
---- owncloud-client.orig/translations/client_ru.ts 2016-02-16 01:27:21.597114422 +0100
-+++ owncloud-client/translations/client_ru.ts 2016-02-20 10:37:03.518152451 +0100
-@@ -2178,7 +2178,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Возникла ошибка при загрузке списка подкаталогов.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_sk.ts
-===================================================================
---- owncloud-client.orig/translations/client_sk.ts 2016-02-16 01:27:21.601114376 +0100
-+++ owncloud-client/translations/client_sk.ts 2016-02-20 10:37:03.522152467 +0100
-@@ -2171,7 +2171,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Nastala chyba počas načítavania zoznamu podpriečinkov.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_sl.ts
-===================================================================
---- owncloud-client.orig/translations/client_sl.ts 2016-02-16 01:27:21.601114376 +0100
-+++ owncloud-client/translations/client_sl.ts 2016-02-20 10:37:03.530152499 +0100
-@@ -2162,7 +2162,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Prišlo je do napake med nalaganjem seznama podrejenih map.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_sr.ts
-===================================================================
---- owncloud-client.orig/translations/client_sr.ts 2016-02-16 01:27:21.601114376 +0100
-+++ owncloud-client/translations/client_sr.ts 2016-02-20 10:37:03.534152513 +0100
-@@ -2172,7 +2172,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Дошло је до грешке при учитавању листе потфасикли.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_sv.ts
-===================================================================
---- owncloud-client.orig/translations/client_sv.ts 2016-02-16 01:27:21.605114329 +0100
-+++ owncloud-client/translations/client_sv.ts 2016-02-20 10:37:03.542152546 +0100
-@@ -2168,7 +2168,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation type="unfinished"/>
- </message>
- </context>
-Index: owncloud-client/translations/client_th.ts
-===================================================================
---- owncloud-client.orig/translations/client_th.ts 2016-02-16 01:27:21.605114329 +0100
-+++ owncloud-client/translations/client_th.ts 2016-02-20 10:37:03.546152560 +0100
-@@ -2170,7 +2170,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>เกิดข้อผิดพลาดขณะโหลดรายชื่อของโฟลเดอร์ย่อย</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_tr.ts
-===================================================================
---- owncloud-client.orig/translations/client_tr.ts 2016-02-16 01:27:21.609114283 +0100
-+++ owncloud-client/translations/client_tr.ts 2016-02-20 10:37:03.554152593 +0100
-@@ -2174,7 +2174,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Alt dizin listesi alınırken bir hata oluştu.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_uk.ts
-===================================================================
---- owncloud-client.orig/translations/client_uk.ts 2016-02-16 01:27:21.609114283 +0100
-+++ owncloud-client/translations/client_uk.ts 2016-02-20 10:37:03.562152623 +0100
-@@ -2167,7 +2167,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>Виникла помилка, поки завантажувався перелік підтек.</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_zh_CN.ts
-===================================================================
---- owncloud-client.orig/translations/client_zh_CN.ts 2016-02-16 01:27:21.609114283 +0100
-+++ owncloud-client/translations/client_zh_CN.ts 2016-02-20 10:37:03.566152640 +0100
-@@ -2162,7 +2162,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>载入子文件夹列表时发生错误。</translation>
- </message>
- </context>
-Index: owncloud-client/translations/client_zh_TW.ts
-===================================================================
---- owncloud-client.orig/translations/client_zh_TW.ts 2016-02-16 01:27:21.613114236 +0100
-+++ owncloud-client/translations/client_zh_TW.ts 2016-02-20 10:37:03.574152671 +0100
-@@ -2173,7 +2173,7 @@
- </message>
- <message>
- <location filename="../src/gui/selectivesyncdialog.cpp" line="252"/>
-- <source>An error occured while loading the list of sub folders.</source>
-+ <source>An error occurred while loading the list of sub folders.</source>
- <translation>在讀取子資料夾清單中發生錯誤。</translation>
- </message>
- </context>
-Index: owncloud-client/src/gui/selectivesyncdialog.cpp
-===================================================================
---- owncloud-client.orig/src/gui/selectivesyncdialog.cpp 2015-12-15 18:45:28.559560301 +0100
-+++ owncloud-client/src/gui/selectivesyncdialog.cpp 2016-02-20 10:37:57.402362639 +0100
-@@ -249,7 +249,7 @@
- if (r->error() == QNetworkReply::ContentNotFoundError) {
- _loading->setText(tr("No subfolders currently on the server."));
- } else {
-- _loading->setText(tr("An error occured while loading the list of sub folders."));
-+ _loading->setText(tr("An error occurred while loading the list of sub folders."));
- }
- _loading->resize(_loading->sizeHint()); // because it's not in a layout
- }
diff --git a/debian/patches/series b/debian/patches/series
index 174a95b..dd3cdd0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,4 +7,3 @@
0007-move-translations.patch
0008-make-reproducable.patch
0009-fix-installpath-of-dolphin-plugin.patch
-fix_typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git
More information about the Pkg-owncloud-commits
mailing list