Skip to content

Commit

Permalink
Merge branch 'master' into rakekniven-patch-2
Browse files Browse the repository at this point in the history
  • Loading branch information
rakekniven authored May 5, 2022
2 parents ef0c5d0 + ae0528e commit f8ae4d8
Show file tree
Hide file tree
Showing 56 changed files with 312 additions and 32 deletions.
5 changes: 5 additions & 0 deletions translations/client_bg.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation>За повече дейности, моля, отворете приложението Дейност.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_br.ts
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation>Evit muioc&apos;h a oberniantiz digorit ar meziant oberiantiz.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_ca.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation>Per a veure més activitats, obriu l&apos;aplicació Activitat.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_cs.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ Současně tato akce zruší jakoukoli právě probíhající synchronizaci.</tr
<source>For more activities please open the Activity app.</source>
<translation>Více z aktivit si zobrazíte otevřením aplikace Aktivity</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_da.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ Denne handling vil annullere alle i øjeblikket kørende synkroniseringer.</tran
<source>For more activities please open the Activity app.</source>
<translation>For flere aktiviteter åbn Activity app&apos;n.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_de.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ Diese Aktion bricht jede derzeit laufende Synchronisierung ab.</translation>
<source>For more activities please open the Activity app.</source>
<translation>Um weitere Aktivitäten anzusehen bitte die Activity-App öffnen.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_el.ts
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation>Για εμφάνιση περισσότερων δραστηριοτήτων παρακαλώ ανοίξτε την εφαρμογή Activity.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_en_GB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_eo.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ Además, esta acción interrumpirá cualquier sincronización en curso.</transla
<source>For more activities please open the Activity app.</source>
<translation>Para más detalles, por favor, abre la app Actividades.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_AR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_CL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_CO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_CR.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_DO.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_EC.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_GT.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_HN.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_MX.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_es_SV.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_et.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_eu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ Ekintza honek unean uneko sinkronizazioa bertan behera utziko du.</translation>
<source>For more activities please open the Activity app.</source>
<translation>Jarduera gehiagorako ireki Jarduerak aplikazioa.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_fa.ts
Original file line number Diff line number Diff line change
Expand Up @@ -799,6 +799,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_fi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -803,6 +803,11 @@ Tämä toiminto peruu kaikki tämänhetkiset synkronoinnit.</translation>
<source>For more activities please open the Activity app.</source>
<translation>Lisää tapahtumia löydät Tapahtumat-sovelluksesta.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
25 changes: 15 additions & 10 deletions translations/client_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="221"/>
<source>Decline</source>
<translation type="unfinished"/>
<translation>Refuser</translation>
</message>
<message>
<location filename="../src/gui/tray/CallNotificationDialog.qml" line="237"/>
Expand Down Expand Up @@ -331,17 +331,17 @@
<message>
<location filename="../src/libsync/account.cpp" line="873"/>
<source>File %1 is already locked by %2.</source>
<translation type="unfinished"/>
<translation>Le fichier %1 est déjà verrouillé par %2.</translation>
</message>
<message>
<location filename="../src/libsync/account.cpp" line="875"/>
<source>Lock operation on %1 failed with error %2</source>
<translation type="unfinished"/>
<translation>L&apos;opération de verrouillage de %1 a échoué avec l&apos;erreur %2</translation>
</message>
<message>
<location filename="../src/libsync/account.cpp" line="877"/>
<source>Unlock operation on %1 failed with error %2</source>
<translation type="unfinished"/>
<translation>L&apos;opération de déverrouillage de %1 a échoué avec l&apos;erreur %2</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -804,9 +804,14 @@ Vous prenez vos propres risques.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<source>Fetching activities</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
<translation>Rapatriement des activités...</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="558"/>
<source>Files from the ignore list as well as symbolic links are not synced.</source>
Expand Down Expand Up @@ -2169,7 +2174,7 @@ S&apos;il s&apos;agissait d&apos;un accident et que vous choisissiez de conserve
<message>
<location filename="../src/gui/generalsettings.ui" line="96"/>
<source>Show Call Notifications</source>
<translation type="unfinished"/>
<translation>Afficher les notifications des appels</translation>
</message>
<message>
<location filename="../src/gui/generalsettings.ui" line="106"/>
Expand Down Expand Up @@ -4157,7 +4162,7 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="131"/>
<source>Reply</source>
<translation type="unfinished"/>
<translation>Répondre</translation>
</message>
<message>
<location filename="../src/gui/tray/notificationhandler.cpp" line="163"/>
Expand Down Expand Up @@ -4625,17 +4630,17 @@ Il s&apos;agit d&apos;un nouveau mode expérimental. Si vous décidez de l&apos;
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1083"/>
<source>Lock file</source>
<translation type="unfinished"/>
<translation>Verrouiller le fichier</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1086"/>
<source>Unlock file</source>
<translation type="unfinished"/>
<translation>Déverrouiller le fichier</translation>
</message>
<message>
<location filename="../src/gui/socketapi/socketapi.cpp" line="1101"/>
<source>Locked by %1</source>
<translation type="unfinished"/>
<translation>Verrouillé par %1</translation>
</message>
<message numerus="yes">
<location filename="../src/gui/socketapi/socketapi.cpp" line="1105"/>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_gl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -804,6 +804,11 @@ Esta acción interromperá calquera sincronización que estea a executarse actua
<source>For more activities please open the Activity app.</source>
<translation>Para máis actividades, abra a aplicación Actividade.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
5 changes: 5 additions & 0 deletions translations/client_he.ts
Original file line number Diff line number Diff line change
Expand Up @@ -800,6 +800,11 @@ This action will abort any currently running synchronization.</source>
<source>For more activities please open the Activity app.</source>
<translation>לפעילויות נוספות נא לפתוח את יישומון הפעילויות.</translation>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities…</source>
<translation type="unfinished"/>
</message>
<message>
<location filename="../src/gui/tray/activitylistmodel.cpp" line="486"/>
<source>Fetching activities...</source>
Expand Down
Loading

0 comments on commit f8ae4d8

Please sign in to comment.