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

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 2024-09-17 01:23:52 +00:00
parent 564d8bbdf1
commit 369f250f17
6 changed files with 22 additions and 0 deletions

View file

@ -78,12 +78,16 @@
"X-KDE-Keywords": "mobile,data,network",
"X-KDE-Keywords[ca@valencia]": "mòbil,dades,xarxa",
"X-KDE-Keywords[ca]": "mòbil,dades,xarxa",
"X-KDE-Keywords[cs]": "mobilní,data,síť",
"X-KDE-Keywords[en_GB]": "mobile,data,network",
"X-KDE-Keywords[es]": "móvil,datos,red",
"X-KDE-Keywords[fr]": "mobile, data, réseau",
"X-KDE-Keywords[gl]": "móbil,datos,rede",
"X-KDE-Keywords[he]": "נייד,נתונים,רשת,פס רחב",
"X-KDE-Keywords[ia]": "mobile,data,network",
"X-KDE-Keywords[it]": "mobile,dati,rete",
"X-KDE-Keywords[ka]": "mobile,data,network,მობილური ინტერნეტი,ქსელი",
"X-KDE-Keywords[nl]": "mobiel,gegevens,netwerk",
"X-KDE-Keywords[sl]": "mobilnik,podatki,omrežje",
"X-KDE-Keywords[sv]": "mobil,data,nätverk",
"X-KDE-Keywords[tr]": "mobil,cep,taşınabilir,veri,ağ",

View file

@ -81,12 +81,16 @@
"X-KDE-Keywords": "info, distro, system",
"X-KDE-Keywords[ca@valencia]": "informació,distribució,sistema",
"X-KDE-Keywords[ca]": "informació,distribució,sistema",
"X-KDE-Keywords[cs]": "informace, distribuce, systém",
"X-KDE-Keywords[en_GB]": "info, distro, system",
"X-KDE-Keywords[es]": "información,distribución,sistema",
"X-KDE-Keywords[fr]": "info, distribution, système",
"X-KDE-Keywords[gl]": "info, información, distro, distribución, sistema",
"X-KDE-Keywords[he]": "פרטים,מידע,הפצה,מערכת",
"X-KDE-Keywords[ia]": "info, distro, system",
"X-KDE-Keywords[it]": "info,distribuzione,sistema",
"X-KDE-Keywords[ka]": "info, distro, system, ინფორმაცია, დისტრიბუტივი, სისტემა",
"X-KDE-Keywords[nl]": "informatie, distributie, systeem",
"X-KDE-Keywords[sl]": "informacije,distribucija,sistem",
"X-KDE-Keywords[sv]": "information, distribution, system",
"X-KDE-Keywords[tr]": "bilgi,dağıtım,distro,sistem",

View file

@ -81,11 +81,14 @@
"X-KDE-Keywords[ca@valencia]": "vídeo,monitor,gràfics,temps d'espera,dormir,bloqueig,bloqueig de pantalla,estil de pantalla",
"X-KDE-Keywords[ca]": "vídeo,monitor,gràfics,temps d'espera,dormir,bloqueig,bloqueig de pantalla,estil de pantalla",
"X-KDE-Keywords[en_GB]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
"X-KDE-Keywords[es]": "vídeo,monitor,gráficos,tiempo de espera,reposo,bloqueo,bloqueo de la pantalla,salvapantallas",
"X-KDE-Keywords[fr]": "vidéo, moniteur, graphique, délai d'attente, veille, verrouillage, bloqueur d'écran, économiseur d'écran",
"X-KDE-Keywords[gl]": "vídeo, monitor, gráficos, tempo límite, hibernar, bloquear, bloqueador de pantalla, salvapantallas",
"X-KDE-Keywords[he]": "וידאו,צג,תצוגה,מסך,מקרן,גרפיקה,תום זמן,המתנה,השהיה,שינה,נעילה,נועל מסך,שומר מסך",
"X-KDE-Keywords[ia]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver",
"X-KDE-Keywords[it]": "video,monitor,grafica,timeout,sospensione,blocco,blocco dello schermo,salvaschermo",
"X-KDE-Keywords[ka]": "video, monitor, graphics, timeout, sleep, lock, screenlocker, screensaver, ეკრანის შემნახველი, ვიდეო, ეკრანი, გრაფიკა, მოლოდინის დრო, ძილი",
"X-KDE-Keywords[nl]": "video, monitor, grafische elementen, timeout, slapen, vergrendeling, schermvergrendeling, schermbeveiliging",
"X-KDE-Keywords[sl]": "video, monitor, grafika, časovna omejitev, spanje, zaklepanje, zaklepanje zaslona, ohranjevalnik zaslona",
"X-KDE-Keywords[sv]": "video, bildskärm, grafik, tidsgräns, viloläge, lår, skärmlåsning, skärmsläckare",
"X-KDE-Keywords[tr]": "video,monitör,ekran,görüntü,grafik,zaman aşımı,uyku,kilit,ekran kilidi,ekran koruyucusu",

View file

@ -81,12 +81,16 @@
"X-KDE-Keywords": "theme, look, feel",
"X-KDE-Keywords[ca@valencia]": "tema,aspecte,comportament",
"X-KDE-Keywords[ca]": "tema,aspecte,comportament",
"X-KDE-Keywords[cs]": "motiv,vzhled,chování",
"X-KDE-Keywords[en_GB]": "theme, look, feel",
"X-KDE-Keywords[es]": "tema,aspecto",
"X-KDE-Keywords[fr]": "thème, apparence, sensation",
"X-KDE-Keywords[gl]": "tema, aparencia, estilo, comportamento",
"X-KDE-Keywords[he]": "ערכת עיצוב,מראה,תחושה",
"X-KDE-Keywords[ia]": "thema, semblantia, apparentia",
"X-KDE-Keywords[it]": "tema, aspetto",
"X-KDE-Keywords[ka]": "theme, look, feel, თემა, გარეგნობა",
"X-KDE-Keywords[nl]": "thema, uiterlijk, gedrag",
"X-KDE-Keywords[sl]": "tema, videz, občutek",
"X-KDE-Keywords[sv]": "tema, utseende, känsla",
"X-KDE-Keywords[tr]": "tema,görünüm,görünüş,his,bakış",

View file

@ -122,11 +122,14 @@
"X-KDE-Keywords[ca@valencia]": "en pantalla,osk,teclat virtual,teclat",
"X-KDE-Keywords[ca]": "en pantalla,osk,teclat virtual,teclat",
"X-KDE-Keywords[en_GB]": "onscreen,osk,virtualkeyboard,keyboard",
"X-KDE-Keywords[es]": "en pantalla,osk,teclado virtual,teclado",
"X-KDE-Keywords[fr]": "à l'écran, incrustation vidéo, clavier virtuel, clavier",
"X-KDE-Keywords[gl]": "onscreen,en pantalla,osk,virtualkeyboard,teclado virtual,keyboard,teclado",
"X-KDE-Keywords[he]": "על המסך,מקלדת על המסך,מקלדת וירטואלית,מקלדת",
"X-KDE-Keywords[ia]": "onscreen,osk,virtualkeyboard,keyboard",
"X-KDE-Keywords[it]": "onscreen,osk,tastiera virtuale,tastiera",
"X-KDE-Keywords[ka]": "onscreen,osk,virtualkeyboard,keyboard,ეკრანზე, კლავიატურა ეკრანზე, კლავიატურა",
"X-KDE-Keywords[nl]": "op-scherm,osk,virtueel toetsenbord,toetsenbord",
"X-KDE-Keywords[sl]": "na zaslonu,osk,virtualna tipkovnica,tipkovnica",
"X-KDE-Keywords[sv]": "på skärmen,virtuellt tangentbord,tangentbord",
"X-KDE-Keywords[tr]": "ekran üzeri,ekran,osk,osd,sanal klavye,klavye,düğme",

View file

@ -86,12 +86,16 @@
"X-KDE-Keywords": "wifi,network",
"X-KDE-Keywords[ca@valencia]": "wi-fi,xarxa",
"X-KDE-Keywords[ca]": "wi-fi,xarxa",
"X-KDE-Keywords[cs]": "wifi,síť",
"X-KDE-Keywords[en_GB]": "wifi,network",
"X-KDE-Keywords[es]": "wifi,red",
"X-KDE-Keywords[fr]": "wifi, réseau",
"X-KDE-Keywords[gl]": "sen fíos,wifi,rede",
"X-KDE-Keywords[he]": "רשת אלחוטית,רשת,תקשורת",
"X-KDE-Keywords[ia]": "wifi,network",
"X-KDE-Keywords[it]": "wifi,rete",
"X-KDE-Keywords[ka]": "wifi,network, ქსელი",
"X-KDE-Keywords[nl]": "wifi,netwerk",
"X-KDE-Keywords[sl]": "wifi,omrežje",
"X-KDE-Keywords[sv]": "wifi,nätverk",
"X-KDE-Keywords[tr]": "wifi,wi-fi,ağ",