marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 09:48:50 +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 2018-06-08 05:55:04 +02:00
parent b58419fb50
commit ff7b037422
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
applets/clock/metadata.desktop
View file

@ -9,6 +9,7 @@ Name[de]=Uhr
Name[el]=Ρολόι Name[el]=Ρολόι
Name[en_GB]=Clock Name[en_GB]=Clock
Name[es]=Reloj Name[es]=Reloj
Name[fr]=Horloge
Name[gl]=Reloxo Name[gl]=Reloxo
Name[it]=Orologio Name[it]=Orologio
Name[nl]=Klok Name[nl]=Klok

1
applets/quicksettings/package/metadata.desktop
View file

@ -8,6 +8,7 @@ Name[cs]=Rychlé nastavení
Name[de]=Schnelleinstellungen Name[de]=Schnelleinstellungen
Name[en_GB]=Quick Settings Name[en_GB]=Quick Settings
Name[es]=Ajustes rápidos Name[es]=Ajustes rápidos
Name[fr]=Paramètres rapides
Name[gl]=Configuración rápida Name[gl]=Configuración rápida
Name[it]=Impostazioni rapide Name[it]=Impostazioni rapide
Name[nl]=Snelle instellingen Name[nl]=Snelle instellingen