[SCM] qstopmotion/master: automatically
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Sat Nov 5 10:02:43 UTC 2016
The following commit has been merged in the master branch:
commit 4d10a77399c7c61e05219c182f4997f43ad27c03
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Sat Nov 5 11:02:22 2016 +0100
automatically
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 046459f..0a8f7bd 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -294,9 +294,6 @@ Index: qstopmotion/src/technical/grabber/video4linux2/v4l2grabber.h
* mode or "single grab" mode.
* @return true on success, false otherwise
*/
-Index: qstopmotion/translations/qstopmotion_cs.qm
-===================================================================
-Binary files qstopmotion.orig/translations/qstopmotion_cs.qm and qstopmotion/translations/qstopmotion_cs.qm differ
Index: qstopmotion/translations/qstopmotion_cs.ts
===================================================================
--- qstopmotion.orig/translations/qstopmotion_cs.ts
@@ -319,6 +316,15 @@ Index: qstopmotion/translations/qstopmotion_cs.ts
without sound if you choose to play.</source>
<translation>Vybraný soubor se záznamem zvuku není v platném
zvukovém formátu. Animace bude, v případě že se
+@@ -1106,7 +1106,7 @@ na kartě pro nahrávání.</translation
+ <translation>Uložit &jako</translation>
+ </message>
+ <message>
+- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
++ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
+ <translation><h4>Uložit</h4> <p>Uloží nynější animaci jako soubor s projektem qStopMotion. </p></translation>
+ </message>
+ <message>
@@ -1617,7 +1617,7 @@ tato oprávnění potřebujete k vytvoř
</message>
<message>
@@ -328,9 +334,6 @@ Index: qstopmotion/translations/qstopmotion_cs.ts
<translation>Vypadá to, že qStopmotion nebyl při posledním používání správně
ukončen. Chcete obnovit poslední sezení?</translation>
</message>
-Index: qstopmotion/translations/qstopmotion_da.qm
-===================================================================
-Binary files qstopmotion.orig/translations/qstopmotion_da.qm and qstopmotion/translations/qstopmotion_da.qm differ
Index: qstopmotion/translations/qstopmotion_da.ts
===================================================================
--- qstopmotion.orig/translations/qstopmotion_da.ts
@@ -353,6 +356,15 @@ Index: qstopmotion/translations/qstopmotion_da.ts
without sound if you choose to play.</source>
<translation>Den valgte audio fil er ugyldig indenfor det
valgte lyd format. Animationen vil blivet spillet
+@@ -1727,7 +1727,7 @@ Tjek dine indstillinger i foretrukne men
+ </message>
+ <message>
+ <location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
+- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
++ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
+ <translation><h4>Gem</h4> <p><em>Gemmer</em> den aktive animation som en qStopMotion projekt fil. <BR>Er projektet tidligere gemt, vil det automatisk blive gemt som den tidligere gemte fil.</p></translation>
+ </message>
+ <message>
@@ -2409,7 +2409,7 @@ Du behøver ret til at læse, skrive og
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
@@ -362,9 +374,6 @@ Index: qstopmotion/translations/qstopmotion_da.ts
<translation>Noget fik qStopmotion til at stoppe uregelmæssigt
sidst. Ønsker du at genoprette?</translation>
</message>
-Index: qstopmotion/translations/qstopmotion_de.qm
-===================================================================
-Binary files qstopmotion.orig/translations/qstopmotion_de.qm and qstopmotion/translations/qstopmotion_de.qm differ
Index: qstopmotion/translations/qstopmotion_de.ts
===================================================================
--- qstopmotion.orig/translations/qstopmotion_de.ts
@@ -387,6 +396,15 @@ Index: qstopmotion/translations/qstopmotion_de.ts
without sound if you choose to play.</source>
<translation>Die ausgewählte Ton-Datei hat kein gültiges
Ton-Format. Die Animation wird ohne Ton abgespielt,
+@@ -1492,7 +1492,7 @@ Check your settings in the preferences m
+ </message>
+ <message>
+ <location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
+- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
++ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
+ <translation><h4>Speichern</h4> <p>Speichert die aktuelle Animation als qStopMotion Projektdatei. </p></translation>
+ </message>
+ <message>
@@ -2416,7 +2416,7 @@ Sie benötigen Rechte zum lesen, schreib
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
@@ -396,9 +414,6 @@ Index: qstopmotion/translations/qstopmotion_de.ts
<translation>Es sieht so aus, als wurde qStopmotion bei der letzten Nutzung nicht
ordentlich beendet. Möchten Sie die letzte Sitzung wiederherstellen?</translation>
</message>
-Index: qstopmotion/translations/qstopmotion_fr.qm
-===================================================================
-Binary files qstopmotion.orig/translations/qstopmotion_fr.qm and qstopmotion/translations/qstopmotion_fr.qm differ
Index: qstopmotion/translations/qstopmotion_fr.ts
===================================================================
--- qstopmotion.orig/translations/qstopmotion_fr.ts
@@ -421,6 +436,15 @@ Index: qstopmotion/translations/qstopmotion_fr.ts
without sound if you choose to play.</source>
<translation>Le fichier audio choisi n'a pas de format audio valide.
L'animation est visualisée sans son si vous choisissez de le lire.</translation>
+@@ -1464,7 +1464,7 @@ Check your settings in the properties di
+ </message>
+ <message>
+ <location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
+- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
++ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
+ <translation><h4>Enregistrer</h4> <p><em>Enregistre</em> l'animation courante sous forme de fichier projet qStopMotion. <BR>Si ce projet a été enregistré précédemment, il sera enregistré automatiquement dans le même fichier (écrasement).</p></translation>
+ </message>
+ <message>
@@ -2309,7 +2309,7 @@ Il vous faut des droits d'accès po
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
@@ -430,9 +454,6 @@ Index: qstopmotion/translations/qstopmotion_fr.ts
<translation>Probablement qStopMotion n'a pas été correctement terminé lors de le dernière séance.
Voulez-vous restaurer la dernière séance?</translation>
</message>
-Index: qstopmotion/translations/qstopmotion_se.qm
-===================================================================
-Binary files qstopmotion.orig/translations/qstopmotion_se.qm and qstopmotion/translations/qstopmotion_se.qm differ
Index: qstopmotion/translations/qstopmotion_se.ts
===================================================================
--- qstopmotion.orig/translations/qstopmotion_se.ts
@@ -454,6 +475,15 @@ Index: qstopmotion/translations/qstopmotion_se.ts
without sound if you choose to play.</source>
<translation>Den valda ljudfilen är inte i ett fungerande ljudformat. Animationen visas utan ljud om du väljer att spela.</translation>
</message>
+@@ -1706,7 +1706,7 @@ Kontrollera dina inställningar i menyn!
+ </message>
+ <message>
+ <location filename="../src/frontends/qtfrontend/mainwindowgui.cpp" line="274"/>
+- <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automaticly be saved to the previously selected file.</p></source>
++ <source><h4>Save</h4> <p><em>Saves</em> the current animation as a qStopMotion project file. <BR>If this project has been saved before it will automatically be saved to the previously selected file.</p></source>
+ <translation><h4>Spara</h4> <p><em>Sparar</em>den aktuella animationen som en qStopMotion projektfil. <BR>Om projektet sparats tidigare så sparas det automatiskt till samma projektfil.</p></translation>
+ </message>
+ <message>
@@ -2368,7 +2368,7 @@ Du behöver rättighet att läsa, skriva
<message>
<location filename="../src/frontends/qtfrontend/qtfrontend.cpp" line="902"/>
@@ -463,3 +493,31 @@ Index: qstopmotion/translations/qstopmotion_se.ts
<translation>Något orsakade att qStopMotion oväntat avslutades
vid senaste användningen. Vill du återskapa?</translation>
</message>
+Index: qstopmotion/src/frontends/qtfrontend/mainwindowgui.cpp
+===================================================================
+--- qstopmotion.orig/src/frontends/qtfrontend/mainwindowgui.cpp
++++ qstopmotion/src/frontends/qtfrontend/mainwindowgui.cpp
+@@ -274,7 +274,7 @@ void MainWindowGUI::retranslateHelpText(
+ tr("<h4>Save</h4> "
+ "<p><em>Saves</em> the current animation as a qStopMotion "
+ "project file. <BR>If this project has been saved before it will "
+- "automaticly be saved to the previously selected file.</p>");
++ "automatically be saved to the previously selected file.</p>");
+ saveAct->setWhatsThis(infoText);
+ infoText =
+ saveAct->toolTip().prepend(tr("Save project"));
+Index: qstopmotion/translations/qstopmotion_cs.qm
+===================================================================
+Binary files qstopmotion.orig/translations/qstopmotion_cs.qm and qstopmotion/translations/qstopmotion_cs.qm differ
+Index: qstopmotion/translations/qstopmotion_da.qm
+===================================================================
+Binary files qstopmotion.orig/translations/qstopmotion_da.qm and qstopmotion/translations/qstopmotion_da.qm differ
+Index: qstopmotion/translations/qstopmotion_de.qm
+===================================================================
+Binary files qstopmotion.orig/translations/qstopmotion_de.qm and qstopmotion/translations/qstopmotion_de.qm differ
+Index: qstopmotion/translations/qstopmotion_fr.qm
+===================================================================
+Binary files qstopmotion.orig/translations/qstopmotion_fr.qm and qstopmotion/translations/qstopmotion_fr.qm differ
+Index: qstopmotion/translations/qstopmotion_se.qm
+===================================================================
+Binary files qstopmotion.orig/translations/qstopmotion_se.qm and qstopmotion/translations/qstopmotion_se.qm differ
--
qstopmotion packaging
More information about the pkg-multimedia-commits
mailing list