Skip to content

Commit

Permalink
FORMAT: Removed CRLF line endings
Browse files Browse the repository at this point in the history
  • Loading branch information
Krzmbrzl committed Mar 28, 2021
1 parent 0343d2b commit 0c26ff1
Show file tree
Hide file tree
Showing 9 changed files with 974 additions and 974 deletions.
46 changes: 23 additions & 23 deletions 3rdPartyLicenses/boost_license.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
Boost Software License - Version 1.0 - August 17th, 2003
Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:
The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
Boost Software License - Version 1.0 - August 17th, 2003

Permission is hereby granted, free of charge, to any person or organization
obtaining a copy of the software and accompanying documentation covered by
this license (the "Software") to use, reproduce, display, distribute,
execute, and transmit the Software, and to prepare derivative works of the
Software, and to permit third-parties to whom the Software is furnished to
do so, all subject to the following:

The copyright notices in the Software and this entire statement, including
the above license grant, this restriction and the following disclaimer,
must be included in all copies of the Software, in whole or in part, and
all derivative works of the Software, unless such copies or derivative
works are solely in the form of machine-executable object code generated by
a source language processor.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
DEALINGS IN THE SOFTWARE.
1,040 changes: 520 additions & 520 deletions 3rdPartyLicenses/libdaemon_license.txt

Large diffs are not rendered by default.

700 changes: 350 additions & 350 deletions 3rdPartyLicenses/libjpeg_turbo_license.txt

Large diffs are not rendered by default.

28 changes: 14 additions & 14 deletions 3rdPartyLicenses/mariadb_c_connector_license.txt
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.
This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
License as published by the Free Software Foundation; either
version 2.1 of the License, or (at your option) any later version.

This library is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.

You should have received a copy of the GNU Lesser General Public
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
02110-1301 USA
12 changes: 6 additions & 6 deletions 3rdPartyLicenses/sqlite3_license.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The author disclaims copyright to this source code. In place of
a legal notice, here is a blessing:
May you do good and not evil.
May you find forgiveness for yourself and forgive others.
May you share freely, never taking more than you give.
The author disclaims copyright to this source code. In place of
a legal notice, here is a blessing:

May you do good and not evil.
May you find forgiveness for yourself and forgive others.
May you share freely, never taking more than you give.
38 changes: 19 additions & 19 deletions 3rdPartyLicenses/zlib_license.txt
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
(C) 1995-2017 Jean-loup Gailly and Mark Adler
This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.
Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:
1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.
Jean-loup Gailly Mark Adler
(C) 1995-2017 Jean-loup Gailly and Mark Adler

This software is provided 'as-is', without any express or implied
warranty. In no event will the authors be held liable for any damages
arising from the use of this software.

Permission is granted to anyone to use this software for any purpose,
including commercial applications, and to alter it and redistribute it
freely, subject to the following restrictions:

1. The origin of this software must not be misrepresented; you must not
claim that you wrote the original software. If you use this software
in a product, an acknowledgment in the product documentation would be
appreciated but is not required.
2. Altered source versions must be plainly marked as such, and must not be
misrepresented as being the original software.
3. This notice may not be removed or altered from any source distribution.

Jean-loup Gailly Mark Adler
[email protected] [email protected]
18 changes: 9 additions & 9 deletions helpers/vcpkg/ports/zeroc-ice/CONTROL
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
Source: zeroc-ice
Version: 3.7.3
Homepage: https://github.com/zeroc-ice/ice
Description: Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.
Build-Depends: bzip2 (!uwp), expat (!uwp), mcpp, lmdb (!uwp), openssl (!uwp), zlib (!uwp)
Feature: cpp11
Description: build C++11 libraries
Build-Depends: bzip2, expat, mcpp, openssl, mcpp, zlib
Source: zeroc-ice
Version: 3.7.3
Homepage: https://github.com/zeroc-ice/ice
Description: Comprehensive RPC framework with support for C++, CSharp, Java, JavaScript, Python and more.
Build-Depends: bzip2 (!uwp), expat (!uwp), mcpp, lmdb (!uwp), openssl (!uwp), zlib (!uwp)

Feature: cpp11
Description: build C++11 libraries
Build-Depends: bzip2, expat, mcpp, openssl, mcpp, zlib
24 changes: 12 additions & 12 deletions scripts/updatetranslations.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,24 +29,24 @@ def FindLupdate(vcpkg_triplet: Optional[str] = None) -> Optional[str]:
return None

def CheckForGitHasTsFileChanges(tsfiles: list) -> bool:
res = subprocess.run(['git', 'status', '--porcelain', '--'] + tsfiles, capture_output=True)
res = subprocess.run(['git', 'status', '--porcelain', '--'] + tsfiles, capture_output=True)
return res.returncode == 0 and len(res.stdout) > 0

def Commit(tsfiles: list) -> None:
res = subprocess.run(['git', 'reset', '--mixed'], capture_output=True)
res = subprocess.run(['git', 'reset', '--mixed'], capture_output=True)
if res.returncode != 0:
logging.error('The git reset call returned an error status code %d', res.returncode)
logging.debug('stdout: %s', res.stdout)
logging.error('The git reset call returned an error status code %d', res.returncode)
logging.debug('stdout: %s', res.stdout)
exit(1)
res = subprocess.run(['git', 'add'] + tsfiles, capture_output=True)
res = subprocess.run(['git', 'add'] + tsfiles, capture_output=True)
if res.returncode != 0:
logging.error('The git add call returned an error status code %d', res.returncode)
logging.debug('stdout: %s', res.stdout)
logging.error('The git add call returned an error status code %d', res.returncode)
logging.debug('stdout: %s', res.stdout)
exit(1)
res = subprocess.run(['git', 'commit', '-m', 'TRANSLATION: Update translation files'], capture_output=True)
res = subprocess.run(['git', 'commit', '-m', 'TRANSLATION: Update translation files'], capture_output=True)
if res.returncode != 0:
logging.error('The git commit call returned an error status code %d', res.returncode)
logging.debug('stdout: %s', res.stdout)
logging.error('The git commit call returned an error status code %d', res.returncode)
logging.debug('stdout: %s', res.stdout)
exit(1)

def Update(lupdatebin, tsfile: str, debuglupdate: bool, applyHeuristics = True) -> (int, int, int):
Expand Down Expand Up @@ -79,7 +79,7 @@ def Update(lupdatebin, tsfile: str, debuglupdate: bool, applyHeuristics = True)
logging.debug('stdout: ' + res.stdout)
exit(1)
p = re.compile('Found (?P<nsrc>[0-9]+) source text\(s\) \((?P<nnew>[0-9]+) new and (?P<nsame>[0-9]+) already existing\)')
m = p.search(res.stdout.decode('ascii'))
m = p.search(res.stdout.decode('ascii'))
logging.debug('Found %s texts where %s new and %s same', m.group('nsrc'), m.group('nnew'), m.group('nsame'))
return (m.group('nsrc'), m.group('nnew'), m.group('nsame'))

Expand All @@ -101,7 +101,7 @@ def Update(lupdatebin, tsfile: str, debuglupdate: bool, applyHeuristics = True)
exit(1)

# cd into repository root directory
os.chdir(os.path.dirname(os.path.abspath(__file__)) + '/..')
os.chdir(os.path.dirname(os.path.abspath(__file__)) + '/..')
logging.info('Working in directory %s', os.getcwd())

tsfiles = glob.glob(os.path.join('src', 'mumble', 'mumble_*.ts'))
Expand Down
42 changes: 21 additions & 21 deletions src/mumble/qttranslations/translations.conf
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
# This file controls whether the translations foudn in this
# directory are simply a fallback for the cases in which Qt
# doesn't ship with its own translation for that locale or
# whether our translations are actually enforced (aka they
# overwrite Qt's)
#
# A line starting with a # is interpreted as a comment and is
# discarded
# All non-empty lines that are no comment have to be in the format
# <operator> <fileName>
# where <operator> is either fallback or overwrite (or override)
#
# To provide translation file x.ts as a fallback use
# fallback x.ts
# to force its usage use
# overwrite x.ts
fallback qt_it.ts
fallback qt_nl.ts
fallback qt_tr.ts
overwrite qt_zh_CN.ts
# This file controls whether the translations foudn in this
# directory are simply a fallback for the cases in which Qt
# doesn't ship with its own translation for that locale or
# whether our translations are actually enforced (aka they
# overwrite Qt's)
#
# A line starting with a # is interpreted as a comment and is
# discarded
# All non-empty lines that are no comment have to be in the format
# <operator> <fileName>
# where <operator> is either fallback or overwrite (or override)
#
# To provide translation file x.ts as a fallback use
# fallback x.ts
# to force its usage use
# overwrite x.ts

fallback qt_it.ts
fallback qt_nl.ts
fallback qt_tr.ts
overwrite qt_zh_CN.ts

0 comments on commit 0c26ff1

Please sign in to comment.