marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-26 14:23:09 +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 2021-09-18 02:13:25 +00:00
parent 6d1a9ed153
commit 50a50dd28d
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plasma_phone_components.notifyrc
View file

@ -30,7 +30,7 @@ Name[zh_CN]=Plasma
[Event/captured]
Name=Captured
Name[ca]=Captura
Name[ca]=Capturat
Name[cs]=Zachyceno
Name[de]=Aufgenommen
Name[en_GB]=Captured
@ -55,7 +55,7 @@ Name[uk]=Захоплено
Name[x-test]=xxCapturedxx
Name[zh_CN]=已捕获
Comment=Captured
Comment[ca]=Captura
Comment[ca]=Capturat
Comment[cs]=Zachyceno
Comment[de]=Aufgenommen
Comment[en_GB]=Captured

7
quicksettings/airplanemode/metadata.desktop
View file

@ -1,5 +1,12 @@
[Desktop Entry]
Name=Airplane Mode
Name[ca]=Mode avió
Name[es]=Modo avión
Name[ia]=Modo aeroplano
Name[nl]=Vliegtuigmodus
Name[sv]=Flygplansläge
Name[uk]=Режим польоту
Name[x-test]=xxAirplane Modexx
Icon=network-flightmode-on
Type=Service