Commit c1fa6eee authored by Laurent Montel's avatar Laurent Montel 😁
Browse files

Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
	CMakeLists.txt
	agents/folderarchiveagent.desktop
	console/kabcclient/doc/examples/letters/home_address.desktop
	console/kabcclient/doc/examples/letters/work_address.desktop
	examples/mailreader/kmail-plasma/plasma-applet-kpapplet.desktop
	kalarm/resources/kalarm_manager.desktop
	kalarm/resources/local.desktop
	kalarm/resources/localdir.desktop
	kalarm/resources/remote.desktop
	kjots/plasmoid/akonotes.desktop
	kjots/plasmoid/akonotes_list.desktop
	kjots/plasmoid/akonotes_note.desktop
	kmail/dialog/addemailtoexistingcontactdialog.cpp
	knode/KNode.desktop
	knode/knode_config_accounts.desktop
	knode/knode_config_appearance.desktop
	knode/knode_config_cleanup.desktop
	knode/knode_config_identity.desktop
	knode/knode_config_post_news.desktop
	knode/knode_config_privacy.desktop
	knode/knode_config_read_news.desktop
	kontact/plugins/knode/knode.setdlg
	kontact/plugins/knode/knodeplugin.desktop
	kontact/plugins/ktimetracker/ktimetracker.setdlg
	kontact/plugins/ktimetracker/ktimetracker_plugin.desktop
	kontact/plugins/planner/kcmplanner.desktop
	kontact/plugins/planner/planner.setdlg
	kontact/plugins/planner/plannerplugin.desktop
	kresources/blog/blog.desktop
	kresources/remote/remote.desktop
	ktimetracker/ktimetracker_config_behavior.desktop
	ktimetracker/ktimetracker_config_display.desktop
	ktimetracker/ktimetracker_config_storage.desktop
	ktimetracker/ktimetrackerpart.desktop
	ktimetracker/support/ktimetracker.desktop
parents ab4c561e 1655bd22
......@@ -17,6 +17,7 @@ Name[el]=KAlarm
Name[en_GB]=KAlarm
Name[eo]=Alarmilo
Name[es]=KAlarm
Name[et]=KAlarm
Name[eu]=KAlarm
Name[fi]=KAlarm
Name[fr]=KAlarm
......@@ -85,6 +86,7 @@ Comment[de]=Autostart von KAlarm bei der Anmeldung
Comment[el]=Αυτόματη εκκίνηση του KAlarm κατά τη σύνδεση
Comment[en_GB]=KAlarm autostart at login
Comment[es]=Inicio automático de KAlarm al iniciar sesión
Comment[et]=KAlarmi automaatne käivitamine sisselogimisel
Comment[fi]=KAlarmin automaattikäynnistys kirjauduttaessa
Comment[fr]=Démarrage à la connexion de KAlarm
Comment[ga]=Tosaigh KAlarm go huathoibríoch ag am logála isteach
......
......@@ -17,6 +17,7 @@ Name[el]=KAlarm
Name[en_GB]=KAlarm
Name[eo]=Alarmilo
Name[es]=KAlarm
Name[et]=KAlarm
Name[eu]=KAlarm
Name[fi]=KAlarm
Name[fr]=KAlarm
......@@ -88,6 +89,7 @@ GenericName[el]=Προσωπικός προγραμματιστής συναγε
GenericName[en_GB]=Personal Alarm Scheduler
GenericName[eo]=Persona alarmplanilo
GenericName[es]=Planificador de alarmas personal
GenericName[et]=Meeldetuletuste ajastaja
GenericName[eu]=Alarma pertsonalen programatzailea
GenericName[fa]=زمان‌بند هشدار شخصی
GenericName[fi]=Henkilökohtainen hälytysajastin
......
......@@ -16,6 +16,7 @@ Name[el]=KAlarm
Name[en_GB]=KAlarm
Name[eo]=Alarmilo
Name[es]=KAlarm
Name[et]=KAlarm
Name[eu]=KAlarm
Name[fi]=KAlarm
Name[fr]=KAlarm
......@@ -80,6 +81,7 @@ Name[de]=Den Zeitpunkt zum Aufwachen gemäß der Echtzeituhr setzen
Name[el]=Ρύθμιση της ώρας ξυπνήματος RTC
Name[en_GB]=Set RTC wakeup time
Name[es]=Establecer hora de despertar RTC
Name[et]=RTC äratusaja määramine
Name[fi]=Aseta RTC-herätysaika
Name[fr]=Définir l'heure de réveil RTC
Name[gl]=Configurar a hora de espertar RTC
......@@ -121,6 +123,7 @@ Description[de]=Den Zeitpunkt zum Aufwachen aus dem Ruhezustand gemäß der Echt
Description[el]=Ρύθμιση της ώρας RTC «ξύπνημα από αναστολή»
Description[en_GB]=Set RTC wake-from-suspend time
Description[es]=Establecer hora despertar-desde-suspendido RTC
Description[et]=RTC uneseisundist ärkamise aja määramine
Description[fi]=Aseta RTC:n herätys keskeytyksistä -aika
Description[fr]=Définir l'heure de réveil RTC depuis la mise en veille
Description[gl]=Configurar a hora de «espertar desde a suspensión» de RTC
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment