marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-08-02 17:54: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 2017-09-11 04:59:00 +02:00
parent f3cd4698da
commit 51f9dcce9f
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4,6 +4,7 @@ Name=Quick Settings
Name[ast]=Axustes rápidos Name[ast]=Axustes rápidos
Name[ca]=Opcions ràpides Name[ca]=Opcions ràpides
Name[cs]=Rychlé nastavení Name[cs]=Rychlé nastavení
Name[de]=Schnelleinstellungen
Name[es]=Ajustes rápidos Name[es]=Ajustes rápidos
Name[nl]=Snelle instellingen Name[nl]=Snelle instellingen
Name[nn]=Snøgginnstillingar Name[nn]=Snøgginnstillingar