marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 07:03:08 +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 2022-03-29 02:17:10 +00:00
parent 7ff5f2b0a9
commit 8e13435ccb
5 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
containments/panel/package/metadata.desktop
View file

@ -8,7 +8,7 @@ Name=Phone Panel
Name[ast]=Panel del teléfonu
Name[az]=Telefon paneli
Name[ca]=Plafó del telèfon
Name[ca@valencia]=Plafó del telèfon
Name[ca@valencia]=Quadre del telèfon
Name[cs]=Panel telefonu
Name[da]=Panel til telefon
Name[en_GB]=Phone Panel

2
containments/taskpanel/package/metadata.desktop
View file

@ -8,7 +8,7 @@ Name=Phone Task panel
Name[ast]=Panel de xeres del teléfonu
Name[az]=Telefon tapşırıq paneli
Name[ca]=Plafó de tasques del telèfon
Name[ca@valencia]=Plafó de tasques del telèfon
Name[ca@valencia]=Quadre de tasques del telèfon
Name[da]=Opgavepanel til telefon
Name[en_GB]=Phone Task panel
Name[es]=Panel de tareas del teléfono

5
kcms/mobileshell/package/metadata.desktop
View file

@ -11,6 +11,7 @@ Name[de]=Shell
Name[en_GB]=Shell
Name[es]=Intérprete de órdenes
Name[eu]=Oskola
Name[fi]=Komentotulkki
Name[fr]=Shell
Name[hi]=शेल
Name[hu]=Felület
@ -34,6 +35,7 @@ Comment[ca@valencia]=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[eu]=Konfiguratu sistemaren oskola
Comment[fi]=Aseta järjestelmän komentotulkki
Comment[fr]=Configurer le shell du système
Comment[hi]=तंत्र शेल विन्यस्त करें
Comment[hu]=A rendszerfelület beállítása
@ -69,10 +71,11 @@ 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[ca@valencia]=sistema,intèrpret d'ordres,plafó
X-KDE-Keywords[ca@valencia]=sistema,intèrpret d'ordres,quadre
X-KDE-Keywords[en_GB]=system,shell,panel
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
X-KDE-Keywords[fr]=système, shell, panneau
X-KDE-Keywords[hi]=तंत्र,शैल,पैनल
X-KDE-Keywords[hu]=rendszer,felület,panel

4
look-and-feel/metadata.desktop
View file

@ -6,7 +6,7 @@ Name=Plasma Phone
Name[ast]=Plasma Phone
Name[az]=Plasma Telefon
Name[ca]=Telèfon del Plasma
Name[ca@valencia]=Telèfon del Plasma
Name[ca@valencia]=Telèfon de Plasma
Name[cs]=Plasma Phone
Name[da]=Plasma Phone
Name[de]=Plasma Phone
@ -44,7 +44,7 @@ Comment=Plasma workspace for smartphones
Comment[ast]=La estaya de trabayu de Plasma pa teléfonos intelixentes
Comment[az]=Smartfonlar üçün Plasma iş sahəsi
Comment[ca]=Espai de treball del Plasma per a telèfons intel·ligents
Comment[ca@valencia]=Espai de treball del Plasma per a telèfons intel·ligents
Comment[ca@valencia]=Espai de treball de Plasma per a telèfons intel·ligents
Comment[da]=Plasma arbejdsområde til smartphones
Comment[de]=Plasma-Arbeitsbereich für Smartphones
Comment[en_GB]=Plasma workspace for smartphones

1
quicksettings/keyboardtoggle/metadata.desktop
View file

@ -10,6 +10,7 @@ Name[cs]=Přepínání virtuální klávesnice
Name[en_GB]=Virtual Keyboard Toggle
Name[es]=Conmutación del teclado virtual
Name[eu]=Alegiazko teklatua txandakatzea
Name[fi]=Näytä tai piilota näyttönäppäimistö
Name[fr]=Basculement vers /hors clavier virtuel
Name[hu]=Virtuális billentyűzet kapcsoló
Name[ia]=Commuta Claviero Virtual