mirror of
https://invent.kde.org/marcoa/shift-shell.git
synced 2026-04-26 14:23:09 +00:00
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:
parent
64a4487c6b
commit
bd287571e8
5 changed files with 5 additions and 0 deletions
|
|
@ -47,6 +47,7 @@
|
|||
"Description": "System navigation initialstart module for Plasma Mobile",
|
||||
"Description[ca@valencia]": "Mòdul de començament inicial de navegació del sistema per a Plasma Mobile",
|
||||
"Description[ca]": "Mòdul de començament inicial de navegació del sistema per al Plasma Mobile",
|
||||
"Description[eo]": "Sistemnaviga prakomenca modulo por Plasma Mobile",
|
||||
"Description[es]": "Módulo de navegación del sistema del primer inicio para Plasma Mobile",
|
||||
"Description[fr]": "Module de démarrage initial pour le système de navigation pour Plasma Mobile",
|
||||
"Description[he]": "מודול להפעלה ראשונית של ניווט במערכת לפלזמה לניידים",
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@
|
|||
"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[eo]": "informo, eldono, sistemo",
|
||||
"X-KDE-Keywords[es]": "información,distribución,sistema",
|
||||
"X-KDE-Keywords[eu]": "info,informazioa,distro,banaketa,sistema",
|
||||
"X-KDE-Keywords[fi]": "tietoa,jakelu,distro,järjestelmä",
|
||||
|
|
|
|||
|
|
@ -138,6 +138,7 @@
|
|||
"X-KDE-Keywords[ca@valencia]": "sistema,intèrpret d'ordres,quadro",
|
||||
"X-KDE-Keywords[ca]": "sistema,intèrpret d'ordres,plafó",
|
||||
"X-KDE-Keywords[en_GB]": "system,shell,panel",
|
||||
"X-KDE-Keywords[eo]": "sistemo,ŝelo,panelo",
|
||||
"X-KDE-Keywords[es]": "sistema,intérprete,intérprete de órdenes,panel",
|
||||
"X-KDE-Keywords[eu]": "sistema,shell,oskola,panela",
|
||||
"X-KDE-Keywords[fi]": "järjestelmä,komentotulkki,paneeli",
|
||||
|
|
|
|||
|
|
@ -87,6 +87,7 @@
|
|||
"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[eo]": "etoso, aspekto, sento",
|
||||
"X-KDE-Keywords[es]": "tema,aspecto",
|
||||
"X-KDE-Keywords[eu]": "gaia, itxura, izaera",
|
||||
"X-KDE-Keywords[fi]": "teema,ulkoasu,tuntuma",
|
||||
|
|
|
|||
|
|
@ -127,6 +127,7 @@
|
|||
"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[eo]": "surekrana,osk,virtualklavaro,klavaro",
|
||||
"X-KDE-Keywords[es]": "en pantalla,osk,teclado virtual,teclado",
|
||||
"X-KDE-Keywords[eu]": "pantailako,osk,alegiazko teklatua,teklatu birtuala,teklatua",
|
||||
"X-KDE-Keywords[fi]": "ruutunäyttö,näyttönäppäimistö,virtuaalinäppäimistö,näppäimistö",
|
||||
|
|
|
|||
Loading…
Reference in a new issue