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 2022-02-20 01:48:09 +00:00
parent 234dc12901
commit 27297c445a
4 changed files with 14 additions and 0 deletions

View file

@ -5,11 +5,13 @@
Name=Shell
Name[az]=Örtük
Name[ca]=Intèrpret d'ordres
Name[en_GB]=Shell
Name[es]=Intérprete de órdenes
Name[fr]=Shell
Name[hi]=
Name[hu]=Felület
Name[nl]=Shell
Name[nn]=Skal
Name[ro]=Interpretor
Name[sl]=Shell
Name[sv]=Skal
@ -18,11 +20,13 @@ Name[x-test]=xxShellxx
Comment=Configure the system shell
Comment[az]=Sistem
Comment[ca]=Configura l'intèrpret d'ordres del sistema
Comment[en_GB]=Configure the system shell
Comment[es]=Configura el intérprete de órdenes del sistema
Comment[fr]=Configurer le shell du système
Comment[hi]= ि
Comment[hu]=A rendszerfelület beállítása
Comment[nl]=De systeem-shell configureren
Comment[nn]=Set opp systemskalet
Comment[ro]=Configurează interpretorul sistemului
Comment[sl]=Nastavi sistemski shell
Comment[sv]=Anpassa systemskalet
@ -47,11 +51,13 @@ X-KDE-PluginInfo-EnabledByDefault=true
X-KDE-Keywords=system,shell,panel
X-KDE-Keywords[az]=sistem,örtük,panel
X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó
X-KDE-Keywords[en_GB]=system,shell,panel
X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
X-KDE-Keywords[fr]=système, shell, panneau
X-KDE-Keywords[hi]=,,
X-KDE-Keywords[hu]=rendszer,felület,panel
X-KDE-Keywords[nl]=systeem,shell,paneel
X-KDE-Keywords[nn]=system,skal,shell,panel
X-KDE-Keywords[ro]=sistem,interpretor,panou
X-KDE-Keywords[sl]=sistem,shell,kontrolna plošča
X-KDE-Keywords[sv]=system,skal,panel

View file

@ -5,11 +5,13 @@
Name=Caffeine
Name[az]=Caffeine
Name[ca]=Caffeine
Name[en_GB]=Caffeine
Name[es]=Cafeína
Name[fr]=Caffeine
Name[hi]=
Name[hu]=Caffeine
Name[nl]=Cafeïne
Name[nn]=Caffeine
Name[ro]=Cafeină
Name[sl]=Caffeine
Name[sv]=Koffein

View file

@ -4,9 +4,13 @@
[Desktop Entry]
Name=Virtual Keyboard Toggle
Name[ca]=Commutació del teclat virtual
Name[en_GB]=Virtual Keyboard Toggle
Name[es]=Conmutación del teclado virtual
Name[fr]=Basculement vers /hors clavier virtuel
Name[hu]=Virtuális billentyűzet kapcsoló
Name[nl]=Omschakeling van virtueel toetsenbord
Name[sl]=Preklop navidezne tipkovnice
Name[sv]=Visa eller dölj virtuellt tangentbord
Name[uk]=Перемикання віртуальної клавіатури
Name[x-test]=xxVirtual Keyboard Togglexx
Icon=input-keyboard-virtual

View file

@ -5,11 +5,13 @@
Name=Power Menu
Name[az]=Güc menyusu
Name[ca]=Power Menu
Name[en_GB]=Power Menu
Name[es]=Menú de energía
Name[fr]=Menu « Énergie »
Name[hi]=
Name[hu]=Energia menü
Name[nl]=Energiemenu
Name[nn]=Kraftmeny
Name[ro]=Meniu avansat
Name[sl]=Meni energije
Name[sv]=Strömmeny