marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-03 02:04: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 2022-06-07 02:21:44 +00:00
parent 8d1263722c
commit b9f9066880
3 changed files with 3 additions and 3 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[ast]=Panel del teléfonu
Name[az]=Telefon paneli Name[az]=Telefon paneli
Name[ca]=Plafó del telèfon Name[ca]=Plafó del telèfon
Name[ca@valencia]=Quadre del teléfon Name[ca@valencia]=Quadro del teléfon
Name[cs]=Panel telefonu Name[cs]=Panel telefonu
Name[da]=Panel til telefon Name[da]=Panel til telefon
Name[en_GB]=Phone Panel 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[ast]=Panel de xeres del teléfonu
Name[az]=Telefon tapşırıq paneli Name[az]=Telefon tapşırıq paneli
Name[ca]=Plafó de tasques del telèfon Name[ca]=Plafó de tasques del telèfon
Name[ca@valencia]=Quadre de tasques del teléfon Name[ca@valencia]=Quadro de tasques del teléfon
Name[da]=Opgavepanel til telefon Name[da]=Opgavepanel til telefon
Name[en_GB]=Phone Task panel Name[en_GB]=Phone Task panel
Name[es]=Panel de tareas del teléfono Name[es]=Panel de tareas del teléfono

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

@ -79,7 +79,7 @@ X-KDE-PluginInfo-EnabledByDefault=true
X-KDE-Keywords=system,shell,panel X-KDE-Keywords=system,shell,panel
X-KDE-Keywords[az]=sistem,örtük,panel X-KDE-Keywords[az]=sistem,örtük,panel
X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó X-KDE-Keywords[ca]=sistema,intèrpret d'ordres,plafó
X-KDE-Keywords[ca@valencia]=sistema,intérpret d'ordres,quadre X-KDE-Keywords[ca@valencia]=sistema,intérpret d'ordres,quadro
X-KDE-Keywords[en_GB]=system,shell,panel X-KDE-Keywords[en_GB]=system,shell,panel
X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel X-KDE-Keywords[es]=sistema,intérprete,intérprete de órdenes,panel
X-KDE-Keywords[eu]=sistema,shell,oskola,panela X-KDE-Keywords[eu]=sistema,shell,oskola,panela