marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-07-26 14:24:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

SVN_SILENT made messages (.desktop file) - always resolve ours

Browse source 
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2020-12-18 06:36:59 +01:00
parent 8014d1000c
commit 3772f6186a
2 changed files with 5 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
applets/krunner/metadata.desktop
View file

@ -12,6 +12,7 @@ Name[et]=Otsimine ja käivitamine
Name[eu]=Bilatu eta exekutatu Name[eu]=Bilatu eta exekutatu
Name[fi]=Etsi ja käynnistä Name[fi]=Etsi ja käynnistä
Name[fr]=Chercher et lancer Name[fr]=Chercher et lancer
Name[hu]=Keresés és indítás
Name[ia]=Cerca e Exeque Name[ia]=Cerca e Exeque
Name[id]=Cari Dan Jalankan Name[id]=Cari Dan Jalankan
Name[it]=Cerca e avvia Name[it]=Cerca e avvia
@ -43,6 +44,7 @@ Comment[et]=Rakenduste ja teenuste otsimine ja käivitamine
Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak Comment[eu]=Bilatu eta exekutatu aplikazioak eta zerbitzuak
Comment[fi]=Etsi ja käynnistä sovelluksia ja palveluja Comment[fi]=Etsi ja käynnistä sovelluksia ja palveluja
Comment[fr]=Chercher et lancer des applications et des services Comment[fr]=Chercher et lancer des applications et des services
Comment[hu]=Alkalmazások és szolgáltatások keresése és indítása
Comment[ia]=Cerca e Exeque Applicatione e Servicios Comment[ia]=Cerca e Exeque Applicatione e Servicios
Comment[id]=Cari dan jalankan Aplikasi dan layanan Comment[id]=Cari dan jalankan Aplikasi dan layanan
Comment[it]=Cerca e avvia applicazioni e servizi Comment[it]=Cerca e avvia applicazioni e servizi

3
plasma_phone_components.notifyrc
View file

@ -6,6 +6,7 @@ Name[ca]=Plasma
Name[cs]=Plasma Name[cs]=Plasma
Name[en_GB]=Plasma Name[en_GB]=Plasma
Name[es]=Plasma Name[es]=Plasma
Name[hu]=Plasma
Name[ia]=Plasma Name[ia]=Plasma
Name[it]=Plasma Name[it]=Plasma
Name[nl]=Plasma Name[nl]=Plasma
@ -23,6 +24,7 @@ Name=Captured
Name[ca]=Captura Name[ca]=Captura
Name[en_GB]=Captured Name[en_GB]=Captured
Name[es]=Capturado Name[es]=Capturado
Name[hu]=Rögzítve
Name[ia]=Capturate Name[ia]=Capturate
Name[it]=Catturato Name[it]=Catturato
Name[nl]=Opgenomen Name[nl]=Opgenomen
@ -37,6 +39,7 @@ Comment=Captured
Comment[ca]=Captura Comment[ca]=Captura
Comment[en_GB]=Captured Comment[en_GB]=Captured
Comment[es]=Capturado Comment[es]=Capturado
Comment[hu]=Rögzítve
Comment[ia]=Capturate Comment[ia]=Capturate
Comment[it]=Catturato Comment[it]=Catturato
Comment[nl]=Opgenomen Comment[nl]=Opgenomen